Remove unused filesmaster-signed

279 files changed, 0 insertions, 133810 deletions

diff --git a/openjdk/AssemblyInfo.java.in b/openjdk/AssemblyInfo.java.in
deleted file mode 100644
index 37ae9b91..00000000
--- a/openjdk/AssemblyInfo.java.in
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-  Copyright (C) 2006-2013 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-
-@cli.System.Reflection.AssemblyCopyrightAttribute.Annotation(
-    "This software is licensed under the GNU General Public License version 2 + \"Classpath\" exception.\r\n" +
-    "See http://www.gnu.org/software/classpath/license.html for details.\r\n" +
-@COPYRIGHT@)
-
-@cli.System.Reflection.AssemblyTitleAttribute.Annotation("IKVM.NET OpenJDK Library for .NET")
-@cli.System.Reflection.AssemblyProductAttribute.Annotation("IKVM.NET")
-@cli.System.Reflection.AssemblyCompanyAttribute.Annotation("Jeroen Frijters")
-@cli.System.Reflection.AssemblyInformationalVersionAttribute.Annotation("@VERSION@")
-
-@cli.System.Runtime.CompilerServices.InternalsVisibleToAttribute.Annotation("@RUNTIME@")
-
-@cli.System.Security.AllowPartiallyTrustedCallersAttribute.Annotation
-
-// magic type to collect Assembly attributes
-interface assembly {}
diff --git a/openjdk/ExtensionAttribute.java b/openjdk/ExtensionAttribute.java
deleted file mode 100644
index acf5cc7c..00000000
--- a/openjdk/ExtensionAttribute.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-  Copyright (C) 2012 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-package cli.System.Runtime.CompilerServices;
-
-import java.lang.annotation.*;
-
-//
-// This is a dummy ExtensionAttribute class to enable building without
-// introducing a dependency on System.Core.dll
-//
-// To build without System.Core.dll dependency use this:
-//    nant -t:net-2.0 -D:SkipSystemCoreDependency=true
-//
-public class ExtensionAttribute
-{
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface Annotation { }
-}
diff --git a/openjdk/FORKED b/openjdk/FORKED
deleted file mode 100644
index 52a8921f..00000000
--- a/openjdk/FORKED
+++ /dev/null
@@ -1,114 +0,0 @@
-#
-# IKVM.NET Forked OpenJDK Files
-#
-# This file list all forked OpenJDK files in their original OpenJDK location and their forked ikvm/openjdk location.
-# Each line not starting with # contains a mapping: <original>=<forked>
-#
-build/linux-amd64/gensrc/sun/misc/Version.java=sun/misc/Version.java
-build/linux-amd64/gensrc/sun/nio/ch/SocketOptionRegistry.java=sun/nio/ch/SocketOptionRegistry.java
-build/linux-amd64/gensrc/sun/nio/cs/StandardCharsets.java=sun/nio/cs/StandardCharsets.java
-jdk/src/macosx/classes/java/lang/ClassLoaderHelper.java=java/lang/ClassLoaderHelper.java
-jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java=com/sun/imageio/plugins/jpeg/JPEGImageReader.java
-jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java=com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
-jdk/src/share/classes/java/awt/Font.java=java/awt/Font.java
-jdk/src/share/classes/java/awt/GraphicsConfiguration.java=java/awt/GraphicsConfiguration.java
-jdk/src/share/classes/java/awt/Image.java=java/awt/Image.java
-jdk/src/share/classes/java/awt/image/BufferedImage.java=java/awt/image/BufferedImage.java
-jdk/src/share/classes/java/awt/image/DataBuffer.java=java/awt/image/DataBuffer.java
-jdk/src/share/classes/java/awt/image/DataBufferByte.java=java/awt/image/DataBufferByte.java
-jdk/src/share/classes/java/awt/image/DataBufferDouble.java=java/awt/image/DataBufferDouble.java
-jdk/src/share/classes/java/awt/image/DataBufferFloat.java=java/awt/image/DataBufferFloat.java
-jdk/src/share/classes/java/awt/image/DataBufferInt.java=java/awt/image/DataBufferInt.java
-jdk/src/share/classes/java/awt/image/DataBufferShort.java=java/awt/image/DataBufferShort.java
-jdk/src/share/classes/java/awt/image/DataBufferUShort.java=java/awt/image/DataBufferUShort.java
-jdk/src/share/classes/java/awt/image/IndexColorModel.java=java/awt/image/IndexColorModel.java
-jdk/src/share/classes/java/io/FileInputStream.java=java/io/FileInputStream.java
-jdk/src/share/classes/java/io/FileOutputStream.java=java/io/FileOutputStream.java
-jdk/src/share/classes/java/io/ObjectStreamClass.java=java/io/ObjectStreamClass.java
-jdk/src/share/classes/java/io/ObjectStreamField.java=java/io/ObjectStreamField.java
-jdk/src/share/classes/java/io/RandomAccessFile.java=java/io/RandomAccessFile.java
-jdk/src/share/classes/java/lang/Class.java=java/lang/Class.java
-jdk/src/share/classes/java/lang/ClassLoader.java=java/lang/ClassLoader.java
-jdk/src/share/classes/java/lang/Enum.java=java/lang/Enum.java
-jdk/src/share/classes/java/lang/management/PlatformComponent.java=java/lang/management/PlatformComponent.java
-jdk/src/share/classes/java/lang/ref/SoftReference.java=java/lang/ref/SoftReference.java
-jdk/src/share/classes/java/lang/reflect/Constructor.java=java/lang/reflect/Constructor.java
-jdk/src/share/classes/java/lang/reflect/Field.java=java/lang/reflect/Field.java
-jdk/src/share/classes/java/lang/reflect/Method.java=java/lang/reflect/Method.java
-jdk/src/share/classes/java/lang/reflect/Proxy.java=java/lang/reflect/Proxy.java
-jdk/src/share/classes/java/lang/Shutdown.java=java/lang/Shutdown.java
-jdk/src/share/classes/java/lang/String.java=java/lang/StringHelper.java
-jdk/src/share/classes/java/lang/System.java=java/lang/System.java
-jdk/src/share/classes/java/lang/Thread.java=java/lang/Thread.java
-jdk/src/share/classes/java/lang/Throwable.java=java/lang/ThrowableHelper.java
-jdk/src/share/classes/java/net/SocketInputStream.java=java/net/SocketInputStream.java
-jdk/src/share/classes/java/net/SocketOutputStream.java=java/net/SocketOutputStream.java
-jdk/src/share/classes/java/nio/Bits.java=java/nio/Bits.java
-jdk/src/share/classes/java/security/AccessController.java=java/security/AccessController.java
-jdk/src/share/classes/java/security/ProtectionDomain.java=java/security/ProtectionDomain.java
-jdk/src/share/classes/java/util/concurrent/atomic/AtomicBoolean.java=../classpath/java/util/concurrent/atomic/AtomicBoolean.java
-jdk/src/share/classes/java/util/concurrent/atomic/AtomicInteger.java=../classpath/java/util/concurrent/atomic/AtomicInteger.java
-jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java=../classpath/java/util/concurrent/atomic/AtomicIntegerArray.java
-jdk/src/share/classes/java/util/concurrent/atomic/AtomicLong.java=../classpath/java/util/concurrent/atomic/AtomicLong.java
-jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongArray.java=../classpath/java/util/concurrent/atomic/AtomicLongArray.java
-jdk/src/share/classes/java/util/concurrent/atomic/AtomicReference.java=../classpath/java/util/concurrent/atomic/AtomicReference.java
-jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java=../classpath/java/util/concurrent/atomic/AtomicReferenceArray.java
-jdk/src/share/classes/java/util/concurrent/ForkJoinPool.java=java/util/concurrent/ForkJoinPool.java
-jdk/src/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java=java/util/concurrent/locks/AbstractQueuedSynchronizer.java
-jdk/src/share/classes/java/util/concurrent/locks/LockSupport.java=java/util/concurrent/locks/LockSupport.java
-jdk/src/share/classes/sun/awt/EmbeddedFrame.java=sun/awt/EmbeddedFrame.java
-jdk/src/share/classes/sun/awt/image/ByteInterleavedRaster.java=sun/awt/image/ByteInterleavedRaster.java
-jdk/src/share/classes/sun/awt/image/ImagingLib.java=sun/awt/image/ImagingLib.java
-jdk/src/share/classes/sun/awt/image/IntegerInterleavedRaster.java=sun/awt/image/IntegerInterleavedRaster.java
-jdk/src/share/classes/sun/awt/image/SunWritableRaster.java=sun/awt/image/SunWritableRaster.java
-jdk/src/share/classes/sun/awt/image/ToolkitImage.java=sun/awt/image/ToolkitImage.java
-jdk/src/share/classes/sun/awt/SunToolkit.java=sun/awt/SunToolkit.java
-jdk/src/share/classes/sun/font/FontManager.java=sun/font/FontManager.java
-jdk/src/share/classes/sun/font/StrikeCache.java=sun/font/StrikeCache.java
-jdk/src/share/classes/sun/management/ManagementFactoryHelper.java=sun/management/ManagementFactoryHelper.java
-jdk/src/share/classes/sun/management/VMManagementImpl.java=sun/management/VMManagementImpl.java
-jdk/src/share/classes/sun/misc/SharedSecrets.java=sun/misc/SharedSecrets.java
-jdk/src/share/classes/sun/misc/VM.java=sun/misc/VM.java
-jdk/src/share/classes/sun/net/sdp/SdpSupport.java=sun/net/sdp/SdpSupport.java
-jdk/src/share/classes/sun/net/www/protocol/file/FileURLConnection.java=sun/net/www/protocol/file/FileURLConnection.java
-jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java=sun/nio/ch/DatagramChannelImpl.java
-jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java=sun/nio/ch/FileChannelImpl.java
-jdk/src/share/classes/sun/nio/ch/IOUtil.java=sun/nio/ch/IOUtil.java
-jdk/src/share/classes/sun/nio/ch/NativeDispatcher.java=sun/nio/ch/NativeDispatcher.java
-jdk/src/share/classes/sun/nio/ch/Net.java=sun/nio/ch/Net.java
-jdk/src/share/classes/sun/nio/ch/Util.java=sun/nio/ch/Util.java
-jdk/src/share/classes/sun/reflect/annotation/AnnotationType.java=sun/reflect/annotation/AnnotationType.java
-jdk/src/share/classes/sun/reflect/MethodAccessor.java=sun/reflect/MethodAccessor.java
-jdk/src/share/classes/sun/reflect/Reflection.java=sun/reflect/Reflection.java
-jdk/src/share/classes/sun/reflect/ReflectionFactory.java=sun/reflect/ReflectionFactory.java
-jdk/src/solaris/classes/sun/nio/fs/UnixUriUtils.java=sun/nio/fs/UnixUriUtils.java
-jdk/src/windows/classes/java/io/FileDescriptor.java=java/io/FileDescriptor.java
-jdk/src/windows/classes/java/lang/ProcessImpl.java=java/lang/ProcessImpl.java
-jdk/src/windows/classes/java/net/DefaultDatagramSocketImplFactory.java=java/net/DefaultDatagramSocketImplFactory.java
-jdk/src/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java=java/net/DualStackPlainDatagramSocketImpl.java
-jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java=java/net/DualStackPlainSocketImpl.java
-jdk/src/windows/classes/java/net/PlainSocketImpl.java=java/net/PlainSocketImpl.java
-jdk/src/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java=java/net/TwoStacksPlainDatagramSocketImpl.java
-jdk/src/windows/classes/java/net/TwoStacksPlainSocketImpl.java=java/net/TwoStacksPlainSocketImpl.java
-jdk/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java=sun/awt/shell/Win32ShellFolder2.java
-jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java=sun/awt/shell/Win32ShellFolderManager2.java
-jdk/src/windows/classes/sun/misc/FileURLMapper.java=sun/misc/FileURLMapper.java
-jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java=sun/net/dns/ResolverConfigurationImpl.java
-jdk/src/windows/classes/sun/net/www/protocol/file/Handler.java=sun/net/www/protocol/file/Handler.java
-jdk/src/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java=sun/net/www/protocol/jar/JarFileFactory.java
-jdk/src/windows/classes/sun/nio/ch/DefaultSelectorProvider.java=sun/nio/ch/DefaultSelectorProvider.java
-jdk/src/windows/classes/sun/nio/ch/FileDispatcherImpl.java=sun/nio/ch/FileDispatcherImpl.java
-jdk/src/windows/classes/sun/nio/ch/Iocp.java=sun/nio/ch/Iocp.java
-jdk/src/windows/classes/sun/nio/ch/PollArrayWrapper.java=sun/nio/ch/PollArrayWrapper.java
-jdk/src/windows/classes/sun/nio/ch/SocketDispatcher.java=sun/nio/ch/SocketDispatcher.java
-jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java=sun/nio/ch/WindowsAsynchronousFileChannelImpl.java
-jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java=sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java
-jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java=sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java
-jdk/src/windows/classes/sun/nio/fs/WindowsUriSupport.java=sun/nio/fs/WindowsUriSupport.java
-jdk/src/windows/classes/sun/print/Win32PrintJob.java=sun/print/Win32PrintJob.java
-jdk/src/windows/classes/sun/print/Win32PrintService.java=sun/print/Win32PrintService.java
-jdk/src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c=java/net/DualStackPlainDatagramSocketImpl_c.java
-jdk/src/windows/native/java/net/DualStackPlainSocketImpl.c=java/net/DualStackPlainSocketImpl_c.java
-jdk/src/windows/native/java/net/net_util_md.c=java/net/net_util_md.java
-jdk/src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c=java/net/TwoStacksPlainDatagramSocketImpl_c.java
-jdk/src/windows/native/java/net/TwoStacksPlainSocketImpl.c=java/net/TwoStacksPlainSocketImpl_c.java
diff --git a/openjdk/GenerateSystemCore.cs b/openjdk/GenerateSystemCore.cs
deleted file mode 100644
index 265a0308..00000000
--- a/openjdk/GenerateSystemCore.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-  Copyright (C) 2010 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-using System;
-using IKVM.Reflection;
-using IKVM.Reflection.Emit;
-using Type = IKVM.Reflection.Type;
-
-class GenerateSystemCore
-{
-	static void Main(string[] args)
-	{
-		Universe universe = new Universe();
-		AssemblyName name = new AssemblyName("System.Core");
-		name.Version = new Version(3, 5);
-		name.SetPublicKey(new byte[] { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 });
-		AssemblyBuilder ab = universe.DefineDynamicAssembly(name, AssemblyBuilderAccess.Save);
-		ModuleBuilder modb = ab.DefineDynamicModule("System.Core", "System.Core.dll");
-		TypeBuilder tb = modb.DefineType("System.Runtime.CompilerServices.ExtensionAttribute", TypeAttributes.Class | TypeAttributes.Public | TypeAttributes.Sealed, universe.Import(typeof(Attribute)));
-		tb.DefineDefaultConstructor(MethodAttributes.Public);
-		tb.CreateType();
-		ab.Save("System.Core.dll");
-	}
-}
diff --git a/openjdk/allsources.lst b/openjdk/allsources.lst
deleted file mode 100644
index 2bf838b4..00000000
--- a/openjdk/allsources.lst
+++ /dev/null
@@ -1,16116 +0,0 @@
-../classpath/gnu/java/net/protocol/ikvmres/Handler.java
-../classpath/ikvm/extensions/ExtensionMethods.java
-../classpath/ikvm/internal/__unspecified.java
-../classpath/ikvm/internal/AssemblyClassLoader.java
-../classpath/ikvm/internal/CallerID.java
-../classpath/ikvm/internal/Formatter.java
-../classpath/ikvm/internal/JMath.java
-../classpath/ikvm/internal/MonoUtils.java
-../classpath/ikvm/internal/Util.java
-../classpath/ikvm/internal/WeakIdentityMap.java
-../classpath/ikvm/io/InputStreamWrapper.java
-../classpath/ikvm/lang/CIL.java
-../classpath/ikvm/lang/DllExport.java
-../classpath/ikvm/lang/Internal.java
-../classpath/ikvm/lang/IterableEnumerator.java
-../classpath/ikvm/lang/MapEnumerator.java
-../classpath/ikvm/lang/Property.java
-../classpath/ikvm/runtime/AppDomainAssemblyClassLoader.java
-../classpath/ikvm/runtime/ClassPathAssemblyClassLoader.java
-../classpath/ikvm/runtime/Delegates.java
-../classpath/ikvm/runtime/EnumerationWrapper.java
-../classpath/ikvm/runtime/Startup.java
-../classpath/ikvm/runtime/Util.java
-../classpath/java/util/concurrent/atomic/AtomicBoolean.java
-../classpath/java/util/concurrent/atomic/AtomicInteger.java
-../classpath/java/util/concurrent/atomic/AtomicIntegerArray.java
-../classpath/java/util/concurrent/atomic/AtomicLong.java
-../classpath/java/util/concurrent/atomic/AtomicLongArray.java
-../classpath/java/util/concurrent/atomic/AtomicReference.java
-../classpath/java/util/concurrent/atomic/AtomicReferenceArray.java
-../classpath/java/util/concurrent/atomic/Striped64.java
-../classpath/sun/misc/Ref.java
-AssemblyInfo.java
-com/sun/imageio/plugins/jpeg/JPEGImageReader.java
-com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
-com/sun/java/util/jar/pack/PackageReader.java
-gnu/java/awt/Buffers.java
-gnu/java/awt/color/CieXyzConverter.java
-gnu/java/awt/color/ClutProfileConverter.java
-gnu/java/awt/color/ColorLookUpTable.java
-gnu/java/awt/color/ColorSpaceConverter.java
-gnu/java/awt/color/GrayProfileConverter.java
-gnu/java/awt/color/GrayScaleConverter.java
-gnu/java/awt/color/ProfileHeader.java
-gnu/java/awt/color/RgbProfileConverter.java
-gnu/java/awt/color/SrgbConverter.java
-gnu/java/awt/color/TagEntry.java
-gnu/java/awt/color/ToneReproductionCurve.java
-gnu/java/util/EmptyEnumeration.java
-ikvm/awt/IkvmToolkit.java
-ikvm/internal/AnnotationAttributeBase.java
-ikvm/internal/FieldReflectorBase.java
-ikvm/internal/InterlockedCompareAndSet.java
-ikvm/internal/IntrinsicAtomicReferenceFieldUpdater.java
-ikvm/internal/IntrinsicThreadLocal.java
-ikvm/internal/JNI.java
-ikvm/internal/NotYetImplementedError.java
-ikvm/internal/Serialization.java
-ikvm/internal/Winsock.java
-java/awt/color/ICC_ColorSpace.java
-java/awt/Font.java
-java/awt/GraphicsConfiguration.java
-java/awt/Image.java
-java/awt/image/AffineTransformOp.java
-java/awt/image/BandCombineOp.java
-java/awt/image/BufferedImage.java
-java/awt/image/ConvolveOp.java
-java/awt/image/ColorConvertOp.java
-java/awt/image/DataBuffer.java
-java/awt/image/DataBufferByte.java
-java/awt/image/DataBufferDouble.java
-java/awt/image/DataBufferFloat.java
-java/awt/image/DataBufferInt.java
-java/awt/image/DataBufferShort.java
-java/awt/image/DataBufferUShort.java
-java/awt/image/IndexColorModel.java
-java/awt/image/LookupOp.java
-java/awt/image/RescaleOp.java
-java/io/DefaultFileSystem.java
-java/io/FileDescriptor.java
-java/io/FileInputStream.java
-java/io/FileOutputStream.java
-java/io/InteropObjectInputStream.java
-java/io/InteropObjectOutputStream.java
-java/io/ObjectStreamClass.java
-java/io/ObjectStreamField.java
-java/io/RandomAccessFile.java
-java/lang/Class.java
-java/lang/ClassLoader.java
-java/lang/ClassLoaderHelper.java
-java/lang/Enum.java
-java/lang/LangHelper.java
-java/lang/management/PlatformComponent.java
-java/lang/ProcessImpl.java
-java/lang/PropertyConstants.java
-java/lang/ref/Reference.java
-java/lang/ref/ReferenceQueue.java
-java/lang/ref/SoftReference.java
-java/lang/reflect/Constructor.java
-java/lang/reflect/Executable.java
-java/lang/reflect/Field.java
-java/lang/reflect/Method.java
-java/lang/reflect/Proxy.java
-java/lang/reflect/ReflectHelper.java
-java/lang/Shutdown.java
-java/lang/StringHelper.java
-java/lang/System.java
-java/lang/Thread.java
-java/lang/ThrowableHelper.java
-java/lang/VMSystemProperties.java
-java/net/DefaultDatagramSocketImplFactory.java
-java/net/DualStackPlainDatagramSocketImpl.java
-java/net/DualStackPlainDatagramSocketImpl_c.java
-java/net/DualStackPlainSocketImpl.java
-java/net/DualStackPlainSocketImpl_c.java
-java/net/net_util_md.java
-java/net/PlainSocketImpl.java
-java/net/SocketInputStream.java
-java/net/SocketOutputStream.java
-java/net/SocketUtil.java
-java/net/TwoStacksPlainDatagramSocketImpl.java
-java/net/TwoStacksPlainDatagramSocketImpl_c.java
-java/net/TwoStacksPlainSocketImpl.java
-java/net/TwoStacksPlainSocketImpl_c.java
-java/nio/Bits.java
-java/security/AccessController.java
-java/security/ProtectionDomain.java
-java/util/concurrent/ForkJoinPool.java
-java/util/concurrent/locks/AbstractQueuedSynchronizer.java
-java/util/concurrent/locks/LockSupport.java
-java/util/zip/Adler32.java
-java/util/zip/ClassStubZipEntry.java
-java/util/zip/CRC32.java
-java/util/zip/Deflater.java
-java/util/zip/DeflaterConstants.java
-java/util/zip/DeflaterEngine.java
-java/util/zip/DeflaterHuffman.java
-java/util/zip/DeflaterPending.java
-java/util/zip/Inflater.java
-java/util/zip/InflaterDynHeader.java
-java/util/zip/InflaterHuffmanTree.java
-java/util/zip/OutputWindow.java
-java/util/zip/PendingBuffer.java
-java/util/zip/StreamManipulator.java
-java/util/zip/ZipEntry.java
-java/util/zip/ZipFile.java
-sun/awt/EmbeddedFrame.java
-sun/awt/IkvmDataTransferer.java
-sun/awt/image/ByteInterleavedRaster.java
-sun/awt/image/GifImageDecoder.java
-sun/awt/image/IkvmImageDecoder.java
-sun/awt/image/ImageRepresentation.java
-sun/awt/image/ImagingLib.java
-sun/awt/image/IntegerInterleavedRaster.java
-sun/awt/image/JPEGImageDecoder.java
-sun/awt/image/SunWritableRaster.java
-sun/awt/image/ToolkitImage.java
-sun/awt/shell/Win32ShellFolder2.java
-sun/awt/shell/Win32ShellFolderManager2.java
-sun/awt/SunToolkit.java
-sun/awt/Win32FontManager.java
-sun/awt/X11FontManager.java
-sun/awt/windows/WPrinterJob.java
-sun/font/CompositeFont.java
-sun/font/Font2D.java
-sun/font/GlyphLayout.java
-sun/font/PhysicalFont.java
-sun/font/PhysicalStrike.java
-sun/font/StandardGlyphVector.java
-sun/font/StrikeCache.java
-sun/font/SunFontManager.java
-sun/font/TrueTypeFont.java
-sun/java2d/cmm/lcms/LCMS.java
-sun/java2d/HeadlessGraphicsEnvironment.java
-sun/java2d/pipe/ShapeSpanIterator.java
-sun/java2d/SunCompositeContext.java
-sun/java2d/SunGraphics2D.java
-sun/java2d/SunGraphicsEnvironment.java
-sun/java2d/SurfaceData.java
-sun/jdbc/odbc/JdbcOdbcCallableStatement.java
-sun/jdbc/odbc/JdbcOdbcConnection.java
-sun/jdbc/odbc/JdbcOdbcDatabaseMetaData.java
-sun/jdbc/odbc/JdbcOdbcDriver.java
-sun/jdbc/odbc/JdbcOdbcDTResultSet.java
-sun/jdbc/odbc/JdbcOdbcDTResultSetMetaData.java
-sun/jdbc/odbc/JdbcOdbcObject.java
-sun/jdbc/odbc/JdbcOdbcPreparedStatement.java
-sun/jdbc/odbc/JdbcOdbcResultSet.java
-sun/jdbc/odbc/JdbcOdbcResultSetMetaData.java
-sun/jdbc/odbc/JdbcOdbcStatement.java
-sun/jdbc/odbc/JdbcOdbcUpdateableResultSet.java
-sun/jdbc/odbc/JdbcOdbcUtils.java
-sun/management/ManagementFactoryHelper.java
-sun/management/VMManagementImpl.java
-sun/misc/FileURLMapper.java
-sun/misc/MiscHelper.java
-sun/misc/OSEnvironment.java
-sun/misc/SharedSecrets.java
-sun/misc/Unsafe.java
-sun/misc/Version.java
-sun/misc/VM.java
-sun/net/dns/ResolverConfigurationImpl.java
-sun/net/sdp/SdpSupport.java
-sun/net/www/protocol/file/FileURLConnection.java
-sun/net/www/protocol/file/Handler.java
-sun/net/www/protocol/ikvmres/Handler.java
-sun/net/www/protocol/jar/JarFileFactory.java
-sun/nio/ch/DatagramChannelImpl.java
-sun/nio/ch/DefaultSelectorProvider.java
-sun/nio/ch/DotNetSelectorImpl.java
-sun/nio/ch/FileChannelImpl.java
-sun/nio/ch/FileDispatcherImpl.java
-sun/nio/ch/FileKey.java
-sun/nio/ch/Iocp.java
-sun/nio/ch/IOUtil.java
-sun/nio/ch/NativeDispatcher.java
-sun/nio/ch/Net.java
-sun/nio/ch/PollArrayWrapper.java
-sun/nio/ch/SelectionKeyImpl.java
-sun/nio/ch/SocketDispatcher.java
-sun/nio/ch/SocketOptionRegistry.java
-sun/nio/ch/Util.java
-sun/nio/ch/WindowsAsynchronousFileChannelImpl.java
-sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java
-sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java
-sun/nio/cs/StandardCharsets.java
-sun/nio/fs/DefaultFileSystemProvider.java
-sun/nio/fs/DefaultFileTypeDetector.java
-sun/nio/fs/NetFileSystem.java
-sun/nio/fs/NetFileSystemProvider.java
-sun/nio/fs/NetPath.java
-sun/nio/fs/UnixUriUtils.java
-sun/nio/fs/WindowsUriSupport.java
-sun/print/PrintPeer.java
-sun/print/UnixPrintServiceLookup.java
-sun/print/Win32PrintJob.java
-sun/print/Win32PrintService.java
-sun/print/Win32PrintServiceLookup.java
-sun/reflect/annotation/AnnotationType.java
-sun/reflect/MethodAccessor.java
-sun/reflect/Reflection.java
-sun/reflect/ReflectionFactory.java
-sun/security/jgss/wrapper/NativeGSSFactory.java
-sun/security/jgss/wrapper/SunNativeProvider.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/_ActivatorImplBase.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/_ActivatorStub.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/_InitialNameServiceImplBase.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/_InitialNameServiceStub.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/_LocatorImplBase.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/_LocatorStub.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/_RepositoryImplBase.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/_RepositoryStub.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/_ServerImplBase.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/_ServerManagerImplBase.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/_ServerManagerStub.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/_ServerStub.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/Activator.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ActivatorHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ActivatorHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ActivatorOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/BadServerDefinition.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/BadServerDefinitionHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/BadServerDefinitionHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/EndPointInfo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/EndPointInfoHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/EndPointInfoHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/EndpointInfoListHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/EndpointInfoListHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/IIOP_CLEAR_TEXT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/InitialNameService.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/InitialNameServiceHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/InitialNameServiceHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/InitialNameServiceOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/InitialNameServicePackage/NameAlreadyBound.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/InitialNameServicePackage/NameAlreadyBoundHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/InitialNameServicePackage/NameAlreadyBoundHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/InvalidORBid.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/InvalidORBidHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/InvalidORBidHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/Locator.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/LocatorHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/LocatorHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/LocatorOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/LocatorPackage/ServerLocation.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationPerORB.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationPerORBHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationPerORBHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/NoSuchEndPoint.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/NoSuchEndPointHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/NoSuchEndPointHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ORBAlreadyRegistered.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ORBAlreadyRegisteredHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ORBAlreadyRegisteredHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ORBidHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ORBidListHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ORBidListHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ORBPortInfo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ORBPortInfoHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ORBPortInfoHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ORBPortInfoListHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ORBPortInfoListHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/POANameHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/POANameHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/Repository.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/RepositoryHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/RepositoryHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/RepositoryOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/RepositoryPackage/ServerDef.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/RepositoryPackage/ServerDefHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/RepositoryPackage/ServerDefHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/RepositoryPackage/StringSeqHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/RepositoryPackage/StringSeqHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/Server.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerAlreadyActive.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerAlreadyActiveHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerAlreadyActiveHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerAlreadyInstalled.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerAlreadyInstalledHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerAlreadyInstalledHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerAlreadyRegistered.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerAlreadyRegisteredHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerAlreadyRegisteredHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerAlreadyUninstalled.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerAlreadyUninstalledHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerAlreadyUninstalledHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerHeldDown.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerHeldDownHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerHeldDownHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerIdHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerIdsHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerIdsHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerManager.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerManagerHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerManagerHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerManagerOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerNotActive.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerNotActiveHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerNotActiveHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerNotRegistered.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerNotRegisteredHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerNotRegisteredHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/ServerOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/TCPPortHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CORBA/ParameterMode.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CORBA/ParameterModeHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CORBA/ParameterModeHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CORBA/PolicyErrorCodeHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CORBA/PolicyErrorHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CORBA/PolicyErrorHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CORBA/StringSeqHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CORBA/StringSeqHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CORBA/WStringSeqHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CORBA/WStringSeqHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/Binding.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/BindingHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/BindingHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/BindingIterator.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/BindingIteratorHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/BindingIteratorHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/BindingIteratorOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/BindingIteratorPOA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/BindingListHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/BindingListHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/BindingType.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/BindingTypeHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/BindingTypeHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/IstringHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NameComponent.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NameComponentHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NameComponentHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NameHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NameHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContext.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextExt.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextExtHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextExtHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextExtOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextExtPOA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextPOA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/_BindingIteratorStub.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/_NamingContextExtStub.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/_NamingContextStub.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextExtPackage/AddressHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextExtPackage/InvalidAddress.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextPackage/AlreadyBound.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextPackage/CannotProceed.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextPackage/CannotProceedHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextPackage/InvalidName.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextPackage/InvalidNameHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextPackage/NotEmpty.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextPackage/NotEmptyHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextPackage/NotFound.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextPackage/NotFoundHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextPackage/NotFoundReason.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/Dynamic/Parameter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/AnySeqHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynAny.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynAnyFactory.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynAnyFactoryHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynAnyFactoryOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynAnyHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynAnyOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynAnySeqHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynArray.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynArrayHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynArrayOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynEnum.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynEnumHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynEnumOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynFixed.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynFixedHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynFixedOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynSequence.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynSequenceHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynSequenceOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynStruct.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynStructHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynStructOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynUnion.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynUnionHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynUnionOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynValue.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynValueBox.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynValueBoxOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynValueCommon.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynValueCommonOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynValueHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynValueOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/FieldNameHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/NameDynAnyPair.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/NameDynAnyPairHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/NameValuePair.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/NameValuePairHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/NameValuePairSeqHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/_DynAnyFactoryStub.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/_DynAnyStub.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/_DynArrayStub.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/_DynEnumStub.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/_DynFixedStub.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/_DynSequenceStub.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/_DynStructStub.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/_DynUnionStub.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/_DynValueStub.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCode.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynAnyPackage/InvalidValue.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynAnyPackage/TypeMismatch.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/Codec.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/CodecFactory.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/CodecFactoryHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/CodecFactoryOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/CodecOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/CodeSets.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/ComponentIdHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/Encoding.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/ENCODING_CDR_ENCAPS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/ExceptionDetailMessage.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/IOR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/IORHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/IORHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/MultipleComponentProfileHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/MultipleComponentProfileHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/ProfileIdHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/RMICustomMaxStreamFormat.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/ServiceContext.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/ServiceContextHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/ServiceContextHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/ServiceContextListHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/ServiceContextListHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/ServiceIdHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/TaggedComponent.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/TaggedComponentHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/TaggedComponentHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/TaggedProfile.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/TaggedProfileHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/TaggedProfileHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/TAG_ALTERNATE_IIOP_ADDRESS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/TAG_CODE_SETS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/TAG_INTERNET_IOP.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/TAG_JAVA_CODEBASE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/TAG_MULTIPLE_COMPONENTS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/TAG_ORB_TYPE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/TAG_POLICIES.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/TAG_RMI_CUSTOM_MAX_STREAM_FORMAT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/TransactionService.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/CodecFactoryPackage/UnknownEncoding.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/CodecPackage/FormatMismatch.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/CodecPackage/FormatMismatchHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/CodecPackage/InvalidTypeForEncoding.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/CodecPackage/TypeMismatch.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/CodecPackage/TypeMismatchHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/Messaging/SyncScopeHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/Messaging/SYNC_WITH_TRANSPORT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ACTIVE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/AdapterManagerIdHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/AdapterNameHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/AdapterStateHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ClientRequestInfo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ClientRequestInfoOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ClientRequestInterceptor.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ClientRequestInterceptorOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/Current.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/CurrentHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/CurrentOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/DISCARDING.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ForwardRequest.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ForwardRequestHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/HOLDING.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/INACTIVE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/Interceptor.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/InterceptorOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/InvalidSlot.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/InvalidSlotHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/IORInfo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/IORInfoOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/IORInterceptor.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/IORInterceptorOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/IORInterceptor_3_0.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/IORInterceptor_3_0Holder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/IORInterceptor_3_0Operations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/LOCATION_FORWARD.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/NON_EXISTENT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ObjectIdHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ObjectReferenceFactory.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ObjectReferenceFactoryHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ObjectReferenceTemplate.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ObjectReferenceTemplateHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHolder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ORBIdHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ORBInitializer.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ORBInitializerOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ORBInitInfo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ORBInitInfoOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/PolicyFactory.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/PolicyFactoryOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/RequestInfo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/RequestInfoOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ServerIdHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ServerRequestInfo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ServerRequestInfoOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ServerRequestInterceptor.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ServerRequestInterceptorOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/SUCCESSFUL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/SYSTEM_EXCEPTION.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/TRANSPORT_RETRY.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/USER_EXCEPTION.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateName.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidName.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/AdapterActivator.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/AdapterActivatorOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/Current.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/CurrentOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/ForwardRequest.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/ForwardRequestHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/IdAssignmentPolicy.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/IdAssignmentPolicyOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/IdAssignmentPolicyValue.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/IdUniquenessPolicy.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/IdUniquenessPolicyOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/IdUniquenessPolicyValue.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/ID_ASSIGNMENT_POLICY_ID.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/ID_UNIQUENESS_POLICY_ID.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/ImplicitActivationPolicy.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/ImplicitActivationPolicyOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/ImplicitActivationPolicyValue.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/IMPLICIT_ACTIVATION_POLICY_ID.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/LifespanPolicy.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/LifespanPolicyOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/LifespanPolicyValue.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/LIFESPAN_POLICY_ID.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAManager.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAManagerOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/RequestProcessingPolicy.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/RequestProcessingPolicyOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/RequestProcessingPolicyValue.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/ServantActivator.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/ServantActivatorHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/ServantActivatorOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/ServantActivatorPOA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/ServantLocator.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/ServantLocatorHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/ServantLocatorOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/ServantLocatorPOA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/ServantManager.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/ServantManagerOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/ServantRetentionPolicy.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/ServantRetentionPolicyOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/ServantRetentionPolicyValue.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/SERVANT_RETENTION_POLICY_ID.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/ThreadPolicy.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/ThreadPolicyOperations.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/ThreadPolicyValue.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/THREAD_POLICY_ID.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/_ServantActivatorStub.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/_ServantLocatorStub.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/CurrentPackage/NoContext.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/CurrentPackage/NoContextHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAManagerPackage/AdapterInactive.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAManagerPackage/State.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAPackage/AdapterAlreadyExists.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAPackage/AdapterNonExistent.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAPackage/InvalidPolicy.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAPackage/NoServant.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAPackage/NoServantHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAPackage/ObjectAlreadyActive.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAPackage/ObjectNotActive.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAPackage/ServantAlreadyActive.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAPackage/ServantNotActive.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAPackage/WrongAdapter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAPackage/WrongPolicy.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/accessibility/internal/resources/accessibility.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/accessibility/internal/resources/accessibility_de.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/accessibility/internal/resources/accessibility_en.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/accessibility/internal/resources/accessibility_es.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/accessibility/internal/resources/accessibility_fr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/accessibility/internal/resources/accessibility_it.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/accessibility/internal/resources/accessibility_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/accessibility/internal/resources/accessibility_ko.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/accessibility/internal/resources/accessibility_pt_BR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/accessibility/internal/resources/accessibility_sv.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/accessibility/internal/resources/accessibility_zh_CN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/accessibility/internal/resources/accessibility_zh_HK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/accessibility/internal/resources/accessibility_zh_TW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/java/swing/plaf/motif/resources/motif.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/java/swing/plaf/motif/resources/motif_de.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/java/swing/plaf/motif/resources/motif_es.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/java/swing/plaf/motif/resources/motif_fr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/java/swing/plaf/motif/resources/motif_it.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/java/swing/plaf/motif/resources/motif_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/java/swing/plaf/motif/resources/motif_ko.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/java/swing/plaf/motif/resources/motif_sv.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/java/swing/plaf/motif/resources/motif_zh_HK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/java/swing/plaf/windows/resources/windows.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/java/swing/plaf/windows/resources/windows_de.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/java/swing/plaf/windows/resources/windows_es.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/java/swing/plaf/windows/resources/windows_fr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/java/swing/plaf/windows/resources/windows_it.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/java/swing/plaf/windows/resources/windows_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/java/swing/plaf/windows/resources/windows_ko.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/java/swing/plaf/windows/resources/windows_sv.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/java/swing/plaf/windows/resources/windows_zh_HK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/basic/resources/basic.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/basic/resources/basic_de.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/basic/resources/basic_es.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/basic/resources/basic_fr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/basic/resources/basic_it.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/basic/resources/basic_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/basic/resources/basic_ko.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/basic/resources/basic_sv.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/basic/resources/basic_zh_HK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/metal/resources/metal.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/metal/resources/metal_de.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/metal/resources/metal_es.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/metal/resources/metal_fr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/metal/resources/metal_it.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/metal/resources/metal_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/metal/resources/metal_ko.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/metal/resources/metal_sv.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/metal/resources/metal_zh_HK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/synth/resources/synth.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/synth/resources/synth_de.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/synth/resources/synth_es.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/synth/resources/synth_fr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/synth/resources/synth_it.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/synth/resources/synth_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/synth/resources/synth_ko.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/synth/resources/synth_sv.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/synth/resources/synth_zh_HK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/tools/jdi/JDWP.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/tools/jdi/resources/jdi.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/tools/jdi/resources/jdi_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/tools/jdi/resources/jdi_zh_CN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/lang/CharacterData00.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/lang/CharacterData01.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/lang/CharacterData02.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/lang/CharacterData0E.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/lang/CharacterDataLatin1.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/lang/CharacterDataPrivateUse.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/lang/CharacterDataUndefined.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/BufferOverflowException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/BufferUnderflowException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/ByteBuffer.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/ByteBufferAsCharBufferB.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/ByteBufferAsCharBufferL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/ByteBufferAsCharBufferRB.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/ByteBufferAsCharBufferRL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/ByteBufferAsDoubleBufferB.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/ByteBufferAsDoubleBufferL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/ByteBufferAsDoubleBufferRB.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/ByteBufferAsDoubleBufferRL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/ByteBufferAsFloatBufferB.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/ByteBufferAsFloatBufferL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/ByteBufferAsFloatBufferRB.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/ByteBufferAsFloatBufferRL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/ByteBufferAsIntBufferB.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/ByteBufferAsIntBufferL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/ByteBufferAsIntBufferRB.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/ByteBufferAsIntBufferRL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/ByteBufferAsLongBufferB.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/ByteBufferAsLongBufferL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/ByteBufferAsLongBufferRB.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/ByteBufferAsLongBufferRL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/ByteBufferAsShortBufferB.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/ByteBufferAsShortBufferL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/ByteBufferAsShortBufferRB.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/ByteBufferAsShortBufferRL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/CharBuffer.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/DirectByteBuffer.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/DirectByteBufferR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/DirectCharBufferRS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/DirectCharBufferRU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/DirectCharBufferS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/DirectCharBufferU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/DirectDoubleBufferRS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/DirectDoubleBufferRU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/DirectDoubleBufferS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/DirectDoubleBufferU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/DirectFloatBufferRS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/DirectFloatBufferRU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/DirectFloatBufferS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/DirectFloatBufferU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/DirectIntBufferRS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/DirectIntBufferRU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/DirectIntBufferS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/DirectIntBufferU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/DirectLongBufferRS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/DirectLongBufferRU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/DirectLongBufferS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/DirectLongBufferU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/DirectShortBufferRS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/DirectShortBufferRU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/DirectShortBufferS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/DirectShortBufferU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/DoubleBuffer.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/FloatBuffer.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/HeapByteBuffer.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/HeapByteBufferR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/HeapCharBuffer.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/HeapCharBufferR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/HeapDoubleBuffer.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/HeapDoubleBufferR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/HeapFloatBuffer.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/HeapFloatBufferR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/HeapIntBuffer.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/HeapIntBufferR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/HeapLongBuffer.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/HeapLongBufferR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/HeapShortBuffer.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/HeapShortBufferR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/IntBuffer.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/InvalidMarkException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/LongBuffer.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/ReadOnlyBufferException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/ShortBuffer.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/channels/AcceptPendingException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/channels/AlreadyBoundException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/channels/AlreadyConnectedException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/channels/AsynchronousCloseException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/channels/CancelledKeyException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/channels/ClosedByInterruptException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/channels/ClosedChannelException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/channels/ClosedSelectorException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/channels/ConnectionPendingException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/channels/FileLockInterruptionException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/channels/IllegalBlockingModeException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/channels/IllegalChannelGroupException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/channels/IllegalSelectorException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/channels/InterruptedByTimeoutException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/channels/NoConnectionPendingException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/channels/NonReadableChannelException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/channels/NonWritableChannelException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/channels/NotYetBoundException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/channels/NotYetConnectedException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/channels/OverlappingFileLockException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/channels/ReadPendingException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/channels/ShutdownChannelGroupException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/channels/UnresolvedAddressException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/channels/UnsupportedAddressTypeException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/channels/WritePendingException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/charset/CharacterCodingException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/charset/CharsetDecoder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/charset/CharsetEncoder.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/charset/IllegalCharsetNameException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/charset/UnsupportedCharsetException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/ArrowButtonPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/ButtonPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/CheckBoxMenuItemPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/CheckBoxPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/ComboBoxArrowButtonEditableState.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/ComboBoxArrowButtonPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/ComboBoxEditableState.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/ComboBoxPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/ComboBoxTextFieldPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/DesktopIconPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/DesktopPanePainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/EditorPanePainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/FileChooserPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/FormattedTextFieldPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/InternalFramePainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/InternalFrameTitlePaneCloseButtonPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/InternalFrameTitlePaneCloseButtonWindowNotFocusedState.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/InternalFrameTitlePaneIconifyButtonPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/InternalFrameTitlePaneIconifyButtonWindowNotFocusedState.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonWindowMaximizedState.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/InternalFrameTitlePaneMaximizeButtonWindowNotFocusedState.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/InternalFrameTitlePaneMenuButtonPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/InternalFrameTitlePaneMenuButtonWindowNotFocusedState.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/InternalFrameTitlePaneWindowFocusedState.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/InternalFrameWindowFocusedState.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/MenuBarMenuPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/MenuBarPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/MenuItemPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/MenuPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/NimbusDefaults.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/OptionPaneMessageAreaOptionPaneLabelPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/OptionPanePainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/PasswordFieldPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/PopupMenuPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/PopupMenuSeparatorPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/ProgressBarFinishedState.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/ProgressBarIndeterminateState.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/ProgressBarPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/RadioButtonMenuItemPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/RadioButtonPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/ScrollBarButtonPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/ScrollBarPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/ScrollBarThumbPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/ScrollBarTrackPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/ScrollPanePainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/SeparatorPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/SliderArrowShapeState.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/SliderPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/SliderThumbArrowShapeState.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/SliderThumbPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/SliderTrackArrowShapeState.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/SliderTrackPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/SpinnerNextButtonPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/SpinnerPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/SpinnerPanelSpinnerFormattedTextFieldPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/SpinnerPreviousButtonPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/SplitPaneDividerPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/SplitPaneDividerVerticalState.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/SplitPanePainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/SplitPaneVerticalState.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/TabbedPanePainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/TabbedPaneTabAreaPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/TabbedPaneTabPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/TableEditorPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/TableHeaderPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/TableHeaderRendererPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/TableHeaderRendererSortedState.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/TextAreaNotInScrollPaneState.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/TextAreaPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/TextFieldPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/TextPanePainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/ToggleButtonPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/ToolBarButtonPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/ToolBarEastState.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/ToolBarNorthState.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/ToolBarPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/ToolBarSouthState.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/ToolBarToggleButtonPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/ToolBarWestState.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/ToolTipPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/TreeCellEditorPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/TreeCellPainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/TreePainter.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/awt/resources/awt.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/awt/resources/awt_de.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/awt/resources/awt_es.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/awt/resources/awt_fr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/awt/resources/awt_it.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/awt/resources/awt_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/awt/resources/awt_ko.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/awt/resources/awt_pt_BR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/awt/resources/awt_sv.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/awt/resources/awt_zh_CN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/awt/resources/awt_zh_HK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/awt/resources/awt_zh_TW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/management/resources/agent.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/management/resources/agent_de.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/management/resources/agent_es.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/management/resources/agent_fr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/management/resources/agent_it.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/management/resources/agent_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/management/resources/agent_ko.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/management/resources/agent_pt_BR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/management/resources/agent_sv.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/management/resources/agent_zh_CN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/management/resources/agent_zh_HK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/management/resources/agent_zh_TW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/misc/resources/Messages_zh_HK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/IBM437.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/IBM737.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/IBM775.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/IBM850.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/IBM852.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/IBM855.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/IBM857.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/IBM858.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/IBM862.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/IBM866.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/IBM874.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ISO_8859_13.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ISO_8859_15.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ISO_8859_2.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ISO_8859_4.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ISO_8859_5.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ISO_8859_7.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ISO_8859_9.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/KOI8_R.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/KOI8_U.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/MS1250.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/MS1251.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/MS1252.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/MS1253.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/MS1254.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/MS1257.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/Big5.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/EUC_CN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/EUC_KR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/EUC_TWMapping.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/GBK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/HKSCS2001Mapping.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/HKSCSMapping.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/HKSCS_XPMapping.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM037.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM1006.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM1025.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM1026.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM1046.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM1047.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM1097.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM1098.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM1112.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM1122.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM1123.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM1124.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM1140.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM1141.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM1142.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM1143.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM1144.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM1145.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM1146.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM1147.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM1148.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM1149.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM1364.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM1381.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM1383.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM273.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM277.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM278.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM280.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM284.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM285.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM290.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM297.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM300.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM420.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM424.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM500.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM833.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM838.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM856.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM860.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM861.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM863.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM864.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM865.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM868.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM869.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM870.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM871.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM875.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM918.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM921.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM922.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM930.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM933.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM935.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM937.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM939.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM942.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM943.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM948.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM949.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM950.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/IBM970.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/ISO_8859_11.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/ISO_8859_3.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/ISO_8859_6.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/ISO_8859_8.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/JIS_X_0201.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/JIS_X_0208.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/JIS_X_0208_MS5022X.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/JIS_X_0208_MS932.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/JIS_X_0208_Solaris.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/JIS_X_0212.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/JIS_X_0212_MS5022X.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/JIS_X_0212_Solaris.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/Johab.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/MacArabic.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/MacCentralEurope.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/MacCroatian.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/MacCyrillic.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/MacDingbat.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/MacGreek.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/MacHebrew.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/MacIceland.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/MacRoman.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/MacRomania.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/MacSymbol.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/MacThai.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/MacTurkish.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/MacUkraine.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/MS1255.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/MS1256.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/MS1258.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/MS874.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/MS932.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/MS936.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/MS949.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/MS950.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/PCK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/SJIS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/TIS_620.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/print/resources/serviceui.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/print/resources/serviceui_de.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/print/resources/serviceui_es.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/print/resources/serviceui_fr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/print/resources/serviceui_it.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/print/resources/serviceui_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/print/resources/serviceui_ko.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/print/resources/serviceui_pt_BR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/print/resources/serviceui_sv.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/print/resources/serviceui_zh_CN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/print/resources/serviceui_zh_HK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/print/resources/serviceui_zh_TW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/security/util/AuthResources_zh_HK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/security/util/Resources_zh_HK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/FormatData.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/aa/FormatData_aa.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/af/FormatData_af.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/af/FormatData_af_NA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/agq/FormatData_agq.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ak/FormatData_ak.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/am/FormatData_am.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ar/FormatData_ar.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ar/FormatData_ar_DZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ar/FormatData_ar_JO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ar/FormatData_ar_LB.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ar/FormatData_ar_MA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ar/FormatData_ar_QA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ar/FormatData_ar_SA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ar/FormatData_ar_SY.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ar/FormatData_ar_TN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ar/FormatData_ar_YE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/as/FormatData_as.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/asa/FormatData_asa.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/az/FormatData_az.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/az/FormatData_az_Cyrl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/bas/FormatData_bas.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/be/FormatData_be.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/bem/FormatData_bem.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/bez/FormatData_bez.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/bg/FormatData_bg.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/bm/FormatData_bm.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/bn/FormatData_bn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/bn/FormatData_bn_IN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/bo/FormatData_bo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/br/FormatData_br.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/brx/FormatData_brx.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/bs/FormatData_bs.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/byn/FormatData_byn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ca/FormatData_ca.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/cgg/FormatData_cgg.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/chr/FormatData_chr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/cs/FormatData_cs.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/cy/FormatData_cy.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/da/FormatData_da.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/dav/FormatData_dav.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/de/FormatData_de.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/de/FormatData_de_AT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/de/FormatData_de_CH.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/de/FormatData_de_LI.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/dje/FormatData_dje.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/dua/FormatData_dua.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/dyo/FormatData_dyo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/dz/FormatData_dz.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ebu/FormatData_ebu.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ee/FormatData_ee.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/el/FormatData_el.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/el/FormatData_el_CY.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/en/FormatData_en.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/en/FormatData_en_AU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/en/FormatData_en_BE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/en/FormatData_en_BW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/en/FormatData_en_BZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/en/FormatData_en_CA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/en/FormatData_en_Dsrt.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/en/FormatData_en_GB.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/en/FormatData_en_HK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/en/FormatData_en_IE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/en/FormatData_en_IN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/en/FormatData_en_JM.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/en/FormatData_en_MT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/en/FormatData_en_NA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/en/FormatData_en_NZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/en/FormatData_en_PK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/en/FormatData_en_SG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/en/FormatData_en_TT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/en/FormatData_en_US_POSIX.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/en/FormatData_en_ZA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/en/FormatData_en_ZW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/eo/FormatData_eo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/es/FormatData_es.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/es/FormatData_es_419.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/es/FormatData_es_AR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/es/FormatData_es_BO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/es/FormatData_es_CL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/es/FormatData_es_CO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/es/FormatData_es_CR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/es/FormatData_es_EC.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/es/FormatData_es_GQ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/es/FormatData_es_GT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/es/FormatData_es_HN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/es/FormatData_es_PA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/es/FormatData_es_PE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/es/FormatData_es_PR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/es/FormatData_es_PY.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/es/FormatData_es_US.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/es/FormatData_es_UY.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/es/FormatData_es_VE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/et/FormatData_et.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/eu/FormatData_eu.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ewo/FormatData_ewo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/fa/FormatData_fa.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/fa/FormatData_fa_AF.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ff/FormatData_ff.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/fi/FormatData_fi.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/fil/FormatData_fil.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/fo/FormatData_fo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/fr/FormatData_fr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/fr/FormatData_fr_BE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/fr/FormatData_fr_CA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/fr/FormatData_fr_CH.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/fr/FormatData_fr_LU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/fur/FormatData_fur.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ga/FormatData_ga.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/gd/FormatData_gd.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/gl/FormatData_gl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/gsw/FormatData_gsw.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/gu/FormatData_gu.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/guz/FormatData_guz.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/gv/FormatData_gv.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ha/FormatData_ha.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/haw/FormatData_haw.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/he/FormatData_he.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/hi/FormatData_hi.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/hr/FormatData_hr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/hu/FormatData_hu.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/hy/FormatData_hy.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ia/FormatData_ia.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/id/FormatData_id.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ig/FormatData_ig.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ii/FormatData_ii.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/is/FormatData_is.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/it/FormatData_it.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/it/FormatData_it_CH.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ja/FormatData_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/jmc/FormatData_jmc.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ka/FormatData_ka.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/kab/FormatData_kab.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/kam/FormatData_kam.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/kde/FormatData_kde.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/kea/FormatData_kea.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/khq/FormatData_khq.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ki/FormatData_ki.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/kk/FormatData_kk.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/kl/FormatData_kl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/kln/FormatData_kln.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/km/FormatData_km.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/kn/FormatData_kn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ko/FormatData_ko.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/kok/FormatData_kok.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ksb/FormatData_ksb.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ksf/FormatData_ksf.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ksh/FormatData_ksh.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/kw/FormatData_kw.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/lag/FormatData_lag.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/lg/FormatData_lg.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ln/FormatData_ln.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/lo/FormatData_lo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/lt/FormatData_lt.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/lu/FormatData_lu.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/luo/FormatData_luo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/luy/FormatData_luy.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/lv/FormatData_lv.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/mas/FormatData_mas.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/mer/FormatData_mer.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/mfe/FormatData_mfe.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/mg/FormatData_mg.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/mgh/FormatData_mgh.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/mk/FormatData_mk.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ml/FormatData_ml.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/mr/FormatData_mr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ms/FormatData_ms.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ms/FormatData_ms_BN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/mt/FormatData_mt.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/mua/FormatData_mua.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/my/FormatData_my.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/naq/FormatData_naq.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/nb/FormatData_nb.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/nd/FormatData_nd.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ne/FormatData_ne.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ne/FormatData_ne_IN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/nl/FormatData_nl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/nl/FormatData_nl_BE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/nmg/FormatData_nmg.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/nn/FormatData_nn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/nr/FormatData_nr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/nso/FormatData_nso.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/nus/FormatData_nus.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/nyn/FormatData_nyn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/om/FormatData_om.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/or/FormatData_or.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/pa/FormatData_pa.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/pa/FormatData_pa_Arab.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/pl/FormatData_pl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ps/FormatData_ps.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/pt/FormatData_pt.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/pt/FormatData_pt_PT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/rm/FormatData_rm.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/rn/FormatData_rn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ro/FormatData_ro.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/rof/FormatData_rof.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ru/FormatData_ru.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ru/FormatData_ru_UA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/rw/FormatData_rw.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/rwk/FormatData_rwk.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/saq/FormatData_saq.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/sbp/FormatData_sbp.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/se/FormatData_se.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/seh/FormatData_seh.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ses/FormatData_ses.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/sg/FormatData_sg.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/shi/FormatData_shi.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/shi/FormatData_shi_Tfng.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/si/FormatData_si.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/sk/FormatData_sk.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/sl/FormatData_sl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/sn/FormatData_sn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/so/FormatData_so.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/sq/FormatData_sq.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/sr/FormatData_sr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/sr/FormatData_sr_Cyrl_BA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/sr/FormatData_sr_Latn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/sr/FormatData_sr_Latn_ME.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ss/FormatData_ss.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ssy/FormatData_ssy.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/st/FormatData_st.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/sv/FormatData_sv.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/sv/FormatData_sv_FI.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/sw/FormatData_sw.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/sw/FormatData_sw_KE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/swc/FormatData_swc.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ta/FormatData_ta.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/te/FormatData_te.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/teo/FormatData_teo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/th/FormatData_th.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ti/FormatData_ti.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ti/FormatData_ti_ER.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/tig/FormatData_tig.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/tn/FormatData_tn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/to/FormatData_to.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/tr/FormatData_tr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ts/FormatData_ts.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/twq/FormatData_twq.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/tzm/FormatData_tzm.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/uk/FormatData_uk.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ur/FormatData_ur.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ur/FormatData_ur_IN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/uz/FormatData_uz.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/uz/FormatData_uz_Arab.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/uz/FormatData_uz_Latn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/vai/FormatData_vai.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/vai/FormatData_vai_Latn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ve/FormatData_ve.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/vi/FormatData_vi.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/vun/FormatData_vun.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/wae/FormatData_wae.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/wal/FormatData_wal.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/xh/FormatData_xh.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/xog/FormatData_xog.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/yav/FormatData_yav.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/yo/FormatData_yo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/zh/FormatData_zh.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/zh/FormatData_zh_Hans_HK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/zh/FormatData_zh_Hans_MO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/zh/FormatData_zh_Hans_SG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/zh/FormatData_zh_Hant.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/zh/FormatData_zh_Hant_HK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/zh/FormatData_zh_Hant_MO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/zu/FormatData_zu.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/tools/jar/resources/jar.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/tools/jar/resources/jar_de.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/tools/jar/resources/jar_es.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/tools/jar/resources/jar_fr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/tools/jar/resources/jar_it.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/tools/jar/resources/jar_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/tools/jar/resources/jar_ko.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/tools/jar/resources/jar_pt_BR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/tools/jar/resources/jar_sv.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/tools/jar/resources/jar_zh_CN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/tools/jar/resources/jar_zh_HK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/tools/jar/resources/jar_zh_TW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/CoreResourceBundleControl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/cldr/CLDRLocaleDataMetaInfo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/locale/provider/LocaleDataMetaInfo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/logging/resources/logging.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/logging/resources/logging_de.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/logging/resources/logging_es.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/logging/resources/logging_fr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/logging/resources/logging_it.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/logging/resources/logging_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/logging/resources/logging_ko.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/logging/resources/logging_pt_BR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/logging/resources/logging_sv.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/logging/resources/logging_zh_CN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/logging/resources/logging_zh_HK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/logging/resources/logging_zh_TW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/CalendarData.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/CurrencyNames.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/LocaleNames.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ar/CalendarData_ar.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ar/CurrencyNames_ar_AE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ar/CurrencyNames_ar_BH.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ar/CurrencyNames_ar_DZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ar/CurrencyNames_ar_EG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ar/CurrencyNames_ar_IQ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ar/CurrencyNames_ar_JO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ar/CurrencyNames_ar_KW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ar/CurrencyNames_ar_LB.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ar/CurrencyNames_ar_LY.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ar/CurrencyNames_ar_MA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ar/CurrencyNames_ar_OM.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ar/CurrencyNames_ar_QA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ar/CurrencyNames_ar_SA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ar/CurrencyNames_ar_SD.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ar/CurrencyNames_ar_SY.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ar/CurrencyNames_ar_TN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ar/CurrencyNames_ar_YE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ar/LocaleNames_ar.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/be/CalendarData_be.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/be/CurrencyNames_be_BY.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/be/LocaleNames_be.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/bg/CalendarData_bg.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/bg/CurrencyNames_bg_BG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/bg/LocaleNames_bg.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ca/CalendarData_ca.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ca/CurrencyNames_ca_ES.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ca/LocaleNames_ca.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/CalendarData.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/CurrencyNames.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/LocaleNames.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/TimeZoneNames.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/aa/CalendarData_aa_DJ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/aa/CalendarData_aa_ER.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/aa/CalendarData_aa_ET.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/aa/CurrencyNames_aa.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/aa/CurrencyNames_aa_DJ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/aa/CurrencyNames_aa_ER.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/af/CalendarData_af_NA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/af/CalendarData_af_ZA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/af/CurrencyNames_af.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/af/CurrencyNames_af_NA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/af/LocaleNames_af.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/af/TimeZoneNames_af.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/agq/CalendarData_agq_CM.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/agq/CurrencyNames_agq.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/agq/LocaleNames_agq.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ak/CalendarData_ak_GH.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ak/CurrencyNames_ak.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ak/LocaleNames_ak.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/am/CalendarData_am_ET.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/am/CurrencyNames_am.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/am/LocaleNames_am.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/am/TimeZoneNames_am.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ar/CalendarData_ar_AE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ar/CalendarData_ar_BH.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ar/CalendarData_ar_DZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ar/CalendarData_ar_EG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ar/CalendarData_ar_IQ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ar/CalendarData_ar_JO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ar/CalendarData_ar_KW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ar/CalendarData_ar_LB.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ar/CalendarData_ar_LY.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ar/CalendarData_ar_MA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ar/CalendarData_ar_OM.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ar/CalendarData_ar_QA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ar/CalendarData_ar_SA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ar/CalendarData_ar_SD.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ar/CalendarData_ar_SY.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ar/CalendarData_ar_TN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ar/CalendarData_ar_YE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ar/CurrencyNames_ar.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ar/LocaleNames_ar.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ar/TimeZoneNames_ar.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/as/CalendarData_as_IN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/as/LocaleNames_as.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/as/TimeZoneNames_as.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/asa/CalendarData_asa_TZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/asa/CurrencyNames_asa.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/asa/LocaleNames_asa.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/az/CalendarData_az_Cyrl_AZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/az/CalendarData_az_Latn_AZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/az/CurrencyNames_az.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/az/CurrencyNames_az_Cyrl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/az/LocaleNames_az.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/az/LocaleNames_az_Cyrl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/az/TimeZoneNames_az.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bas/CalendarData_bas_CM.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bas/CurrencyNames_bas.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bas/LocaleNames_bas.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/be/CalendarData_be_BY.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/be/CurrencyNames_be.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/be/LocaleNames_be.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/be/TimeZoneNames_be.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bem/CalendarData_bem_ZM.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bem/CurrencyNames_bem.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bem/LocaleNames_bem.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bez/CalendarData_bez_TZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bez/CurrencyNames_bez.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bez/LocaleNames_bez.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bg/CalendarData_bg_BG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bg/CurrencyNames_bg.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bg/LocaleNames_bg.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bg/TimeZoneNames_bg.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bm/CalendarData_bm_ML.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bm/CurrencyNames_bm.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bm/LocaleNames_bm.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bn/CalendarData_bn_BD.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bn/CalendarData_bn_IN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bn/CurrencyNames_bn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bn/LocaleNames_bn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bn/LocaleNames_bn_IN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bn/TimeZoneNames_bn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bo/CalendarData_bo_CN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bo/CalendarData_bo_IN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bo/CurrencyNames_bo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bo/LocaleNames_bo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/br/CalendarData_br_FR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/br/CurrencyNames_br.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/br/LocaleNames_br.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/brx/CalendarData_brx_IN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/brx/CurrencyNames_brx.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/brx/LocaleNames_brx.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/brx/TimeZoneNames_brx.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bs/CalendarData_bs_BA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bs/CurrencyNames_bs.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bs/LocaleNames_bs.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bs/TimeZoneNames_bs.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/byn/CalendarData_byn_ER.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/byn/CurrencyNames_byn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ca/CalendarData_ca_ES.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ca/CurrencyNames_ca.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ca/LocaleNames_ca.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ca/TimeZoneNames_ca.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/cgg/CalendarData_cgg_UG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/cgg/CurrencyNames_cgg.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/cgg/LocaleNames_cgg.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/chr/CalendarData_chr_US.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/chr/CurrencyNames_chr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/chr/LocaleNames_chr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/chr/TimeZoneNames_chr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/cs/CalendarData_cs_CZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/cs/CurrencyNames_cs.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/cs/LocaleNames_cs.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/cs/TimeZoneNames_cs.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/cy/CalendarData_cy_GB.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/cy/CurrencyNames_cy.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/cy/LocaleNames_cy.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/da/CalendarData_da_DK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/da/CurrencyNames_da.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/da/LocaleNames_da.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/da/TimeZoneNames_da.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/dav/CalendarData_dav_KE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/dav/CurrencyNames_dav.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/dav/LocaleNames_dav.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/de/CalendarData_de_AT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/de/CalendarData_de_BE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/de/CalendarData_de_CH.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/de/CalendarData_de_DE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/de/CalendarData_de_LI.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/de/CalendarData_de_LU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/de/CurrencyNames_de.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/de/CurrencyNames_de_LU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/de/LocaleNames_de.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/de/LocaleNames_de_CH.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/de/TimeZoneNames_de.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/dje/CalendarData_dje_NE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/dje/CurrencyNames_dje.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/dje/LocaleNames_dje.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/dua/CalendarData_dua_CM.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/dua/LocaleNames_dua.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/dyo/CalendarData_dyo_SN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/dyo/CurrencyNames_dyo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/dyo/LocaleNames_dyo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/dz/CalendarData_dz_BT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/dz/CurrencyNames_dz.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ebu/CalendarData_ebu_KE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ebu/CurrencyNames_ebu.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ebu/LocaleNames_ebu.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ee/CalendarData_ee_GH.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ee/CalendarData_ee_TG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ee/CurrencyNames_ee.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ee/LocaleNames_ee.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ee/TimeZoneNames_ee.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/el/CalendarData_el_CY.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/el/CalendarData_el_GR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/el/CurrencyNames_el.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/el/LocaleNames_el.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/el/TimeZoneNames_el.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_AS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_AU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_BB.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_BE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_BM.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_BW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_BZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_CA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_Dsrt_US.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_GB.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_GU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_GY.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_HK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_IE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_IN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_JM.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_MH.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_MP.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_MT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_MU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_NA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_NZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_PH.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_PK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_SG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_TT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_UM.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_US.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_US_POSIX.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_VI.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_ZA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CalendarData_en_ZW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CurrencyNames_en.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CurrencyNames_en_AU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CurrencyNames_en_BB.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CurrencyNames_en_BM.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CurrencyNames_en_BW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CurrencyNames_en_BZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CurrencyNames_en_CA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CurrencyNames_en_HK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CurrencyNames_en_JM.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CurrencyNames_en_MT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CurrencyNames_en_NA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CurrencyNames_en_NZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CurrencyNames_en_PH.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CurrencyNames_en_PK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CurrencyNames_en_SG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CurrencyNames_en_TT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/CurrencyNames_en_ZA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/LocaleNames_en.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/LocaleNames_en_Dsrt.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/TimeZoneNames_en.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/TimeZoneNames_en_AU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/TimeZoneNames_en_CA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/TimeZoneNames_en_Dsrt.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/TimeZoneNames_en_GB.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/TimeZoneNames_en_GU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/TimeZoneNames_en_HK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/TimeZoneNames_en_IE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/TimeZoneNames_en_IN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/TimeZoneNames_en_NZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/TimeZoneNames_en_PK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/TimeZoneNames_en_SG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/TimeZoneNames_en_ZA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/TimeZoneNames_en_ZW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/eo/LocaleNames_eo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CalendarData_es_AR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CalendarData_es_BO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CalendarData_es_CL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CalendarData_es_CO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CalendarData_es_CR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CalendarData_es_DO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CalendarData_es_EC.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CalendarData_es_ES.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CalendarData_es_GQ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CalendarData_es_GT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CalendarData_es_HN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CalendarData_es_MX.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CalendarData_es_NI.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CalendarData_es_PA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CalendarData_es_PE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CalendarData_es_PR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CalendarData_es_PY.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CalendarData_es_SV.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CalendarData_es_US.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CalendarData_es_UY.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CalendarData_es_VE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CurrencyNames_es.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CurrencyNames_es_AR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CurrencyNames_es_BO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CurrencyNames_es_CL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CurrencyNames_es_CO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CurrencyNames_es_CR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CurrencyNames_es_DO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CurrencyNames_es_EC.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CurrencyNames_es_GT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CurrencyNames_es_HN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CurrencyNames_es_MX.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CurrencyNames_es_NI.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CurrencyNames_es_PA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CurrencyNames_es_PE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CurrencyNames_es_PR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CurrencyNames_es_PY.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CurrencyNames_es_US.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CurrencyNames_es_UY.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/CurrencyNames_es_VE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/LocaleNames_es.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/LocaleNames_es_CL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/TimeZoneNames_es.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/TimeZoneNames_es_419.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/TimeZoneNames_es_AR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/et/CalendarData_et_EE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/et/CurrencyNames_et.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/et/LocaleNames_et.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/et/TimeZoneNames_et.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/eu/CalendarData_eu_ES.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/eu/CurrencyNames_eu.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/eu/LocaleNames_eu.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/eu/TimeZoneNames_eu.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ewo/CalendarData_ewo_CM.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ewo/CurrencyNames_ewo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ewo/LocaleNames_ewo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fa/CalendarData_fa_AF.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fa/CalendarData_fa_IR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fa/CurrencyNames_fa.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fa/CurrencyNames_fa_AF.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fa/LocaleNames_fa.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fa/LocaleNames_fa_AF.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fa/TimeZoneNames_fa.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ff/CalendarData_ff_SN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ff/CurrencyNames_ff.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ff/LocaleNames_ff.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fi/CalendarData_fi_FI.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fi/CurrencyNames_fi.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fi/LocaleNames_fi.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fi/TimeZoneNames_fi.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fil/CalendarData_fil_PH.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fil/CurrencyNames_fil.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fil/LocaleNames_fil.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fil/TimeZoneNames_fil.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fo/CalendarData_fo_FO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fo/CurrencyNames_fo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fo/LocaleNames_fo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_BE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_BF.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_BI.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_BJ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_BL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_CA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_CD.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_CF.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_CG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_CH.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_CI.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_CM.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_DJ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_FR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_GA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_GF.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_GN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_GP.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_GQ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_KM.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_LU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_MC.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_MF.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_MG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_ML.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_MQ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_NE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_RE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_RW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_SN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_TD.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_TG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CalendarData_fr_YT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CurrencyNames_fr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CurrencyNames_fr_BI.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CurrencyNames_fr_CA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CurrencyNames_fr_DJ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CurrencyNames_fr_GN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CurrencyNames_fr_KM.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/CurrencyNames_fr_LU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/LocaleNames_fr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/TimeZoneNames_fr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/TimeZoneNames_fr_CA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fur/CalendarData_fur_IT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ga/CalendarData_ga_IE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ga/CurrencyNames_ga.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ga/LocaleNames_ga.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ga/TimeZoneNames_ga.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/gd/CalendarData_gd_GB.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/gl/CalendarData_gl_ES.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/gl/CurrencyNames_gl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/gl/LocaleNames_gl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/gl/TimeZoneNames_gl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/gsw/CalendarData_gsw_CH.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/gsw/CurrencyNames_gsw.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/gsw/LocaleNames_gsw.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/gsw/TimeZoneNames_gsw.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/gu/CalendarData_gu_IN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/gu/CurrencyNames_gu.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/gu/LocaleNames_gu.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/gu/TimeZoneNames_gu.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/guz/CalendarData_guz_KE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/guz/CurrencyNames_guz.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/guz/LocaleNames_guz.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/gv/CalendarData_gv_GB.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/gv/LocaleNames_gv.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ha/CalendarData_ha_Latn_GH.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ha/CalendarData_ha_Latn_NE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ha/CalendarData_ha_Latn_NG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ha/CurrencyNames_ha.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ha/LocaleNames_ha.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/haw/CalendarData_haw_US.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/haw/LocaleNames_haw.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/he/CalendarData_he_IL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/he/CurrencyNames_he.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/he/LocaleNames_he.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/he/TimeZoneNames_he.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/hi/CalendarData_hi_IN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/hi/CurrencyNames_hi.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/hi/LocaleNames_hi.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/hi/TimeZoneNames_hi.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/hr/CalendarData_hr_HR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/hr/CurrencyNames_hr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/hr/LocaleNames_hr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/hr/TimeZoneNames_hr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/hu/CalendarData_hu_HU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/hu/CurrencyNames_hu.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/hu/LocaleNames_hu.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/hu/TimeZoneNames_hu.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/hy/CalendarData_hy_AM.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/hy/CurrencyNames_hy.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/hy/LocaleNames_hy.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/id/CalendarData_id_ID.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/id/CurrencyNames_id.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/id/LocaleNames_id.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/id/TimeZoneNames_id.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ig/CalendarData_ig_NG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ig/CurrencyNames_ig.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ig/LocaleNames_ig.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ii/CalendarData_ii_CN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ii/CurrencyNames_ii.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ii/LocaleNames_ii.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/is/CalendarData_is_IS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/is/CurrencyNames_is.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/is/LocaleNames_is.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/is/TimeZoneNames_is.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/it/CalendarData_it_CH.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/it/CalendarData_it_IT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/it/CurrencyNames_it.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/it/LocaleNames_it.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/it/TimeZoneNames_it.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ja/CalendarData_ja_JP.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ja/CurrencyNames_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ja/LocaleNames_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ja/TimeZoneNames_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/jmc/CalendarData_jmc_TZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/jmc/CurrencyNames_jmc.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/jmc/LocaleNames_jmc.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ka/CalendarData_ka_GE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ka/CurrencyNames_ka.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ka/LocaleNames_ka.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kab/CalendarData_kab_DZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kab/CurrencyNames_kab.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kab/LocaleNames_kab.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kam/CalendarData_kam_KE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kam/CurrencyNames_kam.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kam/LocaleNames_kam.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kde/CalendarData_kde_TZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kde/CurrencyNames_kde.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kde/LocaleNames_kde.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kea/CalendarData_kea_CV.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kea/CurrencyNames_kea.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kea/LocaleNames_kea.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kea/TimeZoneNames_kea.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/khq/CalendarData_khq_ML.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/khq/CurrencyNames_khq.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/khq/LocaleNames_khq.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ki/CalendarData_ki_KE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ki/CurrencyNames_ki.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ki/LocaleNames_ki.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kk/CalendarData_kk_Cyrl_KZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kk/CurrencyNames_kk.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kk/LocaleNames_kk.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kk/TimeZoneNames_kk.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kl/CalendarData_kl_GL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kl/CurrencyNames_kl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kl/LocaleNames_kl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kln/CalendarData_kln_KE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kln/CurrencyNames_kln.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kln/LocaleNames_kln.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/km/CalendarData_km_KH.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/km/CurrencyNames_km.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/km/LocaleNames_km.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kn/CalendarData_kn_IN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kn/CurrencyNames_kn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kn/LocaleNames_kn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kn/TimeZoneNames_kn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ko/CalendarData_ko_KR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ko/CurrencyNames_ko.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ko/LocaleNames_ko.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ko/TimeZoneNames_ko.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kok/CalendarData_kok_IN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kok/LocaleNames_kok.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kok/TimeZoneNames_kok.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ksb/CalendarData_ksb_TZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ksb/CurrencyNames_ksb.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ksb/LocaleNames_ksb.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ksf/CalendarData_ksf_CM.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ksf/CurrencyNames_ksf.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ksf/LocaleNames_ksf.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ksh/CalendarData_ksh_DE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ksh/TimeZoneNames_ksh.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kw/CalendarData_kw_GB.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kw/LocaleNames_kw.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/lag/CalendarData_lag_TZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/lag/CurrencyNames_lag.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/lag/LocaleNames_lag.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/lg/CalendarData_lg_UG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/lg/CurrencyNames_lg.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/lg/LocaleNames_lg.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ln/CalendarData_ln_CD.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ln/CalendarData_ln_CG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ln/CurrencyNames_ln.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ln/LocaleNames_ln.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/lo/CalendarData_lo_LA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/lo/CurrencyNames_lo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/lt/CalendarData_lt_LT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/lt/CurrencyNames_lt.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/lt/LocaleNames_lt.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/lt/TimeZoneNames_lt.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/lu/CalendarData_lu_CD.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/lu/CurrencyNames_lu.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/lu/LocaleNames_lu.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/luo/CalendarData_luo_KE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/luo/CurrencyNames_luo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/luo/LocaleNames_luo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/luy/CalendarData_luy_KE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/luy/CurrencyNames_luy.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/luy/LocaleNames_luy.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/lv/CalendarData_lv_LV.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/lv/CurrencyNames_lv.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/lv/LocaleNames_lv.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/lv/TimeZoneNames_lv.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mas/CalendarData_mas_KE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mas/CalendarData_mas_TZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mas/CurrencyNames_mas.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mas/CurrencyNames_mas_TZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mas/LocaleNames_mas.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mer/CalendarData_mer_KE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mer/CurrencyNames_mer.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mer/LocaleNames_mer.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mfe/CalendarData_mfe_MU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mfe/CurrencyNames_mfe.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mfe/LocaleNames_mfe.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mg/CalendarData_mg_MG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mg/CurrencyNames_mg.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mg/LocaleNames_mg.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mgh/CalendarData_mgh_MZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mgh/CurrencyNames_mgh.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mgh/LocaleNames_mgh.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mk/CalendarData_mk_MK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mk/CurrencyNames_mk.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mk/LocaleNames_mk.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mk/TimeZoneNames_mk.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ml/CalendarData_ml_IN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ml/CurrencyNames_ml.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ml/LocaleNames_ml.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ml/TimeZoneNames_ml.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mr/CalendarData_mr_IN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mr/CurrencyNames_mr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mr/LocaleNames_mr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mr/TimeZoneNames_mr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ms/CalendarData_ms_BN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ms/CalendarData_ms_MY.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ms/CurrencyNames_ms.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ms/CurrencyNames_ms_BN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ms/LocaleNames_ms.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ms/TimeZoneNames_ms.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mt/CalendarData_mt_MT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mt/CurrencyNames_mt.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mt/LocaleNames_mt.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mt/TimeZoneNames_mt.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mua/CalendarData_mua_CM.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mua/CurrencyNames_mua.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mua/LocaleNames_mua.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/my/CalendarData_my_MM.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/my/CurrencyNames_my.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/my/LocaleNames_my.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/my/TimeZoneNames_my.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/naq/CalendarData_naq_NA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/naq/CurrencyNames_naq.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/naq/LocaleNames_naq.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nb/CalendarData_nb_NO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nb/CurrencyNames_nb.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nb/LocaleNames_nb.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nb/TimeZoneNames_nb.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nd/CalendarData_nd_ZW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nd/CurrencyNames_nd.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nd/LocaleNames_nd.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ne/CalendarData_ne_IN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ne/CalendarData_ne_NP.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ne/CurrencyNames_ne.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ne/CurrencyNames_ne_IN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ne/LocaleNames_ne.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ne/TimeZoneNames_ne.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nl/CalendarData_nl_AW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nl/CalendarData_nl_BE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nl/CalendarData_nl_CW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nl/CalendarData_nl_NL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nl/CalendarData_nl_SX.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nl/CurrencyNames_nl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nl/CurrencyNames_nl_AW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nl/CurrencyNames_nl_CW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nl/CurrencyNames_nl_SX.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nl/LocaleNames_nl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nl/LocaleNames_nl_BE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nl/TimeZoneNames_nl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nmg/CalendarData_nmg_CM.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nmg/CurrencyNames_nmg.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nmg/LocaleNames_nmg.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nn/CalendarData_nn_NO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nn/CurrencyNames_nn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nn/LocaleNames_nn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nn/TimeZoneNames_nn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nr/CalendarData_nr_ZA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nr/CurrencyNames_nr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nso/CalendarData_nso_ZA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nso/CurrencyNames_nso.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nus/CalendarData_nus_SD.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nus/LocaleNames_nus.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nyn/CalendarData_nyn_UG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nyn/CurrencyNames_nyn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nyn/LocaleNames_nyn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/om/CalendarData_om_ET.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/om/CalendarData_om_KE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/om/CurrencyNames_om.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/om/CurrencyNames_om_KE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/om/LocaleNames_om.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/or/CalendarData_or_IN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/or/CurrencyNames_or.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/or/LocaleNames_or.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/or/TimeZoneNames_or.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pa/CalendarData_pa_Arab_PK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pa/CalendarData_pa_Guru_IN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pa/CurrencyNames_pa.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pa/CurrencyNames_pa_Arab.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pa/LocaleNames_pa.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pa/LocaleNames_pa_Arab.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pa/TimeZoneNames_pa.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pl/CalendarData_pl_PL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pl/CurrencyNames_pl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pl/LocaleNames_pl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pl/TimeZoneNames_pl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ps/CalendarData_ps_AF.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ps/CurrencyNames_ps.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ps/LocaleNames_ps.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pt/CalendarData_pt_AO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pt/CalendarData_pt_BR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pt/CalendarData_pt_GW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pt/CalendarData_pt_MZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pt/CalendarData_pt_PT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pt/CalendarData_pt_ST.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pt/CurrencyNames_pt.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pt/CurrencyNames_pt_AO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pt/CurrencyNames_pt_MZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pt/CurrencyNames_pt_PT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pt/CurrencyNames_pt_ST.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pt/LocaleNames_pt.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pt/LocaleNames_pt_PT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pt/TimeZoneNames_pt.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pt/TimeZoneNames_pt_PT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/rm/CalendarData_rm_CH.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/rm/CurrencyNames_rm.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/rm/LocaleNames_rm.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/rn/CalendarData_rn_BI.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/rn/CurrencyNames_rn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/rn/LocaleNames_rn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ro/CalendarData_ro_MD.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ro/CalendarData_ro_RO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ro/CurrencyNames_ro.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ro/LocaleNames_ro.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ro/TimeZoneNames_ro.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/rof/CalendarData_rof_TZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/rof/CurrencyNames_rof.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/rof/LocaleNames_rof.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ru/CalendarData_ru_MD.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ru/CalendarData_ru_RU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ru/CalendarData_ru_UA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ru/CurrencyNames_ru.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ru/LocaleNames_ru.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ru/LocaleNames_ru_UA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ru/TimeZoneNames_ru.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/rw/CalendarData_rw_RW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/rw/CurrencyNames_rw.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/rw/LocaleNames_rw.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/rwk/CalendarData_rwk_TZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/rwk/CurrencyNames_rwk.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/rwk/LocaleNames_rwk.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sah/CalendarData_sah_RU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sah/LocaleNames_sah.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/saq/CalendarData_saq_KE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/saq/CurrencyNames_saq.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/saq/LocaleNames_saq.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sbp/CalendarData_sbp_TZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sbp/CurrencyNames_sbp.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sbp/LocaleNames_sbp.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/se/CalendarData_se_FI.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/se/CalendarData_se_NO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/se/CurrencyNames_se.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/se/LocaleNames_se.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/seh/CalendarData_seh_MZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/seh/CurrencyNames_seh.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/seh/LocaleNames_seh.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ses/CalendarData_ses_ML.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ses/CurrencyNames_ses.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ses/LocaleNames_ses.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sg/CalendarData_sg_CF.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sg/CurrencyNames_sg.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sg/LocaleNames_sg.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/shi/CalendarData_shi_Latn_MA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/shi/CalendarData_shi_Tfng_MA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/shi/CurrencyNames_shi.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/shi/CurrencyNames_shi_Tfng.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/shi/LocaleNames_shi.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/shi/LocaleNames_shi_Tfng.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/si/CalendarData_si_LK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/si/CurrencyNames_si.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/si/LocaleNames_si.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sk/CalendarData_sk_SK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sk/CurrencyNames_sk.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sk/LocaleNames_sk.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sk/TimeZoneNames_sk.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sl/CalendarData_sl_SI.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sl/CurrencyNames_sl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sl/LocaleNames_sl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sl/TimeZoneNames_sl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sn/CalendarData_sn_ZW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sn/CurrencyNames_sn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sn/LocaleNames_sn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/so/CalendarData_so_DJ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/so/CalendarData_so_ET.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/so/CalendarData_so_KE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/so/CalendarData_so_SO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/so/CurrencyNames_so.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/so/CurrencyNames_so_DJ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/so/CurrencyNames_so_ET.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/so/CurrencyNames_so_KE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/so/LocaleNames_so.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sq/CalendarData_sq_AL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sq/CurrencyNames_sq.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sq/LocaleNames_sq.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sq/TimeZoneNames_sq.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sr/CalendarData_sr_Cyrl_BA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sr/CalendarData_sr_Cyrl_ME.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sr/CalendarData_sr_Cyrl_RS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sr/CalendarData_sr_Latn_BA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sr/CalendarData_sr_Latn_ME.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sr/CalendarData_sr_Latn_RS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sr/CurrencyNames_sr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sr/CurrencyNames_sr_Cyrl_BA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sr/CurrencyNames_sr_Latn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sr/LocaleNames_sr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sr/LocaleNames_sr_Latn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sr/TimeZoneNames_sr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sr/TimeZoneNames_sr_Latn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ss/CalendarData_ss_SZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ss/CalendarData_ss_ZA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ss/CurrencyNames_ss.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ssy/CalendarData_ssy_ER.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ssy/CurrencyNames_ssy.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/st/CalendarData_st_LS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/st/CalendarData_st_ZA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/st/CurrencyNames_st.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/st/CurrencyNames_st_LS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/st/LocaleNames_st.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sv/CalendarData_sv_FI.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sv/CalendarData_sv_SE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sv/CurrencyNames_sv.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sv/LocaleNames_sv.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sv/TimeZoneNames_sv.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sw/CalendarData_sw_KE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sw/CalendarData_sw_TZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sw/CurrencyNames_sw.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sw/LocaleNames_sw.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sw/TimeZoneNames_sw.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/swc/CalendarData_swc_CD.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/swc/CurrencyNames_swc.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/swc/LocaleNames_swc.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ta/CalendarData_ta_IN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ta/CalendarData_ta_LK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ta/CurrencyNames_ta.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ta/CurrencyNames_ta_LK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ta/LocaleNames_ta.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ta/TimeZoneNames_ta.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/te/CalendarData_te_IN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/te/CurrencyNames_te.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/te/LocaleNames_te.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/te/TimeZoneNames_te.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/teo/CalendarData_teo_KE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/teo/CalendarData_teo_UG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/teo/CurrencyNames_teo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/teo/CurrencyNames_teo_KE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/teo/LocaleNames_teo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/tg/CalendarData_tg_Cyrl_TJ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/tg/LocaleNames_tg.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/th/CalendarData_th_TH.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/th/CurrencyNames_th.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/th/LocaleNames_th.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/th/TimeZoneNames_th.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ti/CalendarData_ti_ER.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ti/CalendarData_ti_ET.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ti/CurrencyNames_ti.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ti/CurrencyNames_ti_ER.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ti/LocaleNames_ti.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/tig/CalendarData_tig_ER.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/tig/CurrencyNames_tig.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/tn/CalendarData_tn_ZA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/tn/CurrencyNames_tn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/to/CalendarData_to_TO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/to/CurrencyNames_to.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/to/LocaleNames_to.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/to/TimeZoneNames_to.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/tr/CalendarData_tr_TR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/tr/CurrencyNames_tr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/tr/LocaleNames_tr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/tr/TimeZoneNames_tr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ts/CalendarData_ts_ZA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ts/CurrencyNames_ts.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/twq/CalendarData_twq_NE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/twq/CurrencyNames_twq.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/twq/LocaleNames_twq.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/tzm/CalendarData_tzm_Latn_MA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/tzm/CurrencyNames_tzm.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/tzm/LocaleNames_tzm.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/uk/CalendarData_uk_UA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/uk/CurrencyNames_uk.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/uk/LocaleNames_uk.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/uk/TimeZoneNames_uk.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ur/CalendarData_ur_IN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ur/CalendarData_ur_PK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ur/CurrencyNames_ur.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ur/LocaleNames_ur.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ur/TimeZoneNames_ur.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/uz/CalendarData_uz_Arab_AF.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/uz/CalendarData_uz_Cyrl_UZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/uz/CalendarData_uz_Latn_UZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/uz/CurrencyNames_uz_Arab.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/uz/LocaleNames_uz.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/uz/LocaleNames_uz_Arab.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/uz/LocaleNames_uz_Latn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/vai/CalendarData_vai_Latn_LR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/vai/CalendarData_vai_Vaii_LR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/vai/CurrencyNames_vai.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/vai/CurrencyNames_vai_Latn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/vai/LocaleNames_vai.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/vai/LocaleNames_vai_Latn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ve/CalendarData_ve_ZA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ve/CurrencyNames_ve.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/vi/CalendarData_vi_VN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/vi/CurrencyNames_vi.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/vi/LocaleNames_vi.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/vi/TimeZoneNames_vi.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/vun/CalendarData_vun_TZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/vun/CurrencyNames_vun.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/vun/LocaleNames_vun.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/wae/CalendarData_wae_CH.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/wae/LocaleNames_wae.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/wal/CalendarData_wal_ET.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/wal/CurrencyNames_wal.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/xh/CalendarData_xh_ZA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/xh/CurrencyNames_xh.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/xog/CalendarData_xog_UG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/xog/CurrencyNames_xog.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/xog/LocaleNames_xog.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/yav/CalendarData_yav_CM.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/yav/CurrencyNames_yav.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/yav/LocaleNames_yav.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/yo/CalendarData_yo_NG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/yo/CurrencyNames_yo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/yo/LocaleNames_yo.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/zh/CalendarData_zh_Hans_CN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/zh/CalendarData_zh_Hans_HK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/zh/CalendarData_zh_Hans_MO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/zh/CalendarData_zh_Hans_SG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/zh/CalendarData_zh_Hant_HK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/zh/CalendarData_zh_Hant_MO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/zh/CalendarData_zh_Hant_TW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/zh/CurrencyNames_zh.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/zh/CurrencyNames_zh_Hans_HK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/zh/CurrencyNames_zh_Hans_MO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/zh/CurrencyNames_zh_Hans_SG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/zh/CurrencyNames_zh_Hant.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/zh/CurrencyNames_zh_Hant_HK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/zh/LocaleNames_zh.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/zh/LocaleNames_zh_Hans_HK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/zh/LocaleNames_zh_Hans_MO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/zh/LocaleNames_zh_Hans_SG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/zh/LocaleNames_zh_Hant.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/zh/LocaleNames_zh_Hant_HK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/zh/TimeZoneNames_zh.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/zh/TimeZoneNames_zh_Hant.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/zu/CalendarData_zu_ZA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/zu/CurrencyNames_zu.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/zu/LocaleNames_zu.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/zu/TimeZoneNames_zu.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cs/CalendarData_cs.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cs/CurrencyNames_cs_CZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cs/LocaleNames_cs.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/da/CalendarData_da.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/da/CurrencyNames_da_DK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/da/LocaleNames_da.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/de/CalendarData_de.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/de/CurrencyNames_de.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/de/CurrencyNames_de_AT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/de/CurrencyNames_de_CH.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/de/CurrencyNames_de_DE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/de/CurrencyNames_de_GR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/de/CurrencyNames_de_LU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/de/LocaleNames_de.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/el/CalendarData_el.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/el/CalendarData_el_CY.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/el/CurrencyNames_el_CY.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/el/CurrencyNames_el_GR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/el/LocaleNames_el.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/el/LocaleNames_el_CY.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/en/CalendarData_en.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/en/CalendarData_en_GB.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/en/CalendarData_en_IE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/en/CalendarData_en_MT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/en/CurrencyNames_en_AU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/en/CurrencyNames_en_CA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/en/CurrencyNames_en_GB.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/en/CurrencyNames_en_IE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/en/CurrencyNames_en_IN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/en/CurrencyNames_en_MT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/en/CurrencyNames_en_NZ.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/en/CurrencyNames_en_PH.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/en/CurrencyNames_en_SG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/en/CurrencyNames_en_US.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/en/CurrencyNames_en_ZA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/en/LocaleNames_en.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/en/LocaleNames_en_MT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/en/LocaleNames_en_PH.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/en/LocaleNames_en_SG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/CalendarData_es.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/CalendarData_es_ES.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/CalendarData_es_US.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/CurrencyNames_es.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/CurrencyNames_es_AR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/CurrencyNames_es_BO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/CurrencyNames_es_CL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/CurrencyNames_es_CO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/CurrencyNames_es_CR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/CurrencyNames_es_CU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/CurrencyNames_es_DO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/CurrencyNames_es_EC.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/CurrencyNames_es_ES.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/CurrencyNames_es_GT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/CurrencyNames_es_HN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/CurrencyNames_es_MX.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/CurrencyNames_es_NI.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/CurrencyNames_es_PA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/CurrencyNames_es_PE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/CurrencyNames_es_PR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/CurrencyNames_es_PY.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/CurrencyNames_es_SV.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/CurrencyNames_es_US.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/CurrencyNames_es_UY.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/CurrencyNames_es_VE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/LocaleNames_es.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/LocaleNames_es_US.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/et/CalendarData_et.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/et/CurrencyNames_et_EE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/et/LocaleNames_et.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/fi/CalendarData_fi.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/fi/CurrencyNames_fi_FI.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/fi/LocaleNames_fi.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/fr/CalendarData_fr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/fr/CalendarData_fr_CA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/fr/CurrencyNames_fr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/fr/CurrencyNames_fr_BE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/fr/CurrencyNames_fr_CA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/fr/CurrencyNames_fr_CH.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/fr/CurrencyNames_fr_FR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/fr/CurrencyNames_fr_LU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/fr/LocaleNames_fr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ga/CurrencyNames_ga_IE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ga/LocaleNames_ga.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/hi/CalendarData_hi.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/hi/CurrencyNames_hi_IN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/hi/LocaleNames_hi.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/hr/CalendarData_hr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/hr/CurrencyNames_hr_HR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/hr/LocaleNames_hr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/hu/CalendarData_hu.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/hu/CurrencyNames_hu_HU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/hu/LocaleNames_hu.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/in/CalendarData_in_ID.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/in/CurrencyNames_in_ID.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/in/LocaleNames_in.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/is/CalendarData_is.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/is/CurrencyNames_is_IS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/is/LocaleNames_is.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/it/CalendarData_it.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/it/CurrencyNames_it.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/it/CurrencyNames_it_CH.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/it/CurrencyNames_it_IT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/it/LocaleNames_it.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/iw/CalendarData_iw.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/iw/CurrencyNames_iw_IL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/iw/LocaleNames_iw.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ja/CalendarData_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ja/CurrencyNames_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ja/CurrencyNames_ja_JP.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ja/LocaleNames_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ko/CalendarData_ko.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ko/CurrencyNames_ko.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ko/CurrencyNames_ko_KR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ko/LocaleNames_ko.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/lt/CalendarData_lt.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/lt/CurrencyNames_lt_LT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/lt/LocaleNames_lt.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/lv/CalendarData_lv.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/lv/CurrencyNames_lv_LV.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/lv/LocaleNames_lv.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/mk/CalendarData_mk.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/mk/CurrencyNames_mk_MK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/mk/LocaleNames_mk.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ms/CalendarData_ms_MY.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ms/CurrencyNames_ms_MY.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ms/LocaleNames_ms.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/mt/CalendarData_mt.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/mt/CalendarData_mt_MT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/mt/CurrencyNames_mt_MT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/mt/LocaleNames_mt.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/nl/CalendarData_nl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/nl/CurrencyNames_nl_BE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/nl/CurrencyNames_nl_NL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/nl/LocaleNames_nl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/no/CalendarData_no.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/no/CurrencyNames_no_NO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/no/LocaleNames_no.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/no/LocaleNames_no_NO_NY.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/pl/CalendarData_pl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/pl/CurrencyNames_pl_PL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/pl/LocaleNames_pl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/pt/CalendarData_pt.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/pt/CalendarData_pt_BR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/pt/CalendarData_pt_PT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/pt/CurrencyNames_pt.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/pt/CurrencyNames_pt_BR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/pt/CurrencyNames_pt_PT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/pt/LocaleNames_pt.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/pt/LocaleNames_pt_PT.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ro/CalendarData_ro.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ro/CurrencyNames_ro_RO.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ro/LocaleNames_ro.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ru/CalendarData_ru.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ru/CurrencyNames_ru_RU.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ru/LocaleNames_ru.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sk/CalendarData_sk.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sk/CurrencyNames_sk_SK.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sk/LocaleNames_sk.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sl/CalendarData_sl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sl/CurrencyNames_sl_SI.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sl/LocaleNames_sl.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sq/CalendarData_sq.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sq/CurrencyNames_sq_AL.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sq/LocaleNames_sq.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sr/CalendarData_sr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sr/CalendarData_sr_Latn_BA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sr/CalendarData_sr_Latn_ME.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sr/CalendarData_sr_Latn_RS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sr/CurrencyNames_sr_BA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sr/CurrencyNames_sr_CS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sr/CurrencyNames_sr_Latn_BA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sr/CurrencyNames_sr_Latn_ME.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sr/CurrencyNames_sr_Latn_RS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sr/CurrencyNames_sr_ME.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sr/CurrencyNames_sr_RS.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sr/LocaleNames_sr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sr/LocaleNames_sr_Latn.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sv/CalendarData_sv.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sv/CurrencyNames_sv.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sv/CurrencyNames_sv_SE.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sv/LocaleNames_sv.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/th/CalendarData_th.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/th/CurrencyNames_th_TH.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/th/LocaleNames_th.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/tr/CalendarData_tr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/tr/CurrencyNames_tr_TR.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/tr/LocaleNames_tr.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/uk/CalendarData_uk.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/uk/CurrencyNames_uk_UA.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/uk/LocaleNames_uk.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/vi/CalendarData_vi.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/vi/CurrencyNames_vi_VN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/vi/LocaleNames_vi.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/zh/CalendarData_zh.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/zh/CurrencyNames_zh_CN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/zh/CurrencyNames_zh_TW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/zh/LocaleNames_zh.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/zh/LocaleNames_zh_SG.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/zh/LocaleNames_zh_TW.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/impsrc/com/sun/corba/se/impl/logging/ActivationSystemException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/impsrc/com/sun/corba/se/impl/logging/InterceptorsSystemException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/impsrc/com/sun/corba/se/impl/logging/IORSystemException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/impsrc/com/sun/corba/se/impl/logging/NamingSystemException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/impsrc/com/sun/corba/se/impl/logging/OMGSystemException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/impsrc/com/sun/corba/se/impl/logging/ORBUtilSystemException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/impsrc/com/sun/corba/se/impl/logging/POASystemException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/impsrc/com/sun/corba/se/impl/logging/UtilSystemException.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/doclets/formats/html/resources/standard.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/doclets/formats/html/resources/standard_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/doclets/internal/toolkit/resources/doclets.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/doclint/resources/doclint.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/doclint/resources/doclint_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/doclint/resources/doclint_zh_CN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/javac/resources/compiler.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/javac/resources/compiler_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/javac/resources/compiler_zh_CN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/javac/resources/javac.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/javac/resources/javac_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/javac/resources/javac_zh_CN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/javac/resources/legacy.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/javac/resources/version.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/javadoc/resources/javadoc.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/javadoc/resources/javadoc_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/javadoc/resources/javadoc_zh_CN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/javadoc/resources/version.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/javah/resources/l10n.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/javah/resources/l10n_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/javah/resources/l10n_zh_CN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/javah/resources/version.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/javap/resources/javap.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/javap/resources/javap_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/javap/resources/javap_zh_CN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/javap/resources/version.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/jdeps/resources/jdeps.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/jdeps/resources/jdeps_ja.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/jdeps/resources/jdeps_zh_CN.java
-@OPENJDK@/build/linux-x86_64-normal-server-release/langtools/gensrc/com/sun/tools/jdeps/resources/version.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/activation/CommandHandler.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/activation/NameServiceStartThread.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/activation/ORBD.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/activation/ProcessMonitorThread.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/activation/RepositoryImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/activation/ServerTableEntry.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/activation/ServerTool.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/copyobject/CopierManagerImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/copyobject/FallbackObjectCopierImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/copyobject/JavaStreamObjectCopierImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/copyobject/ORBStreamObjectCopierImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/copyobject/ReferenceObjectCopierImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImplHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/corba/AsynchInvoke.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/corba/ContextImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/corba/ContextListImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/corba/CORBAObjectImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/corba/EnvironmentImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/corba/ExceptionListImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/corba/NamedValueImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/corba/NVListImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/corba/PrincipalImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/corba/RequestImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/corba/ServerRequestImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/corba/TCUtility.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImplHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyBasicImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyCollectionImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyComplexImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyConstructedImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyUtil.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynArrayImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynEnumImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynFixedImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynSequenceImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynStructImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynUnionImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynValueBoxImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynValueCommonImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynValueImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerRead.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerReadGrow.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerReadStream.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWrite.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteCollect.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteGrow.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteStream.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/BufferQueue.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/ByteBufferWithInfo.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputObject.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_1.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_2.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStreamBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputObject.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_1.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_2.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStreamBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/CodeSetCache.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/CodeSetComponentInfo.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/CodeSetConversion.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationInputStream.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/MarkAndResetHandler.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/MarshalInputStream.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/MarshalOutputStream.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/OSFCodeSetRegistry.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/RestorableInputStream.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeReader.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/WrapperInputStream.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/interceptors/ClientRequestInfoImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/interceptors/CodecFactoryImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/interceptors/InterceptorInvoker.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/interceptors/InterceptorList.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/interceptors/IORInfoImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/interceptors/ORBInitInfoImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/interceptors/PICurrent.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/interceptors/PINoOpHandlerImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/interceptors/ServerRequestInfoImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/interceptors/SlotTable.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/interceptors/SlotTableStack.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/io/FVDCodeBaseImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClassCorbaExt.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamField.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/io/OptionalDataException.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/io/TypeMismatchException.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/ByteBuffer.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/FreezableList.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/GenericIdentifiable.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedComponent.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/IdentifiableFactoryFinderBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/AlternateIIOPAddressComponentImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/CodeSetsComponentImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressClosureImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/JavaCodebaseComponentImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/RequestPartitioningComponentImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/IORTemplateImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/IORTemplateListImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/JIDLObjectKeyTemplate.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/NewObjectKeyTemplateBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdArray.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdNumber.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectIdImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyTemplateBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectReferenceFactoryImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectReferenceProducerBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectReferenceTemplateImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/OldJIDLObjectKeyTemplate.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/OldObjectKeyTemplateBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/OldPOAObjectKeyTemplate.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/POAObjectKeyTemplate.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/StubIORImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/TaggedProfileFactoryFinderImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/TaggedProfileTemplateFactoryFinderImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/WireObjectKeyTemplate.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/StubDelegateImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/javax/rmi/PortableRemoteObject.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/DefaultSocketFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/EndPointInfoImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/LegacyServerSocketManagerImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryAcceptorImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryConnectionImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoListImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoListIteratorImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/USLPort.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/monitoring/MonitoredAttributeInfoFactoryImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/monitoring/MonitoredAttributeInfoImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/monitoring/MonitoredObjectFactoryImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/monitoring/MonitoredObjectImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/monitoring/MonitoringManagerFactoryImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/monitoring/MonitoringManagerImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/BindingIteratorImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/InternalBindingKey.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/InternalBindingValue.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/InterOperableNamingImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextDataStore.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingUtils.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientBindingIterator.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameServer.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameService.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNamingContext.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/namingutil/CorbalocURL.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/namingutil/CorbanameURL.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/namingutil/IIOPEndpointInfo.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURL.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLHandler.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/namingutil/NamingConstants.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/namingutil/Utility.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/pcosnaming/InternalBindingKey.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/pcosnaming/InternalBindingValue.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NameServer.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NameService.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NamingContextImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/pcosnaming/PersistentBindingIterator.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/pcosnaming/ServantManagerImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/NullServantImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/ActiveObjectMap.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/AOMEntry.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/BadServerIdHandler.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/DelegateImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/IdAssignmentPolicyImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/IdUniquenessPolicyImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/ImplicitActivationPolicyImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/LifespanPolicyImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POACurrent.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAManagerImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediator.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase_R.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_NR_UDS.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_NR_USM.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_AOM.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_UDS.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_USM.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/Policies.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/RequestProcessingPolicyImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/ServantRetentionPolicyImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/ThreadPolicyImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/toa/TOA.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/toa/TOAFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/toa/TOAImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/toa/TransientObjectManager.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orb/AppletDataCollector.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orb/DataCollectorBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orb/DataCollectorFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orb/NormalDataCollector.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orb/NormalParserAction.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orb/NormalParserData.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBConfiguratorImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBDataParserImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBVersionImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orb/ParserAction.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orb/ParserActionBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orb/ParserActionFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orb/ParserDataBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orb/ParserTable.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orb/PrefixParserAction.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orb/PrefixParserData.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orb/PropertyOnlyDataCollector.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/CacheTable.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/closure/Constant.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/closure/Future.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/concurrent/CondVar.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/concurrent/DebugMutex.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Mutex.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/concurrent/ReentrantMutex.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Sync.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/concurrent/SyncUtil.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/DenseIntMapImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/fsm/GuardedAction.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/fsm/NameBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/fsm/StateEngineImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/GetPropertyAction.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/graph/Graph.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/graph/GraphImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/graph/Node.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/graph/NodeData.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/HexOutputStream.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/LegacyHookGetFields.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/LegacyHookPutFields.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/LogKeywords.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamField.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectWriter.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ORBConstants.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdInterface.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdStrings.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdUtility.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/StackImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolManagerImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/TimeoutException.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/WorkQueueImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicAccessPermission.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicMethodMarshallerImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicStubImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandler.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLType.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypeException.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypesUtil.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/PresentationManagerImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ReflectiveTie.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubConnectImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryDynamicBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryStaticImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryProxyImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryStaticImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubInvocationHandlerImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/AddressingDispositionException.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/BootstrapServerRequestDispatcher.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaClientDelegateImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaInvocationInfo.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaMessageMediatorImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaServerRequestDispatcherImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/FullServantCacheLocalCRDImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/AddressingDispositionHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_0.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_1.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_2.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage_1_1.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage_1_2.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/IORAddressingInfo.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/IORAddressingInfoHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/KeyAddr.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_0.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_1.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_2.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyOrReplyMessage.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_0.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_1.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_2.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_0.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_1.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_2.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/MessageBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/MessageHandler.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ProfileAddr.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReferenceAddr.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_0.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_1.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_2.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_0.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_1.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_2.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddress.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/InfoOnlyServantCacheLocalCRDImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/INSServerRequestDispatcher.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/JIDLLocalCRDImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/LocalClientRequestDispatcherBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/MinimalServantCacheLocalCRDImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/NotLocalLocalCRDImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/POALocalCRDImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/RequestCanceledException.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/RequestDispatcherRegistryImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/ServantCacheLocalCRDBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/SpecialMethod.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/resolver/BootstrapResolverImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/resolver/CompositeResolverImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/resolver/FileResolverImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/resolver/LocalResolverImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/resolver/ORBDefaultInitRefResolverImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/resolver/ORBInitRefResolverImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/resolver/SplitLocalResolverImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/transport/ByteBufferPoolImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/transport/CorbaConnectionCacheBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoListImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoListIteratorImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/transport/CorbaInboundConnectionCacheImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/transport/CorbaOutboundConnectionCacheImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/transport/CorbaResponseWaitingRoomImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/transport/CorbaTransportManagerImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/transport/DefaultIORToSocketInfoImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/transport/DefaultSocketFactoryImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/transport/EventHandlerBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/transport/ListenerThreadImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/transport/ReaderThreadImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/transport/ReadTCPTimeoutsImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/transport/SharedCDRContactInfoImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelContactInfoImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/util/IdentityHashtable.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/util/IdentityHashtableEntry.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/util/IdentityHashtableEnumerator.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/util/JDKBridge.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/util/JDKClassLoader.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/util/ORBProperties.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/util/PackagePrefixChecker.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/util/RepositoryId.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/util/RepositoryIdCache.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/util/SUNVMCID.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/util/Utility.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/util/Version.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/internal/corba/ORBSingleton.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/internal/CosNaming/BootstrapServer.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/internal/iiop/ORB.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/internal/Interceptors/PIORB.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/internal/POA/POAORB.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/org/omg/CORBA/ORB.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/broker/Broker.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/encoding/InputObject.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/encoding/OutputObject.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/protocol/ClientDelegate.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/protocol/ClientInvocationInfo.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/protocol/ClientRequestDispatcher.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/protocol/MessageMediator.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/protocol/ProtocolHandler.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/protocol/ServerRequestDispatcher.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/transport/Acceptor.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/transport/ByteBufferPool.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/transport/Connection.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/transport/ConnectionCache.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/transport/ContactInfo.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/transport/ContactInfoList.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/transport/ContactInfoListIterator.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/transport/EventHandler.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/transport/InboundConnectionCache.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/transport/ListenerThread.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/transport/OutboundConnectionCache.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/transport/ReaderThread.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/transport/ResponseWaitingRoom.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/transport/Selector.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/transport/TransportManager.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/copyobject/CopierManager.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/copyobject/CopyobjectDefaults.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/copyobject/ObjectCopier.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/copyobject/ObjectCopierFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/copyobject/ReflectiveCopyException.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/encoding/CorbaInputObject.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/encoding/CorbaOutputObject.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/extension/CopyObjectPolicy.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/extension/RequestPartitioningPolicy.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/extension/ServantCachingPolicy.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/extension/ZeroPortPolicy.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/EncapsulationFactoryBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/Identifiable.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/IdentifiableBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/IdentifiableContainerBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/IdentifiableFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/IdentifiableFactoryFinder.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/AlternateIIOPAddressComponent.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/CodeSetsComponent.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/GIOPVersion.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPAddress.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPFactories.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPProfile.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPProfileTemplate.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/JavaCodebaseComponent.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/MaxStreamFormatVersionComponent.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/ORBTypeComponent.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/RequestPartitioningComponent.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/IOR.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/IORFactories.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/IORFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/IORTemplate.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/IORTemplateList.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/MakeImmutable.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/ObjectAdapterId.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/ObjectId.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/ObjectKey.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/ObjectKeyFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/ObjectKeyTemplate.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/TaggedComponent.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/TaggedComponentBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/TaggedComponentFactoryFinder.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/TaggedProfile.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/TaggedProfileTemplate.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/TaggedProfileTemplateBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/Writeable.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/WriteContents.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/legacy/connection/Connection.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/legacy/connection/GetEndPointInfoAgainException.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/legacy/connection/LegacyServerSocketEndPointInfo.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/legacy/connection/LegacyServerSocketManager.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/legacy/connection/ORBSocketFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/legacy/interceptor/IORInfoExt.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/legacy/interceptor/ORBInitInfoExt.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/legacy/interceptor/UnknownType.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/logging/CORBALogDomains.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/logging/LogWrapperBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/logging/LogWrapperFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttribute.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfoFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObject.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoringConstants.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoringFactories.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManager.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManagerFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/monitoring/StatisticMonitoredAttribute.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/monitoring/StatisticsAccumulator.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/oa/NullServant.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/oa/OADefault.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/oa/OADestroyed.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/oa/OAInvocationInfo.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/oa/ObjectAdapter.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/oa/ObjectAdapterBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/oa/ObjectAdapterFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orb/DataCollector.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orb/Operation.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orb/OperationFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orb/ORB.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orb/ORBConfigurator.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orb/ORBData.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orb/ORBVersion.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orb/ORBVersionFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orb/ParserData.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orb/ParserDataFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orb/ParserImplBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orb/ParserImplTableBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orb/PropertyParser.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orb/StringPair.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/closure/Closure.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/closure/ClosureFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/Action.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/ActionBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSM.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSMImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSMTest.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/Guard.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/GuardBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/Input.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/InputImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/State.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/StateEngine.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/StateEngineFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/StateImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandler.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/DelegateInvocationHandlerImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/InvocationHandlerFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/LinkedInvocationHandler.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/threadpool/NoSuchThreadPoolException.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/threadpool/NoSuchWorkQueueException.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/threadpool/ThreadPool.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/threadpool/ThreadPoolChooser.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/threadpool/ThreadPoolManager.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/threadpool/Work.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/threadpool/WorkQueue.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/presentation/rmi/DynamicMethodMarshaller.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/presentation/rmi/DynamicStub.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/presentation/rmi/IDLNameTranslator.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/presentation/rmi/PresentationManager.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/presentation/rmi/StubAdapter.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/presentation/rmi/StubWrapper.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/protocol/ClientDelegateFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/protocol/CorbaClientDelegate.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/protocol/CorbaMessageMediator.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/protocol/CorbaProtocolHandler.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/protocol/CorbaServerRequestDispatcher.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/protocol/ForwardException.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/protocol/InitialServerRequestDispatcher.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/protocol/LocalClientRequestDispatcher.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/protocol/LocalClientRequestDispatcherFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/protocol/PIHandler.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/protocol/RequestDispatcherDefault.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/protocol/RequestDispatcherRegistry.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/protocol/RetryType.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/resolver/LocalResolver.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/resolver/Resolver.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/resolver/ResolverDefault.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/servicecontext/CodeSetServiceContext.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/servicecontext/MaxStreamFormatVersionServiceContext.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/servicecontext/ORBVersionServiceContext.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/servicecontext/SendingContextServiceContext.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContext.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContextData.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContextRegistry.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContexts.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/servicecontext/UEInfoServiceContext.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/servicecontext/UnknownServiceContext.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaAcceptor.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaConnection.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaConnectionCache.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfo.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoList.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoListFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoListIterator.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaResponseWaitingRoom.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/transport/CorbaTransportManager.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/transport/IIOPPrimaryToContactInfo.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/transport/IORToSocketInfo.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/transport/IORTransformer.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/transport/ORBSocketFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/transport/ReadTimeouts.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/transport/ReadTimeoutsFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/transport/SocketInfo.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/transport/SocketOrChannelAcceptor.java
-@OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/transport/TransportDefault.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/_IDLTypeStub.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/AttrDescriptionSeqHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/AttributeDescription.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/AttributeDescriptionHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/AttributeMode.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/AttributeModeHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/ContextIdentifierHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/ContextIdSeqHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/DefinitionKindHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/ExcDescriptionSeqHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/ExceptionDescription.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/ExceptionDescriptionHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/IdentifierHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/IDLTypeHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/IDLTypeOperations.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/Initializer.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/InitializerHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/InitializerSeqHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/IRObjectOperations.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/OpDescriptionSeqHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/OperationDescription.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/OperationDescriptionHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/OperationMode.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/OperationModeHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/ParameterDescription.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/ParameterDescriptionHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/ParameterMode.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/ParameterModeHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/ParDescriptionSeqHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/portable/ValueHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/Repository.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/RepositoryHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/RepositoryIdHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/RepositoryIdSeqHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/StructMemberHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/StructMemberSeqHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescription.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/ValueDefPackage/FullValueDescriptionHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/ValueMemberHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/ValueMemberSeqHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/VersionSpecHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/VisibilityHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/SendingContext/_CodeBaseStub.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/SendingContext/CodeBase.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/SendingContext/CodeBaseHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/SendingContext/CodeBaseOperations.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/URLHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/URLSeqHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/ValueDescSeqHelper.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/Arguments.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/AttributeEntry.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/AttributeGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/Comment.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/Compile.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/ConstEntry.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/And.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/BinaryExpr.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanAnd.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanNot.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanOr.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/DefaultExprFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Divide.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Equal.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/EvaluationException.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Expression.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/ExprFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/GreaterEqual.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/GreaterThan.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/LessEqual.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/LessThan.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Minus.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Modulo.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Negative.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Not.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/NotEqual.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Or.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Plus.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Positive.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/ShiftLeft.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/ShiftRight.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Terminal.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Times.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/UnaryExpr.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Xor.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/ConstGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/DefaultSymtabFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/EnumEntry.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/EnumGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/ExceptionEntry.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/ExceptionGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/Factories.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/ForwardEntry.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/ForwardGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/ForwardValueEntry.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/ForwardValueGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/Generator.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/GenFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/GenFileStream.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/IDLID.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/IncludeEntry.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/IncludeGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/InterfaceEntry.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/InterfaceGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/InterfaceState.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/InterfaceType.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/InvalidArgument.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/InvalidCharacter.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/MethodEntry.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/MethodGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/ModuleEntry.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/ModuleGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/NativeEntry.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/NativeGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/Noop.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/NoPragma.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/ParameterEntry.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/ParameterGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/ParseException.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/Parser.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/PragmaEntry.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/PragmaGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/PragmaHandler.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/Preprocessor.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/PrimitiveEntry.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/PrimitiveGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/RepositoryID.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/ResourceBundleUtil.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/Scanner.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/SequenceEntry.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/SequenceGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/som/cff/FileLocator.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/som/cff/Messages.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/som/idlemit/MetaPragma.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/StringEntry.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/StringGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/StructEntry.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/StructGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/SymtabEntry.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/SymtabFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Arguments.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen24.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AuxGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Compile.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ConstGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/DefaultFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/EnumGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ExceptionGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Factories.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ForwardValueGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/GenFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Helper.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Helper24.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Holder.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/InterfaceGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/JavaGenerator.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGen24.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGenClone24.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ModuleGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/NameModifier.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/NameModifierImpl.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/NativeGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/PrimitiveGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/SequenceGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Skeleton.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/StringGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/StructGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Stub.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/TCOffsets.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/TypedefGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/UnionGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen24.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueFactory.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueGen24.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/Token.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/TokenBuffer.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/TypedefEntry.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/TypedefGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/UnionBranch.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/UnionEntry.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/UnionGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/Util.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/ValueBoxEntry.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/ValueBoxGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/ValueEntry.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/ValueGen.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/idl/ValueRepositoryId.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/logutil/IndentingPrintWriter.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/logutil/Input.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/logutil/InputCode.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/logutil/InputException.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/logutil/MC.java
-@OPENJDK@/corba/src/share/classes/com/sun/tools/corba/se/logutil/StringUtil.java
-@OPENJDK@/corba/src/share/classes/javax/activity/ActivityCompletedException.java
-@OPENJDK@/corba/src/share/classes/javax/activity/ActivityRequiredException.java
-@OPENJDK@/corba/src/share/classes/javax/activity/InvalidActivityException.java
-@OPENJDK@/corba/src/share/classes/javax/rmi/CORBA/ClassDesc.java
-@OPENJDK@/corba/src/share/classes/javax/rmi/CORBA/GetORBPropertiesFileAction.java
-@OPENJDK@/corba/src/share/classes/javax/rmi/CORBA/PortableRemoteObjectDelegate.java
-@OPENJDK@/corba/src/share/classes/javax/rmi/CORBA/Stub.java
-@OPENJDK@/corba/src/share/classes/javax/rmi/CORBA/StubDelegate.java
-@OPENJDK@/corba/src/share/classes/javax/rmi/CORBA/Tie.java
-@OPENJDK@/corba/src/share/classes/javax/rmi/CORBA/Util.java
-@OPENJDK@/corba/src/share/classes/javax/rmi/CORBA/UtilDelegate.java
-@OPENJDK@/corba/src/share/classes/javax/rmi/CORBA/ValueHandler.java
-@OPENJDK@/corba/src/share/classes/javax/rmi/CORBA/ValueHandlerMultiFormat.java
-@OPENJDK@/corba/src/share/classes/javax/rmi/PortableRemoteObject.java
-@OPENJDK@/corba/src/share/classes/javax/transaction/InvalidTransactionException.java
-@OPENJDK@/corba/src/share/classes/javax/transaction/TransactionRequiredException.java
-@OPENJDK@/corba/src/share/classes/javax/transaction/TransactionRolledbackException.java
-@OPENJDK@/corba/src/share/classes/javax/transaction/xa/XAException.java
-@OPENJDK@/corba/src/share/classes/javax/transaction/xa/XAResource.java
-@OPENJDK@/corba/src/share/classes/javax/transaction/xa/Xid.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/_IDLTypeStub.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/_PolicyStub.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ACTIVITY_COMPLETED.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ACTIVITY_REQUIRED.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/Any.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/AnyHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/AnySeqHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/AnySeqHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ARG_IN.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ARG_INOUT.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ARG_OUT.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/BAD_CONTEXT.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/BAD_INV_ORDER.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/BAD_OPERATION.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/BAD_PARAM.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/BAD_POLICY.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/BAD_POLICY_TYPE.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/BAD_POLICY_VALUE.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/BAD_QOS.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/BAD_TYPECODE.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/BooleanHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/BooleanSeqHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/BooleanSeqHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/Bounds.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ByteHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/CharHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/CharSeqHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/CharSeqHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/CODESET_INCOMPATIBLE.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/COMM_FAILURE.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/CompletionStatus.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/CompletionStatusHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/Context.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ContextList.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/CTX_RESTRICT_SCOPE.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/Current.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/CurrentHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/CurrentHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/CurrentOperations.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/CustomMarshal.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/DATA_CONVERSION.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/DataInputStream.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/DataOutputStream.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/DefinitionKind.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/DefinitionKindHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/DomainManager.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/DomainManagerOperations.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/DoubleHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/DoubleSeqHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/DoubleSeqHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/DynamicImplementation.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/DynAny.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/DynAnyPackage/Invalid.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/DynAnyPackage/InvalidSeq.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/DynAnyPackage/InvalidValue.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/DynAnyPackage/TypeMismatch.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/DynArray.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/DynEnum.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/DynFixed.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/DynSequence.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/DynStruct.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/DynUnion.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/DynValue.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/Environment.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ExceptionList.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/FieldNameHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/FixedHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/FloatHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/FloatSeqHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/FloatSeqHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/FREE_MEM.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/IdentifierHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/IDLType.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/IDLTypeHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/IDLTypeOperations.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/IMP_LIMIT.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/INITIALIZE.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/INTERNAL.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/INTF_REPOS.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/IntHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/INV_FLAG.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/INV_IDENT.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/INV_OBJREF.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/INV_POLICY.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/INVALID_ACTIVITY.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/INVALID_TRANSACTION.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/IRObject.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/IRObjectOperations.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/LocalObject.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/LongHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/LongLongSeqHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/LongLongSeqHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/LongSeqHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/LongSeqHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/MARSHAL.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/NamedValue.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/NameValuePair.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/NameValuePairHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/NO_IMPLEMENT.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/NO_MEMORY.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/NO_PERMISSION.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/NO_RESOURCES.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/NO_RESPONSE.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/NVList.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/OBJ_ADAPTER.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/Object.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/OBJECT_NOT_EXIST.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ObjectHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ObjectHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/OctetSeqHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/OctetSeqHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/OMGVMCID.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ORB.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ORBPackage/InconsistentTypeCode.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ORBPackage/InvalidName.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/PERSIST_STORE.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/Policy.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/PolicyError.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/PolicyHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/PolicyHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/PolicyListHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/PolicyListHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/PolicyOperations.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/PolicyTypeHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/portable/ApplicationException.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/portable/BoxedValueHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/portable/CustomValue.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/portable/Delegate.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/portable/IDLEntity.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/portable/IndirectionException.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/portable/InputStream.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/portable/InvokeHandler.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/portable/ObjectImpl.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/portable/OutputStream.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/portable/RemarshalException.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/portable/ResponseHandler.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/portable/ServantObject.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/portable/Streamable.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/portable/StreamableValue.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/portable/UnknownException.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/portable/ValueBase.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/portable/ValueFactory.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/portable/ValueInputStream.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/portable/ValueOutputStream.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/Principal.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/PrincipalHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/PRIVATE_MEMBER.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/PUBLIC_MEMBER.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/REBIND.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/RepositoryIdHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/Request.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ServerRequest.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ServiceDetail.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ServiceDetailHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ServiceInformation.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ServiceInformationHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ServiceInformationHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/SetOverrideType.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/SetOverrideTypeHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ShortHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ShortSeqHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ShortSeqHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/StringHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/StringValueHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/StructMember.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/StructMemberHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/SystemException.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/TCKind.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/TIMEOUT.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/TRANSACTION_MODE.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/TRANSACTION_REQUIRED.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/TRANSACTION_ROLLEDBACK.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/TRANSACTION_UNAVAILABLE.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/TRANSIENT.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/TypeCode.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/TypeCodeHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/TypeCodePackage/BadKind.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/TypeCodePackage/Bounds.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ULongLongSeqHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ULongLongSeqHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ULongSeqHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ULongSeqHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/UnionMember.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/UnionMemberHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/UNKNOWN.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/UnknownUserException.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/UnknownUserExceptionHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/UnknownUserExceptionHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/UNSUPPORTED_POLICY.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/UserException.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/UShortSeqHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/UShortSeqHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ValueBaseHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ValueBaseHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ValueMember.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/ValueMemberHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/VersionSpecHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/VisibilityHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/VM_ABSTRACT.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/VM_CUSTOM.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/VM_NONE.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/VM_TRUNCATABLE.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/WCharSeqHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/WCharSeqHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/WrongTransaction.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/WrongTransactionHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/WrongTransactionHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA/WStringValueHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA_2_3/ORB.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA_2_3/portable/Delegate.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA_2_3/portable/InputStream.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA_2_3/portable/ObjectImpl.java
-@OPENJDK@/corba/src/share/classes/org/omg/CORBA_2_3/portable/OutputStream.java
-@OPENJDK@/corba/src/share/classes/org/omg/CosNaming/_BindingIteratorImplBase.java
-@OPENJDK@/corba/src/share/classes/org/omg/CosNaming/_NamingContextImplBase.java
-@OPENJDK@/corba/src/share/classes/org/omg/PortableServer/CurrentHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/PortableServer/DynamicImplementation.java
-@OPENJDK@/corba/src/share/classes/org/omg/PortableServer/POAHelper.java
-@OPENJDK@/corba/src/share/classes/org/omg/PortableServer/portable/Delegate.java
-@OPENJDK@/corba/src/share/classes/org/omg/PortableServer/Servant.java
-@OPENJDK@/corba/src/share/classes/org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java
-@OPENJDK@/corba/src/share/classes/org/omg/SendingContext/RunTime.java
-@OPENJDK@/corba/src/share/classes/org/omg/SendingContext/RunTimeOperations.java
-@OPENJDK@/corba/src/share/classes/org/omg/stub/java/rmi/_Remote_Stub.java
-@OPENJDK@/corba/src/share/classes/sun/corba/Bridge.java
-@OPENJDK@/corba/src/share/classes/sun/corba/BridgePermission.java
-@OPENJDK@/corba/src/share/classes/sun/corba/EncapsInputStreamFactory.java
-@OPENJDK@/corba/src/share/classes/sun/corba/JavaCorbaAccess.java
-@OPENJDK@/corba/src/share/classes/sun/corba/OutputStreamFactory.java
-@OPENJDK@/corba/src/share/classes/sun/corba/SharedSecrets.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/AbstractType.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/ArrayType.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/BatchEnvironment.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/ClassPathLoader.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/ClassType.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/CompoundType.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/Constants.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/ContextElement.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/ContextStack.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/DirectoryLoader.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/Generator.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/IDLGenerator.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/IDLNames.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/ImplementationType.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/InterfaceType.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/NameContext.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/NCClassType.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/NCInterfaceType.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/PrimitiveType.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/PrintGenerator.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/RemoteType.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/SpecialClassType.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/SpecialInterfaceType.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/StaticStringsHash.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/Type.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/Util.java
-@OPENJDK@/corba/src/share/classes/sun/rmi/rmic/iiop/ValueType.java
-@OPENJDK@/jaxp/src/com/sun/java_cup/internal/runtime/lr_parser.java
-@OPENJDK@/jaxp/src/com/sun/java_cup/internal/runtime/Scanner.java
-@OPENJDK@/jaxp/src/com/sun/java_cup/internal/runtime/Symbol.java
-@OPENJDK@/jaxp/src/com/sun/java_cup/internal/runtime/virtual_parse_stack.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/AccessFlags.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Attribute.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/AttributeReader.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ClassFormatException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ClassParser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Code.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/CodeException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Constant.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantClass.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantCP.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantDouble.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantFieldref.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantFloat.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantInteger.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantInterfaceMethodref.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantLong.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantMethodref.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantNameAndType.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantObject.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantPool.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantString.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantUtf8.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ConstantValue.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Deprecated.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/ExceptionTable.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Field.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/FieldOrMethod.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/InnerClass.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/InnerClasses.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/JavaClass.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/LineNumber.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/LineNumberTable.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/LocalVariable.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/LocalVariableTable.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/LocalVariableTypeTable.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Method.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Node.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/PMGClass.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Signature.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/SourceFile.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/StackMap.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/StackMapEntry.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/StackMapType.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Synthetic.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Unknown.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Utility.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/Visitor.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/Constants.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/ExceptionConstants.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/AALOAD.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/AASTORE.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/ACONST_NULL.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/AllocationInstruction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/ALOAD.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/ANEWARRAY.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/ARETURN.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/ArrayInstruction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/ArrayType.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/ASTORE.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/ATHROW.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/BALOAD.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/BasicType.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/BASTORE.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/BIPUSH.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/BranchHandle.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/BREAKPOINT.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/CALOAD.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/CASTORE.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/CHECKCAST.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/ClassGen.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/ClassGenException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/ClassObserver.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/CompoundInstruction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/ConstantPushInstruction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/ConversionInstruction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/CPInstruction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/D2F.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/D2I.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/D2L.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/DADD.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/DALOAD.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/DASTORE.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/DCMPG.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/DCMPL.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/DCONST.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/DDIV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/DLOAD.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/DMUL.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/DNEG.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/DREM.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/DRETURN.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/DSTORE.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/DSUB.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP_X1.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP_X2.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP2.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP2_X1.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/DUP2_X2.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/EmptyVisitor.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/ExceptionThrower.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/F2D.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/F2I.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/F2L.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/FADD.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/FALOAD.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/FASTORE.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/FCMPG.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/FCMPL.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/FCONST.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/FDIV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/FieldGen.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/FieldGenOrMethodGen.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/FieldInstruction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/FieldObserver.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/FieldOrMethod.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/FLOAD.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/FMUL.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/FNEG.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/FREM.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/FRETURN.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/FSTORE.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/FSUB.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/GETFIELD.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/GETSTATIC.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/GOTO.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/GOTO_W.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/GotoInstruction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/I2B.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/I2C.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/I2D.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/I2F.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/I2L.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/I2S.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IADD.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IALOAD.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IAND.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IASTORE.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/ICONST.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IDIV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ACMPEQ.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ACMPNE.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPEQ.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPGE.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPGT.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPLE.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPLT.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IF_ICMPNE.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IFEQ.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IFGE.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IFGT.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IfInstruction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IFLE.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IFLT.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IFNE.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IFNONNULL.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IFNULL.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IINC.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/ILOAD.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IMPDEP1.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IMPDEP2.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IMUL.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IndexedInstruction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/INEG.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/INSTANCEOF.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/Instruction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionComparator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionConstants.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionFactory.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionHandle.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionList.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionListObserver.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/InstructionTargeter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/InvokeInstruction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/INVOKEINTERFACE.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/INVOKESPECIAL.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/INVOKESTATIC.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/INVOKEVIRTUAL.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IOR.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IREM.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IRETURN.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/ISHL.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/ISHR.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/ISTORE.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/ISUB.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IUSHR.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/IXOR.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/JSR.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/JSR_W.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/JsrInstruction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/L2D.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/L2F.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/L2I.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LADD.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LALOAD.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LAND.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LASTORE.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LCMP.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LCONST.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LDC.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LDC_W.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LDC2_W.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LDIV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LineNumberGen.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LLOAD.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LMUL.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LNEG.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LoadClass.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LoadInstruction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LocalVariableGen.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LocalVariableInstruction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LOR.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LREM.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LRETURN.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LSHL.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LSHR.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LSTORE.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LSUB.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LUSHR.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/LXOR.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/MethodGen.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/MethodObserver.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/MULTIANEWARRAY.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/NamedAndTyped.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/NEW.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/NOP.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/ObjectType.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/POP.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/POP2.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/PopInstruction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/PUSH.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/PushInstruction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/PUTFIELD.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/PUTSTATIC.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/ReferenceType.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/RET.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/RETURN.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/ReturnaddressType.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/SALOAD.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/SASTORE.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/Select.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/SIPUSH.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/StackConsumer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/StackInstruction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/StackProducer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/StoreInstruction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/SWAP.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/SWITCH.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/TABLESWITCH.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/TargetLostException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/Type.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/TypedInstruction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/UnconditionalBranch.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/VariableLengthInstruction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/Visitor.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/Repository.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/util/AttributeHTML.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/util/BCELFactory.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/util/BCELifier.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/util/ByteSequence.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/util/Class2HTML.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/util/ClassLoader.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/util/ClassLoaderRepository.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/util/ClassPath.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/util/ClassQueue.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/util/ClassSet.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/util/ClassStack.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/util/ClassVector.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/util/CodeHTML.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/util/ConstantHTML.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/util/InstructionFinder.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/util/JavaWrapper.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/util/MethodHTML.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/util/Repository.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/util/SecuritySupport.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/util/SyntheticRepository.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/regexp/internal/CharacterArrayCharacterIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/regexp/internal/CharacterIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/regexp/internal/RE.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/regexp/internal/ReaderCharacterIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/regexp/internal/recompile.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/regexp/internal/RECompiler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/regexp/internal/REDebugCompiler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/regexp/internal/REProgram.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/regexp/internal/RESyntaxException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/regexp/internal/RETest.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/regexp/internal/REUtil.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/regexp/internal/StreamCharacterIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/regexp/internal/StringCharacterIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/extensions/ExpressionContext.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltBase.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltCommon.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltDatetime.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltDynamic.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltMath.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/lib/Extensions.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/lib/NodeInfo.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLMessages.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_en.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/templates/Constants.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/utils/ConfigurationError.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/utils/FactoryImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/utils/FeatureManager.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/utils/FeaturePropertyBase.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/Version.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xslt/Process.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOpt.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOptsException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/IllegalArgumentException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/MissingOptArgException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/Transform.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/CollatorFactory.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsoluteLocationPath.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsolutePathPattern.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AlternativePattern.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AncestorPattern.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyImports.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ArgumentList.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Attribute.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValue.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanExpr.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Closure.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Comment.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CompilerException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Constants.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Copy.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CopyOf.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CurrentCall.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/DecimalFormatting.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/EqualityExpr.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Fallback.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilteredAbsoluteLocationPath.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterParentPath.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IdKeyPattern.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IdPattern.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/If.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IllegalCharException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Instruction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/IntExpr.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Key.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyPattern.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LastCall.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralAttribute.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralExpr.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LocationPathPattern.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Message.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceAlias.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NodeTest.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Number.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Otherwise.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Output.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Param.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParameterRef.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentLocationPath.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentPattern.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Pattern.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/PositionCall.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstruction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/QName.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RealExpr.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativeLocationPath.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativePathPattern.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SimpleAttributeValue.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SourceLoader.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Step.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/sym.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Text.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnresolvedRef.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/AttributeSetMethodGenerator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ClassGenerator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/CompareGenerator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/FilterGenerator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MarkerInstruction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MatchGenerator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NamedMethodGenerator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeCounterGenerator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordFactGenerator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordGenerator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NumberType.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkEnd.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkStart.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RtMethodGenerator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SlotAllocator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TestGenerator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TypeCheckError.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ValueOf.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Variable.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRef.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/When.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/WithParam.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XslElement.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/DOM.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/AbsoluteIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/AnyNodeCounter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/ArrayNodeListIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/BitArray.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/CachedNodeListIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/ClonedNodeListIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/CollatorFactoryBase.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListFilter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMAdapter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMBuilder.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DupFilterIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/EmptyFilter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/ExtendedSAX.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/Filter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/FilteredStepIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/FilterIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/ForwardPositionIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MatchingIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultipleNodeCounter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiValuedNodeHeapIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeIteratorBase.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/NthIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SimpleResultTreeImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SingleNodeCounter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SingletonIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SortingIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SortSettings.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/StepIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/StripWhitespaceFilter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/UnionIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/XSLTCDTMManager.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/DOMCache.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/DOMEnhancedForDTM.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/NodeIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/ProcessorVersion.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Attributes.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Constants.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Hashtable.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/MessageHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Node.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Operators.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/OutputBuffer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/StringOutputBuffer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Parameter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/StringValueHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/StripFilter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/Translet.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/TransletException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2TO.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/OutputSettings.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXBaseWriter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXEventWriter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXStreamWriter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/SmartTransformerFactoryImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/StAXEvent2SAX.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerHandlerImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/util/IntegerArray.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/AttributeMap.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/AttrImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/AttrNSImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/CDATASectionImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/CharacterDataImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/ChildNode.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/CommentImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredAttrImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredAttrNSImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredCDATASectionImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredCommentImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredDOMImplementationImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredElementDefinitionImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredElementImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredElementNSImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredEntityImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredEntityReferenceImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredNode.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredNotationImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredProcessingInstructionImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DeferredTextImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentFragmentImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMErrorImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMInputImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMLocatorImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMOutputImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/ElementDefinitionImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/ElementImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/ElementNSImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/EntityImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/EntityReferenceImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/events/EventImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/events/MutationEventImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/LCount.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/NodeImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/NodeIteratorImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/NodeListCache.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/NotationImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/ParentNode.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/ProcessingInstructionImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/PSVIAttrNSImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/PSVIDocumentImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/PSVIDOMImplementationImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/RangeExceptionImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/RangeImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/TextImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/TreeWalkerImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/Constants.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMAny.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMBinOp.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMLeaf.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMNode.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMStateSet.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/CMUniOp.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/ContentModelValidator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/MixedContentModel.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/SimpleContentModel.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDProcessor.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDValidator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XML11NSDTDValidator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLAttributeDecl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLContentSpec.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidatorFilter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLElementDecl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLEntityDecl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLNotationDecl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLNSDTDValidator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/XMLSimpleType.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/DatatypeValidator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/ENTITYDatatypeValidator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDDatatypeValidator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDREFDatatypeValidator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/ListDatatypeValidator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/NMTOKENDatatypeValidator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/NOTATIONDatatypeValidator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/StringDatatypeValidator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDDatatypeValidator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDREFDatatypeValidator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/DVFactoryException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeFacetException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeValueException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/SchemaDVFactory.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/util/Base64.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/util/HexBin.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/ValidatedInfo.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AbstractDateTimeDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyAtomicDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnySimpleDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyURIDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/Base64BinaryDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseSchemaDVFactory.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/BooleanDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DateDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DateTimeDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DayDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DayTimeDurationDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DecimalDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DoubleDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/DurationDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/EntityDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/ExtendedSchemaDVFactoryImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/FloatDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/HexBinaryDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IDDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IDREFDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/IntegerDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDayDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/PrecisionDecimalDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/QNameDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDateTimeException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/StringDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/TimeDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/TypeValidator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/UnionDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDelegate.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDurationDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDV.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/XSFacets.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/XSSimpleType.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/ExternalSubsetResolver.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/io/ASCIIReader.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/io/MalformedByteSequenceException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/io/UCSReader.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/RevalidationHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/validation/EntityState.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/Version.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11NamespaceBinder.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityDescription.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLVersionDetector.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/BMPattern.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Match.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Op.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParseException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RangeToken.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/REUtil.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPathException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/Field.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/FieldActivator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/IdentityConstraint.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/KeyRef.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/Selector.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/UniqueOrKey.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/ValueStore.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/XPathMatcher.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMBinOp.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMLeaf.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMUniOp.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/AttrImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultDocument.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultElement.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultNode.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultText.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultXMLDocumentHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/ElementImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/NamedNodeMapImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/NodeImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMImplementation.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/TextImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaNamespaceSupport.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SchemaSymbols.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/SchemaContentHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/StAXSchemaParser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAnnotationInfo.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractParticleTraverser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeGroupTraverser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeTraverser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDGroupTraverser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDKeyrefTraverser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDNotationTraverser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDWildcardTraverser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/LSInputListImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/ObjectListImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/SimpleLocator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XInt.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XIntPool.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSInputSource.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMap4Types.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAnnotationImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeGroupDecl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSDeclarationPool.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSGroupDecl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSImplementationImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSLoaderImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSModelGroupImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSNotationDecl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSParticleDecl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/XSWildcardDecl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/JAXPConstants.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SchemaValidatorConfiguration.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMDocumentHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultAugmentor.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/Util.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHelper.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchema.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractXMLDocumentParser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/parsers/CachingParserPool.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/parsers/DTDParser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/parsers/IntegratedParserConfiguration.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/parsers/StandardParserConfiguration.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XIncludeAwareParserConfiguration.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XIncludeParserConfiguration.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11Configurable.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLDocumentParser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarCachingConfiguration.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarParser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLParser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/parsers/XPointerParserConfiguration.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/AttributesProxy.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/DefaultErrorHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMInputSource.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/DOMUtil.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/EntityResolver2Wrapper.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/EntityResolverWrapper.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/ErrorHandlerWrapper.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/FeatureState.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/HTTPInputSource.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/IntStack.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/JAXPNamespaceContextWrapper.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/LocatorProxy.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/LocatorWrapper.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/MessageFormatter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/NamespaceSupport.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/ParserConfigurationSettings.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/PropertyState.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/SAX2XNI.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/SAXInputSource.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/SAXLocatorWrapper.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/SecurityManager.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/ShadowedSymbolTable.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/Status.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/StAXInputSource.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/StAXLocationWrapper.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/SymbolHash.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/SymbolTable.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/SynchronizedSymbolTable.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/TypeInfoImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/URI.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/XML11Char.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLAttributesIteratorImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLCatalogResolver.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLChar.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLEntityDescriptionImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLErrorCode.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLGrammarPoolImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLResourceIdentifierImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLStringBuffer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/XMLSymbols.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/utils/ConfigurationError.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/SecuritySupport.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XInclude11TextReader.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeNamespaceSupport.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XPointerElementHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XPointerFramework.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XPointerSchema.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/Augmentations.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/Grammar.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLDTDDescription.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarDescription.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarLoader.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarPool.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XMLSchemaDescription.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/XSGrammar.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/NamespaceContext.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLComponent.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLComponentManager.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentFilter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentScanner.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentSource.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelFilter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelSource.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDFilter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDSource.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLEntityResolver.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLErrorHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLInputSource.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLParseException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLParserConfiguration.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLPullParserConfiguration.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/QName.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLAttributes.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLDocumentFragmentHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLDocumentHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLDTDContentModelHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLDTDHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLLocator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLResourceIdentifier.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/XMLString.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/XNIException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xpointer/ShortHandPointer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerErrorHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerPart.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xpointer/XPointerProcessor.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/AttributePSVI.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDateTime.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDecimal.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSDouble.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSFloat.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/XSQName.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/ElementPSVI.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/ItemPSVI.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/LSInputList.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/PSVIProvider.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/ShortList.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/StringList.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSAnnotation.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSAttributeDeclaration.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSAttributeGroupDefinition.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSAttributeUse.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSComplexTypeDefinition.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSConstants.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSElementDeclaration.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSFacet.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSIDCDefinition.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSImplementation.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSLoader.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSModel.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSModelGroup.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSModelGroupDefinition.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSMultiValueFacet.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSNamedMap.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSNamespaceItem.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSNotationDeclaration.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSObject.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSObjectList.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSParticle.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSSimpleTypeDefinition.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSTerm.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSTypeDefinition.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/XSWildcard.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/Axis.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTM.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMAxisIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMAxisTraverser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMDOMException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMFilter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMManager.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/DTMWSFilter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/ChunkedIntArray.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CoroutineManager.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CoroutineParser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIteratorBase.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMChildIterNodeList.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseIterators.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseTraversers.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNamedNodeMap.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeListBase.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMSafeStringPool.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMTreeWalker.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/EmptyIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/ExpandedNameTable.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/ExtendedType.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Filter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/NodeLocator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ca.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_cs.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_en.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_it.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_pt_BR.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sk.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_tr.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_HK.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/res/XMLMessages.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/Catalog.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogManager.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/Debug.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/FileURL.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/Namespaces.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/PublicId.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/CatalogReader.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogParser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/ExtendedXMLCatalogReader.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/OASISXMLCatalogReader.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogParser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXParserHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/TextCatalogReader.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/TR9401CatalogReader.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/XCatalogReader.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/Resolver.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/tools/CatalogResolver.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingParser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLFilter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLReader.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serialize/DOMSerializer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serialize/ElementState.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serialize/EncodingInfo.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serialize/Encodings.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serialize/HTMLSerializer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serialize/IndentPrinter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serialize/LineSeparator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serialize/Method.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serialize/OutputFormat.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serialize/Printer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serialize/SecuritySupport.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serialize/Serializer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serialize/SerializerFactoryImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serialize/TextSerializer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serialize/XHTMLSerializer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serialize/XML11Serializer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serialize/XMLSerializer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/CharInfo.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/DOMSerializer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/ElemContext.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/ElemDesc.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/EncodingInfo.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/ExtendedContentHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/ExtendedLexicalHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/Method.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/NamespaceMappings.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/OutputPropertyUtils.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializationHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/Serializer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializerBase.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializerConstants.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializerTrace.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/SerializerTraceWriter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToHTMLSAXHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToSAXHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToStream.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToTextSAXHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToTextStream.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToUnknownStream.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToXMLSAXHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/TransformStateSetter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/TreeWalker.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/Utils.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/AttList.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/BoolStack.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/DOM2Helper.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/Messages.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/MsgKey.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ca.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_cs.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_en.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_es.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_fr.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_it.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ja.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ko.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_pt_BR.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_sv.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_CN.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_TW.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/StringToIntTable.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/URI.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/Utils.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/WrappedRuntimeException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/Version.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/WriterChain.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/WriterToASCI.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/WriterToUTF8Buffered.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/AttList.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/BoolStack.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/CharKey.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/Constants.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/DefaultErrorHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/DOM2Helper.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/DOMBuilder.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/DOMHelper.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/DOMOrder.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/ElemDesc.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/FastStringBuffer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/Hashtree2Node.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/IntStack.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/IntVector.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/ListingErrorHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/LocaleUtility.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/MutableAttrListImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/NameSpace.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/NamespaceSupport2.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/NodeConsumer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/NodeVector.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/NSInfo.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/ObjectPool.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/ObjectStack.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/ObjectVector.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/PrefixResolver.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/PrefixResolverDefault.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/QName.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/RawCharacterHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/res/CharArrayWrapper.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/res/IntArrayWrapper.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/res/LongArrayWrapper.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/res/StringArrayWrapper.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResourceBundle.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResourceBundleBase.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_de.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_en.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_es.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_fr.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_it.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_A.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HA.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HI.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_I.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_ko.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_sv.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_zh_CN.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/res/XResources_zh_TW.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/SAXSourceLocator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/SerializableLocatorImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/StopParseException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/StringBufferPool.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/StringComparable.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/StringToIntTable.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/StringToStringTable.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/StringToStringTableVector.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/StringVector.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/SuballocatedByteVector.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/SuballocatedIntVector.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/SystemIDResolver.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/TreeWalker.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/Trie.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/UnImplNode.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/URI.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/WrappedRuntimeException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/WrongParserException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/XML11Char.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/XMLChar.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/XMLCharacterRecognizer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/XMLString.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/XMLStringDefault.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/XMLStringFactory.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/XMLStringFactoryDefault.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/Arg.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/AttributeIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/AxesWalker.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/BasicTestIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/ChildIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/ChildTestIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/ContextNodeList.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/DescendantIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/FilterExprIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/HasPositionalPredChecker.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/IteratorPool.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/LocPathIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/NodeSequence.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/OneStepIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/OneStepIteratorForward.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/PathComponent.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/ReverseAxesWalker.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/RTFIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/SelfIteratorNoPredicate.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/SubContextList.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/UnionChildIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/UnionPathIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/WalkingIterator.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/CachedXPathAPI.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/compiler/Compiler.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/compiler/FuncLoader.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/compiler/Keywords.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/compiler/Lexer.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/compiler/OpCodes.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/compiler/OpMap.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/compiler/OpMapVector.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/compiler/PsuedoNames.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/compiler/XPathDumper.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/compiler/XPathParser.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathEvaluatorImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathExpressionImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathNamespaceImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathNSResolverImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathResultImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/domapi/XPathStylesheetDOM3Exception.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/Expression.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/ExpressionNode.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/ExpressionOwner.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/ExtensionsProvider.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/FoundIndex.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncBoolean.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncCeiling.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncConcat.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncContains.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncCount.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncCurrent.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncDoclocation.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncExtElementAvailable.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncExtFunctionAvailable.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncFalse.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncFloor.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncGenerateId.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncId.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncLang.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncLast.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncLocalPart.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncNamespace.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncNormalizeSpace.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncNot.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncNumber.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncPosition.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncQname.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncRound.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncStartsWith.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncString.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncStringLength.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncSubstring.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncSubstringAfter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncSubstringBefore.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncSum.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/Function.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/Function2Args.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/Function3Args.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FunctionDef1Arg.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FunctionOneArg.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncTranslate.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncTrue.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/FuncUnparsedEntityURI.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/WrongNumberArgsException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/jaxp/JAXPPrefixResolver.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/NodeSet.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/NodeSetDTM.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/objects/DTMXRTreeFrag.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/objects/XBoolean.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/objects/XBooleanStatic.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/objects/XMLStringFactoryImpl.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/objects/XNodeSet.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/objects/XNodeSetForDOM.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/objects/XNull.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/objects/XNumber.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/objects/XObject.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/objects/XObjectFactory.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/objects/XRTreeFrag.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/objects/XString.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/objects/XStringForChars.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/objects/XStringForFSB.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/operations/And.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/operations/Bool.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/operations/Div.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/operations/Equals.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/operations/Gt.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/operations/Gte.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/operations/Lt.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/operations/Lte.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/operations/Minus.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/operations/Mod.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/operations/Mult.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/operations/Neg.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/operations/NotEquals.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/operations/Number.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/operations/Operation.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/operations/Or.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/operations/Plus.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/operations/Quo.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/operations/String.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/operations/UnaryOperation.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/operations/Variable.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/operations/VariableSafeAbsRef.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/patterns/FunctionPattern.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/patterns/NodeTest.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/patterns/NodeTestFilter.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/patterns/StepPattern.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/patterns/UnionPattern.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_en.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_pt_BR.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/res/XPATHMessages.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/SourceTree.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/SourceTreeManager.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/VariableStack.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/WhitespaceStrippingElementMatcher.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/XPath.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/XPathAPI.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/XPathContext.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/XPathException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/XPathFactory.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/XPathProcessorException.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/XPathVisitable.java
-@OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/XPathVisitor.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/dtd/DTDGrammarUtil.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLAttributeDecl.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLElementDecl.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLNotationDecl.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/XMLSimpleType.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/Entity.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/EventFilterSupport.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/events/AttributeImpl.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/events/CharacterEvent.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/events/CommentEvent.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/events/DTDEvent.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/events/DummyEvent.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/events/EndDocumentEvent.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/events/EndElementEvent.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/events/EntityDeclarationImpl.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/events/EntityReferenceEvent.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/events/LocationImpl.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/events/NamedEvent.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/events/NamespaceImpl.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/events/NotationDeclarationImpl.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/events/ProcessingInstructionEvent.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/events/StartDocumentEvent.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/events/StartElementEvent.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/events/XMLEventFactoryImpl.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/StaxEntityResolverWrapper.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/StaxErrorReporter.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/StaxXMLInputSource.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/util/BufferAllocator.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/util/ReadOnlyIterator.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/writers/WriterUtility.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/writers/XMLEventWriterImpl.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/writers/XMLOutputSource.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/writers/XMLWriter.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/XMLBufferListener.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/XMLEntityReader.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/XMLEntityStorage.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/XMLEventReaderImpl.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/XMLInputFactoryImpl.java
-@OPENJDK@/jaxp/src/com/sun/xml/internal/stream/XMLOutputFactoryImpl.java
-@OPENJDK@/jaxp/src/javax/xml/datatype/DatatypeConfigurationException.java
-@OPENJDK@/jaxp/src/javax/xml/datatype/DatatypeConstants.java
-@OPENJDK@/jaxp/src/javax/xml/datatype/DatatypeFactory.java
-@OPENJDK@/jaxp/src/javax/xml/datatype/Duration.java
-@OPENJDK@/jaxp/src/javax/xml/datatype/FactoryFinder.java
-@OPENJDK@/jaxp/src/javax/xml/datatype/SecuritySupport.java
-@OPENJDK@/jaxp/src/javax/xml/datatype/XMLGregorianCalendar.java
-@OPENJDK@/jaxp/src/javax/xml/namespace/NamespaceContext.java
-@OPENJDK@/jaxp/src/javax/xml/namespace/QName.java
-@OPENJDK@/jaxp/src/javax/xml/parsers/DocumentBuilder.java
-@OPENJDK@/jaxp/src/javax/xml/parsers/DocumentBuilderFactory.java
-@OPENJDK@/jaxp/src/javax/xml/parsers/FactoryConfigurationError.java
-@OPENJDK@/jaxp/src/javax/xml/parsers/FactoryFinder.java
-@OPENJDK@/jaxp/src/javax/xml/parsers/ParserConfigurationException.java
-@OPENJDK@/jaxp/src/javax/xml/parsers/SAXParser.java
-@OPENJDK@/jaxp/src/javax/xml/parsers/SAXParserFactory.java
-@OPENJDK@/jaxp/src/javax/xml/parsers/SecuritySupport.java
-@OPENJDK@/jaxp/src/javax/xml/stream/EventFilter.java
-@OPENJDK@/jaxp/src/javax/xml/stream/events/Attribute.java
-@OPENJDK@/jaxp/src/javax/xml/stream/events/Characters.java
-@OPENJDK@/jaxp/src/javax/xml/stream/events/Comment.java
-@OPENJDK@/jaxp/src/javax/xml/stream/events/DTD.java
-@OPENJDK@/jaxp/src/javax/xml/stream/events/EndDocument.java
-@OPENJDK@/jaxp/src/javax/xml/stream/events/EndElement.java
-@OPENJDK@/jaxp/src/javax/xml/stream/events/EntityDeclaration.java
-@OPENJDK@/jaxp/src/javax/xml/stream/events/EntityReference.java
-@OPENJDK@/jaxp/src/javax/xml/stream/events/Namespace.java
-@OPENJDK@/jaxp/src/javax/xml/stream/events/NotationDeclaration.java
-@OPENJDK@/jaxp/src/javax/xml/stream/events/ProcessingInstruction.java
-@OPENJDK@/jaxp/src/javax/xml/stream/events/StartDocument.java
-@OPENJDK@/jaxp/src/javax/xml/stream/events/StartElement.java
-@OPENJDK@/jaxp/src/javax/xml/stream/events/XMLEvent.java
-@OPENJDK@/jaxp/src/javax/xml/stream/FactoryConfigurationError.java
-@OPENJDK@/jaxp/src/javax/xml/stream/FactoryFinder.java
-@OPENJDK@/jaxp/src/javax/xml/stream/Location.java
-@OPENJDK@/jaxp/src/javax/xml/stream/SecuritySupport.java
-@OPENJDK@/jaxp/src/javax/xml/stream/StreamFilter.java
-@OPENJDK@/jaxp/src/javax/xml/stream/util/EventReaderDelegate.java
-@OPENJDK@/jaxp/src/javax/xml/stream/util/StreamReaderDelegate.java
-@OPENJDK@/jaxp/src/javax/xml/stream/util/XMLEventAllocator.java
-@OPENJDK@/jaxp/src/javax/xml/stream/util/XMLEventConsumer.java
-@OPENJDK@/jaxp/src/javax/xml/stream/XMLEventFactory.java
-@OPENJDK@/jaxp/src/javax/xml/stream/XMLEventReader.java
-@OPENJDK@/jaxp/src/javax/xml/stream/XMLEventWriter.java
-@OPENJDK@/jaxp/src/javax/xml/stream/XMLInputFactory.java
-@OPENJDK@/jaxp/src/javax/xml/stream/XMLOutputFactory.java
-@OPENJDK@/jaxp/src/javax/xml/stream/XMLReporter.java
-@OPENJDK@/jaxp/src/javax/xml/stream/XMLResolver.java
-@OPENJDK@/jaxp/src/javax/xml/stream/XMLStreamConstants.java
-@OPENJDK@/jaxp/src/javax/xml/stream/XMLStreamException.java
-@OPENJDK@/jaxp/src/javax/xml/stream/XMLStreamReader.java
-@OPENJDK@/jaxp/src/javax/xml/stream/XMLStreamWriter.java
-@OPENJDK@/jaxp/src/javax/xml/transform/dom/DOMLocator.java
-@OPENJDK@/jaxp/src/javax/xml/transform/dom/DOMResult.java
-@OPENJDK@/jaxp/src/javax/xml/transform/dom/DOMSource.java
-@OPENJDK@/jaxp/src/javax/xml/transform/ErrorListener.java
-@OPENJDK@/jaxp/src/javax/xml/transform/FactoryFinder.java
-@OPENJDK@/jaxp/src/javax/xml/transform/OutputKeys.java
-@OPENJDK@/jaxp/src/javax/xml/transform/Result.java
-@OPENJDK@/jaxp/src/javax/xml/transform/sax/SAXResult.java
-@OPENJDK@/jaxp/src/javax/xml/transform/sax/SAXSource.java
-@OPENJDK@/jaxp/src/javax/xml/transform/sax/SAXTransformerFactory.java
-@OPENJDK@/jaxp/src/javax/xml/transform/sax/TemplatesHandler.java
-@OPENJDK@/jaxp/src/javax/xml/transform/sax/TransformerHandler.java
-@OPENJDK@/jaxp/src/javax/xml/transform/SecuritySupport.java
-@OPENJDK@/jaxp/src/javax/xml/transform/Source.java
-@OPENJDK@/jaxp/src/javax/xml/transform/SourceLocator.java
-@OPENJDK@/jaxp/src/javax/xml/transform/stax/StAXResult.java
-@OPENJDK@/jaxp/src/javax/xml/transform/stax/StAXSource.java
-@OPENJDK@/jaxp/src/javax/xml/transform/stream/StreamResult.java
-@OPENJDK@/jaxp/src/javax/xml/transform/stream/StreamSource.java
-@OPENJDK@/jaxp/src/javax/xml/transform/Templates.java
-@OPENJDK@/jaxp/src/javax/xml/transform/Transformer.java
-@OPENJDK@/jaxp/src/javax/xml/transform/TransformerConfigurationException.java
-@OPENJDK@/jaxp/src/javax/xml/transform/TransformerException.java
-@OPENJDK@/jaxp/src/javax/xml/transform/TransformerFactory.java
-@OPENJDK@/jaxp/src/javax/xml/transform/TransformerFactoryConfigurationError.java
-@OPENJDK@/jaxp/src/javax/xml/transform/URIResolver.java
-@OPENJDK@/jaxp/src/javax/xml/validation/Schema.java
-@OPENJDK@/jaxp/src/javax/xml/validation/SchemaFactory.java
-@OPENJDK@/jaxp/src/javax/xml/validation/SchemaFactoryConfigurationError.java
-@OPENJDK@/jaxp/src/javax/xml/validation/SchemaFactoryFinder.java
-@OPENJDK@/jaxp/src/javax/xml/validation/SchemaFactoryLoader.java
-@OPENJDK@/jaxp/src/javax/xml/validation/SecuritySupport.java
-@OPENJDK@/jaxp/src/javax/xml/validation/TypeInfoProvider.java
-@OPENJDK@/jaxp/src/javax/xml/validation/Validator.java
-@OPENJDK@/jaxp/src/javax/xml/validation/ValidatorHandler.java
-@OPENJDK@/jaxp/src/javax/xml/XMLConstants.java
-@OPENJDK@/jaxp/src/javax/xml/xpath/SecuritySupport.java
-@OPENJDK@/jaxp/src/javax/xml/xpath/XPath.java
-@OPENJDK@/jaxp/src/javax/xml/xpath/XPathConstants.java
-@OPENJDK@/jaxp/src/javax/xml/xpath/XPathException.java
-@OPENJDK@/jaxp/src/javax/xml/xpath/XPathExpression.java
-@OPENJDK@/jaxp/src/javax/xml/xpath/XPathExpressionException.java
-@OPENJDK@/jaxp/src/javax/xml/xpath/XPathFactory.java
-@OPENJDK@/jaxp/src/javax/xml/xpath/XPathFactoryConfigurationException.java
-@OPENJDK@/jaxp/src/javax/xml/xpath/XPathFactoryFinder.java
-@OPENJDK@/jaxp/src/javax/xml/xpath/XPathFunction.java
-@OPENJDK@/jaxp/src/javax/xml/xpath/XPathFunctionException.java
-@OPENJDK@/jaxp/src/javax/xml/xpath/XPathFunctionResolver.java
-@OPENJDK@/jaxp/src/javax/xml/xpath/XPathVariableResolver.java
-@OPENJDK@/jaxp/src/org/w3c/dom/Attr.java
-@OPENJDK@/jaxp/src/org/w3c/dom/bootstrap/DOMImplementationRegistry.java
-@OPENJDK@/jaxp/src/org/w3c/dom/CDATASection.java
-@OPENJDK@/jaxp/src/org/w3c/dom/CharacterData.java
-@OPENJDK@/jaxp/src/org/w3c/dom/Comment.java
-@OPENJDK@/jaxp/src/org/w3c/dom/css/Counter.java
-@OPENJDK@/jaxp/src/org/w3c/dom/css/CSS2Properties.java
-@OPENJDK@/jaxp/src/org/w3c/dom/css/CSSCharsetRule.java
-@OPENJDK@/jaxp/src/org/w3c/dom/css/CSSFontFaceRule.java
-@OPENJDK@/jaxp/src/org/w3c/dom/css/CSSImportRule.java
-@OPENJDK@/jaxp/src/org/w3c/dom/css/CSSMediaRule.java
-@OPENJDK@/jaxp/src/org/w3c/dom/css/CSSPageRule.java
-@OPENJDK@/jaxp/src/org/w3c/dom/css/CSSPrimitiveValue.java
-@OPENJDK@/jaxp/src/org/w3c/dom/css/CSSRule.java
-@OPENJDK@/jaxp/src/org/w3c/dom/css/CSSRuleList.java
-@OPENJDK@/jaxp/src/org/w3c/dom/css/CSSStyleDeclaration.java
-@OPENJDK@/jaxp/src/org/w3c/dom/css/CSSStyleRule.java
-@OPENJDK@/jaxp/src/org/w3c/dom/css/CSSStyleSheet.java
-@OPENJDK@/jaxp/src/org/w3c/dom/css/CSSUnknownRule.java
-@OPENJDK@/jaxp/src/org/w3c/dom/css/CSSValue.java
-@OPENJDK@/jaxp/src/org/w3c/dom/css/CSSValueList.java
-@OPENJDK@/jaxp/src/org/w3c/dom/css/DocumentCSS.java
-@OPENJDK@/jaxp/src/org/w3c/dom/css/DOMImplementationCSS.java
-@OPENJDK@/jaxp/src/org/w3c/dom/css/ElementCSSInlineStyle.java
-@OPENJDK@/jaxp/src/org/w3c/dom/css/Rect.java
-@OPENJDK@/jaxp/src/org/w3c/dom/css/RGBColor.java
-@OPENJDK@/jaxp/src/org/w3c/dom/css/ViewCSS.java
-@OPENJDK@/jaxp/src/org/w3c/dom/Document.java
-@OPENJDK@/jaxp/src/org/w3c/dom/DocumentFragment.java
-@OPENJDK@/jaxp/src/org/w3c/dom/DocumentType.java
-@OPENJDK@/jaxp/src/org/w3c/dom/DOMConfiguration.java
-@OPENJDK@/jaxp/src/org/w3c/dom/DOMError.java
-@OPENJDK@/jaxp/src/org/w3c/dom/DOMErrorHandler.java
-@OPENJDK@/jaxp/src/org/w3c/dom/DOMException.java
-@OPENJDK@/jaxp/src/org/w3c/dom/DOMImplementation.java
-@OPENJDK@/jaxp/src/org/w3c/dom/DOMImplementationList.java
-@OPENJDK@/jaxp/src/org/w3c/dom/DOMImplementationSource.java
-@OPENJDK@/jaxp/src/org/w3c/dom/DOMLocator.java
-@OPENJDK@/jaxp/src/org/w3c/dom/DOMStringList.java
-@OPENJDK@/jaxp/src/org/w3c/dom/Element.java
-@OPENJDK@/jaxp/src/org/w3c/dom/Entity.java
-@OPENJDK@/jaxp/src/org/w3c/dom/EntityReference.java
-@OPENJDK@/jaxp/src/org/w3c/dom/events/DocumentEvent.java
-@OPENJDK@/jaxp/src/org/w3c/dom/events/Event.java
-@OPENJDK@/jaxp/src/org/w3c/dom/events/EventException.java
-@OPENJDK@/jaxp/src/org/w3c/dom/events/EventListener.java
-@OPENJDK@/jaxp/src/org/w3c/dom/events/EventTarget.java
-@OPENJDK@/jaxp/src/org/w3c/dom/events/MouseEvent.java
-@OPENJDK@/jaxp/src/org/w3c/dom/events/MutationEvent.java
-@OPENJDK@/jaxp/src/org/w3c/dom/events/UIEvent.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLAnchorElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLAppletElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLAreaElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLBaseElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLBaseFontElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLBodyElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLBRElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLButtonElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLCollection.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLDirectoryElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLDivElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLDListElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLDocument.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLDOMImplementation.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLFieldSetElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLFontElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLFormElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLFrameElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLFrameSetElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLHeadElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLHeadingElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLHRElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLHtmlElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLIFrameElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLImageElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLInputElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLIsIndexElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLLabelElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLLegendElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLLIElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLLinkElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLMapElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLMenuElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLMetaElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLModElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLObjectElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLOListElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLOptGroupElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLOptionElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLParagraphElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLParamElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLPreElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLQuoteElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLScriptElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLSelectElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLStyleElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLTableCaptionElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLTableCellElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLTableColElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLTableElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLTableRowElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLTableSectionElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLTextAreaElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLTitleElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/html/HTMLUListElement.java
-@OPENJDK@/jaxp/src/org/w3c/dom/ls/DOMImplementationLS.java
-@OPENJDK@/jaxp/src/org/w3c/dom/ls/LSException.java
-@OPENJDK@/jaxp/src/org/w3c/dom/ls/LSInput.java
-@OPENJDK@/jaxp/src/org/w3c/dom/ls/LSLoadEvent.java
-@OPENJDK@/jaxp/src/org/w3c/dom/ls/LSOutput.java
-@OPENJDK@/jaxp/src/org/w3c/dom/ls/LSParser.java
-@OPENJDK@/jaxp/src/org/w3c/dom/ls/LSParserFilter.java
-@OPENJDK@/jaxp/src/org/w3c/dom/ls/LSProgressEvent.java
-@OPENJDK@/jaxp/src/org/w3c/dom/ls/LSResourceResolver.java
-@OPENJDK@/jaxp/src/org/w3c/dom/ls/LSSerializer.java
-@OPENJDK@/jaxp/src/org/w3c/dom/ls/LSSerializerFilter.java
-@OPENJDK@/jaxp/src/org/w3c/dom/NamedNodeMap.java
-@OPENJDK@/jaxp/src/org/w3c/dom/NameList.java
-@OPENJDK@/jaxp/src/org/w3c/dom/Node.java
-@OPENJDK@/jaxp/src/org/w3c/dom/NodeList.java
-@OPENJDK@/jaxp/src/org/w3c/dom/Notation.java
-@OPENJDK@/jaxp/src/org/w3c/dom/ProcessingInstruction.java
-@OPENJDK@/jaxp/src/org/w3c/dom/ranges/DocumentRange.java
-@OPENJDK@/jaxp/src/org/w3c/dom/ranges/Range.java
-@OPENJDK@/jaxp/src/org/w3c/dom/ranges/RangeException.java
-@OPENJDK@/jaxp/src/org/w3c/dom/stylesheets/DocumentStyle.java
-@OPENJDK@/jaxp/src/org/w3c/dom/stylesheets/LinkStyle.java
-@OPENJDK@/jaxp/src/org/w3c/dom/stylesheets/MediaList.java
-@OPENJDK@/jaxp/src/org/w3c/dom/stylesheets/StyleSheet.java
-@OPENJDK@/jaxp/src/org/w3c/dom/stylesheets/StyleSheetList.java
-@OPENJDK@/jaxp/src/org/w3c/dom/Text.java
-@OPENJDK@/jaxp/src/org/w3c/dom/traversal/DocumentTraversal.java
-@OPENJDK@/jaxp/src/org/w3c/dom/traversal/NodeFilter.java
-@OPENJDK@/jaxp/src/org/w3c/dom/traversal/NodeIterator.java
-@OPENJDK@/jaxp/src/org/w3c/dom/traversal/TreeWalker.java
-@OPENJDK@/jaxp/src/org/w3c/dom/TypeInfo.java
-@OPENJDK@/jaxp/src/org/w3c/dom/UserDataHandler.java
-@OPENJDK@/jaxp/src/org/w3c/dom/views/AbstractView.java
-@OPENJDK@/jaxp/src/org/w3c/dom/views/DocumentView.java
-@OPENJDK@/jaxp/src/org/w3c/dom/xpath/XPathEvaluator.java
-@OPENJDK@/jaxp/src/org/w3c/dom/xpath/XPathException.java
-@OPENJDK@/jaxp/src/org/w3c/dom/xpath/XPathExpression.java
-@OPENJDK@/jaxp/src/org/w3c/dom/xpath/XPathNamespace.java
-@OPENJDK@/jaxp/src/org/w3c/dom/xpath/XPathNSResolver.java
-@OPENJDK@/jaxp/src/org/w3c/dom/xpath/XPathResult.java
-@OPENJDK@/jaxp/src/org/xml/sax/AttributeList.java
-@OPENJDK@/jaxp/src/org/xml/sax/Attributes.java
-@OPENJDK@/jaxp/src/org/xml/sax/ContentHandler.java
-@OPENJDK@/jaxp/src/org/xml/sax/DocumentHandler.java
-@OPENJDK@/jaxp/src/org/xml/sax/DTDHandler.java
-@OPENJDK@/jaxp/src/org/xml/sax/EntityResolver.java
-@OPENJDK@/jaxp/src/org/xml/sax/ErrorHandler.java
-@OPENJDK@/jaxp/src/org/xml/sax/ext/Attributes2.java
-@OPENJDK@/jaxp/src/org/xml/sax/ext/Attributes2Impl.java
-@OPENJDK@/jaxp/src/org/xml/sax/ext/DeclHandler.java
-@OPENJDK@/jaxp/src/org/xml/sax/ext/DefaultHandler2.java
-@OPENJDK@/jaxp/src/org/xml/sax/ext/EntityResolver2.java
-@OPENJDK@/jaxp/src/org/xml/sax/ext/LexicalHandler.java
-@OPENJDK@/jaxp/src/org/xml/sax/ext/Locator2.java
-@OPENJDK@/jaxp/src/org/xml/sax/ext/Locator2Impl.java
-@OPENJDK@/jaxp/src/org/xml/sax/HandlerBase.java
-@OPENJDK@/jaxp/src/org/xml/sax/helpers/AttributeListImpl.java
-@OPENJDK@/jaxp/src/org/xml/sax/helpers/AttributesImpl.java
-@OPENJDK@/jaxp/src/org/xml/sax/helpers/DefaultHandler.java
-@OPENJDK@/jaxp/src/org/xml/sax/helpers/LocatorImpl.java
-@OPENJDK@/jaxp/src/org/xml/sax/helpers/NamespaceSupport.java
-@OPENJDK@/jaxp/src/org/xml/sax/helpers/NewInstance.java
-@OPENJDK@/jaxp/src/org/xml/sax/helpers/ParserAdapter.java
-@OPENJDK@/jaxp/src/org/xml/sax/helpers/ParserFactory.java
-@OPENJDK@/jaxp/src/org/xml/sax/helpers/SecuritySupport.java
-@OPENJDK@/jaxp/src/org/xml/sax/helpers/XMLFilterImpl.java
-@OPENJDK@/jaxp/src/org/xml/sax/helpers/XMLReaderAdapter.java
-@OPENJDK@/jaxp/src/org/xml/sax/helpers/XMLReaderFactory.java
-@OPENJDK@/jaxp/src/org/xml/sax/InputSource.java
-@OPENJDK@/jaxp/src/org/xml/sax/Locator.java
-@OPENJDK@/jaxp/src/org/xml/sax/Parser.java
-@OPENJDK@/jaxp/src/org/xml/sax/SAXException.java
-@OPENJDK@/jaxp/src/org/xml/sax/SAXNotRecognizedException.java
-@OPENJDK@/jaxp/src/org/xml/sax/SAXNotSupportedException.java
-@OPENJDK@/jaxp/src/org/xml/sax/SAXParseException.java
-@OPENJDK@/jaxp/src/org/xml/sax/XMLFilter.java
-@OPENJDK@/jaxp/src/org/xml/sax/XMLReader.java
-@OPENJDK@/jaxws/src/share/jaf_classes/com/sun/activation/registries/LogSupport.java
-@OPENJDK@/jaxws/src/share/jaf_classes/com/sun/activation/registries/MailcapFile.java
-@OPENJDK@/jaxws/src/share/jaf_classes/com/sun/activation/registries/MailcapParseException.java
-@OPENJDK@/jaxws/src/share/jaf_classes/com/sun/activation/registries/MailcapTokenizer.java
-@OPENJDK@/jaxws/src/share/jaf_classes/com/sun/activation/registries/MimeTypeEntry.java
-@OPENJDK@/jaxws/src/share/jaf_classes/com/sun/activation/registries/MimeTypeFile.java
-@OPENJDK@/jaxws/src/share/jaf_classes/javax/activation/ActivationDataFlavor.java
-@OPENJDK@/jaxws/src/share/jaf_classes/javax/activation/CommandInfo.java
-@OPENJDK@/jaxws/src/share/jaf_classes/javax/activation/CommandMap.java
-@OPENJDK@/jaxws/src/share/jaf_classes/javax/activation/CommandObject.java
-@OPENJDK@/jaxws/src/share/jaf_classes/javax/activation/DataContentHandler.java
-@OPENJDK@/jaxws/src/share/jaf_classes/javax/activation/DataContentHandlerFactory.java
-@OPENJDK@/jaxws/src/share/jaf_classes/javax/activation/DataHandler.java
-@OPENJDK@/jaxws/src/share/jaf_classes/javax/activation/DataSource.java
-@OPENJDK@/jaxws/src/share/jaf_classes/javax/activation/FileDataSource.java
-@OPENJDK@/jaxws/src/share/jaf_classes/javax/activation/FileTypeMap.java
-@OPENJDK@/jaxws/src/share/jaf_classes/javax/activation/MailcapCommandMap.java
-@OPENJDK@/jaxws/src/share/jaf_classes/javax/activation/MimeType.java
-@OPENJDK@/jaxws/src/share/jaf_classes/javax/activation/MimeTypeParameterList.java
-@OPENJDK@/jaxws/src/share/jaf_classes/javax/activation/MimeTypeParseException.java
-@OPENJDK@/jaxws/src/share/jaf_classes/javax/activation/MimetypesFileTypeMap.java
-@OPENJDK@/jaxws/src/share/jaf_classes/javax/activation/SecuritySupport.java
-@OPENJDK@/jaxws/src/share/jaf_classes/javax/activation/UnsupportedDataTypeException.java
-@OPENJDK@/jaxws/src/share/jaf_classes/javax/activation/URLDataSource.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/databinding/Databinding.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/databinding/DatabindingFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/databinding/DatabindingMode.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/databinding/DatabindingModeFeature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/databinding/ExternalMetadataFeature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/databinding/JavaCallInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/databinding/WSDLGenerator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/databinding/WSDLResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/EnvelopeStyle.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/EnvelopeStyleFeature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/BaseDistributedPropertySet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/BasePropertySet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/ContentType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/DistributedPropertySet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/MessageContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/MessageContextFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/PropertySet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/ReadOnlyPropertyException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/impl/encoding/StreamDecoderImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/impl/internalspi/encoding/StreamDecoder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/ExistingAnnotationsType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaMethod.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaParam.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/JavaWsdlMappingType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/ObjectFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingParameterStyle.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingStyle.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/SoapBindingUse.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/Util.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/WebParamMode.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlAction.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlAddressing.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlBindingType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlFaultAction.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlHandlerChain.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlMTOM.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlOneway.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlRequestWrapper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlResponseWrapper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlServiceMode.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlSOAPBinding.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebEndpoint.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebFault.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebMethod.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebParam.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebResult.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebService.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceClient.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceProvider.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/XmlWebServiceRef.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/ClassType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/CodeWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/JBinaryFile.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/JPropertyFile.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/JSerializedObject.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/JStaticFile.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/JStaticJavaFile.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/JTextFile.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/SecureLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAnnotatable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAnnotationArrayMember.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAnnotationStringValue.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAnnotationUse.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAnnotationValue.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAnnotationWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAnonymousClass.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JArray.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JArrayClass.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JArrayCompRef.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAssignment.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAssignmentTarget.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JAtom.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JBlock.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JBreak.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JCase.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JCast.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JCatchBlock.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JClass.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JClassAlreadyExistsException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JClassContainer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JCodeModel.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JCommentPart.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JConditional.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JContinue.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JDeclaration.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JDefinedClass.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JDirectClass.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JDocComment.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JDocCommentable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JDoLoop.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JEnumConstant.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JExpr.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JExpression.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JExpressionImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JFieldRef.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JFieldVar.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JForEach.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JForLoop.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JFormatter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JGenerable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JGenerifiable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JGenerifiableImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JInvocation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JJavaName.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JLabel.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JMethod.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JMod.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JMods.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JNarrowedClass.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JNullType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JOp.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JPackage.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JPrimitiveType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JResourceFile.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JReturn.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JStatement.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JStringLiteral.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JSwitch.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JThrow.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JTryBlock.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JTypeVar.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JTypeWildcard.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JVar.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/JWhileLoop.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/SecureLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/TypedAnnotationWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/util/ClassNameComparator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/util/EncoderFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/util/JavadocEscapeWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/util/MS1252Encoder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/util/SingleByteEncoder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/util/Surrogate.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/writer/FileCodeWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/writer/FilterCodeWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/writer/ProgressCodeWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/writer/PrologCodeWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/codemodel/internal/writer/ZipCodeWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/istack/internal/Builder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/istack/internal/ByteArrayDataSource.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/istack/internal/FinalArrayList.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/istack/internal/FragmentContentHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/istack/internal/Interned.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/istack/internal/localization/Localizable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/istack/internal/localization/LocalizableMessage.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/istack/internal/localization/LocalizableMessageFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/istack/internal/localization/Localizer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/istack/internal/localization/NullLocalizable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/istack/internal/logging/Logger.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/istack/internal/NotNull.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/istack/internal/Nullable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/istack/internal/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/istack/internal/Pool.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/istack/internal/SAXException2.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/istack/internal/SAXParseException2.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/istack/internal/tools/DefaultAuthenticator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/istack/internal/tools/MaskingClassLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/istack/internal/tools/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/istack/internal/tools/SecureLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/istack/internal/XMLStreamException2.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/AMX.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/AMXGlassfish.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/AMXUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/BootAMXMBean.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/MBeanListener.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/arc/Stability.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/arc/Taxonomy.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/Probe.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeListener.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeParam.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeProvider.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/PluginPoint.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProvider.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProviderInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProviderManager.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProviderManagerDelegate.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/annotations/Reset.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/AverageRangeStatistic.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/BoundaryStatistic.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/BoundedRangeStatistic.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/CountStatistic.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatsImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/RangeStatistic.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/Statistic.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/Stats.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/StringStatistic.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/TimeStatistic.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/AMXClient.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/AMXMBeanInterface.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/AMXMetadata.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/Description.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/DescriptorFields.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/DescriptorKey.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/GmbalException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/GmbalMBean.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/GmbalMBeanNOPImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/Impact.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/IncludeSubclass.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/InheritedAttribute.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/InheritedAttributes.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedAttribute.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedData.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedObject.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedObjectManager.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedObjectManagerFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedObjectManagerNOPImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedOperation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/NameValue.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ParameterNames.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/util/GenericConstructor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/AnnotationParser.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/Const.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/ErrorReceiverImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/InlineAnnotationReaderImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/Options.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SecureLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/api/impl/j2s/JavaCompilerImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/api/impl/j2s/JAXBModelImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/api/JXC.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/ConfigReader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Classes.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Config.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Schema.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/NGCCRuntimeEx.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGenerator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/SecureLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/api/WsgenExtension.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/api/WsgenProtocol.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/Invoker.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/CustomExceptionGenerator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorExtension.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/JavaGeneratorExtensionFacade.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/JwsImplGenerator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/Names.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/AbstractType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/AsyncOperation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/AsyncOperationType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Block.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/exporter/ExternalObject.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ExtendedModelVisitor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Fault.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/HeaderFault.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaArrayType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaInterface.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaParameter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaSimpleType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureMember.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBElementMember.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBMapping.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBModel.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBProperty.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBStructuredType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeAndAnnotation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeVisitor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitMember.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitStructure.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/Util.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Model.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelObject.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelProperties.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelVisitor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Operation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Parameter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Port.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Request.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Response.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Service.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/AnnotationProcessorContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/FaultInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/MakeSafeTypeVisitor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/MemberInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/ModelBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeModeler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMoniker.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMonikerFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAp.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WrapperInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/JavaSimpleTypeCreator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/Modeler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/ModelerConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/ModelerException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/AccessorElement.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ClassNameAllocatorImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/JAXBModelBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ModelerUtils.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/ProcessorException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/util/DirectoryUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/util/IndentingWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/JavacompilerMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/ModelerMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/ModelMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/ProcessorMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/UtilMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/WscompileMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/WsdlMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/spi/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/spi/WSToolsObjectFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/ToolVersion.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/util/ClassNameInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/util/ForkEntityResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/util/WSDLFetcher.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/util/WSDLParseException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/util/WSToolsObjectFactoryImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/util/xml/XmlUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/AbortException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/AuthInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/BadCommandLineException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/FilerCodeWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/Options.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/Plugin.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/plugin/at_generated/PluginImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WSCodeWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsgenOptions.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportListener.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Binding.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/BindingFault.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/BindingInput.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/BindingOperation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/BindingOutput.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Definitions.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Documentation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Fault.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPAddress.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPBinding.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPOperation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlEncoded.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlReplacement.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Import.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Input.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/jaxws/CustomName.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Exception.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBindingsConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Parameter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Kinds.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Message.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/MessagePart.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEContent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEMultipartRelated.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEPart.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEXml.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Operation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/OperationStyle.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Output.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Port.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/PortType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaKinds.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Service.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Binding.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Constants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPAddress.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBinding.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBody.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPFault.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeaderFault.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPOperation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPStyle.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPUse.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Types.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/WSDLConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocument.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitorBase.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/Defining.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/DuplicateEntityException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/Elemental.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/Entity.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/EntityAction.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceAction.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceValidator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ExtensibilityHelper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitorBase.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ExternalEntityReference.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/GlobalEntity.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/GloballyKnown.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/Identifiable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/Kind.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/NoSuchEntityException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ParseException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ParserListener.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/QNameAction.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/TWSDLParserContextImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ValidationException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/WSDLLocation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/AbstractExtensionHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Constants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestParser.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/HTTPExtensionHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/JAXWSBindingExtensionHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/MIMEExtensionHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Policy12ExtensionHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Policy15ExtensionHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/SOAP12ExtensionHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/SOAPEntityReferenceValidator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/SOAPExtensionHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Util.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingMetadataExtensionHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/WsGen.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/WsImport.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/AbortException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/accessors/PluginImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/code_injector/Const.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/episode/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/locator/SourceLocationAddOn.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/sync/SynchronizedMethodAddOn.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/ClassNameAllocator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/ErrorListener.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/AbstractMappingImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementMappingImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/JAXBModelImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/PropertyImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/J2SJAXBModel.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/JavaCompiler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/JAXBModel.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/Mapping.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/Property.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/Reference.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/SpecVersion.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/ApClassLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/FilerCodeWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/ToolsJarNotFoundException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/XJC.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/BadCommandLineException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/ClassLoaderBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/ConsoleErrorReporter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/Driver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/ErrorReceiver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/ClassOutlineImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/ConstField.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/ContentListField.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/DummyListField.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/GenericFieldRenderer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetField.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/NoExtendedContentField.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListField.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGenerator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/util/BlockReference.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/util/ExistingBlockReference.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/util/LazyBlockReference.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/util/WhitespaceNormalizer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/Language.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/AbstractCElement.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CAdapter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CArrayInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CClass.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CClassInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CClassInfoParent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CClassRef.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CCustomizable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CCustomizations.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CDefaultValue.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CElement.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CElementInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CEnumConstant.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CNonElement.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/Constructor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CPluginCustomization.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CPropertyVisitor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CTypeInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CTypeRef.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/Model.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/Multiplicity.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/EagerNClass.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NClass.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/Populatable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/SymbolSpace.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/TypeUse.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/TypeUseFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/TypeUseImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/ModelLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/Options.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/Aspect.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/ClassOutline.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/ElementOutline.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/EnumOutline.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/FieldAccessor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/FieldOutline.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/Outline.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/PackageOutline.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/Plugin.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/ProgressCodeWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/AbstractExtensionBindingChecker.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/Const.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIAttribute.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConstructor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIContent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConversion.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIElement.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIEnumeration.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIInterface.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BindInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIUserConversion.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMLocator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DTDExtensionBindingChecker.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/Block.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/Element.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/Occurence.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/TDTDReader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/Term.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/ExtensionBindingChecker.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/Choice.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/Element.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/Graph.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/Sequence.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestParser.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestScanner.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/InternalizationLogic.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/LocatorTable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/VersionChecker.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/ModelChecker.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/RawTypeSet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGInternalizationLogic.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/Ring.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/TypeUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/Util.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AbstractDeclarationImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIClass.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDeclaration.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDom.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnum.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnumMember.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIInlineBinaryData.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISchemaBinding.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISerializable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassSelector.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/CTBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/FreshComplexTypeBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedExtendedComplexTypeBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MultiWildcardComplexTypeBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/STDerivedComplexTypeBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultClassBinder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ErrorReporter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/CustomizationContextChecker.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/IncorrectNamespaceURIChecker.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ParticleBinder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/WildcardNameClassBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/SchemaCache.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/SecureLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/CodeModelClassFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/DOMUtils.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/ErrorReceiverFilter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/ForkContentHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/ForkEntityResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/MimeTypeRange.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/NullStream.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/StringCutter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/SubtreeCutter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/Util.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/writer/SignatureWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/XJCFacade.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/XJCListener.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/AccessorFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/annotation/OverrideAnnotationOf.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/annotation/XmlLocation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/AnyTypeAdapter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/AccessorException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Bridge.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/BridgeContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/ClassResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/CompositeStructure.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/ErrorListener.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/impl/NameConverter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/impl/NameUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/JAXBRIContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/RawAccessor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/TypeReference.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/CycleRecoverable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/IDResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/InternalAccessorFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Locatable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/CharacterEscapeHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/DataWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/DumbEscapeHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/NioEscapeHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/SAX2DOMEx.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/InfosetScanner.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Patcher.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Util.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/util/AttributesImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/util/SecureLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/util/Which.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/bytecode/SecureLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/ClassFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/ContextFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Quick.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/SecureLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlAttributeQuick.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementDeclQuick.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementQuick.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefQuick.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefsQuick.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlEnumQuick.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlRootElementQuick.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaQuick.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTransientQuick.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTypeQuick.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlValueQuick.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ArrayInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/AttributePropertyInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/BuiltinLeafInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/Element.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/EnumConstant.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/EnumLeafInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ID.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/NonElement.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/PropertyInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/Ref.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/TypeRef.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/DummyPropertyInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/FieldPropertySeed.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/MapPropertyInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilderI.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/PropertyInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/SecureLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Util.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/SecureLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/TypeVisitor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/WildcardTypeImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElementRef.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/util/ArrayInfoUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ArrayBeanInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/AssociationMap.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/AttributeAccessor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BinderImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BridgeContextImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Coordinator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/DomPostInitAction.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/LifecycleMethods.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Location.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Name.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/NameList.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/NamespaceContext2.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/SecureLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayReferenceNodeProperty.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Property.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/SingleReferenceNodeProperty.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/StructureLoaderBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/TagAndType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/UnmarshallerChain.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ValueProperty.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedAccessor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedLister.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/DefaultTransducedAccessor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListIterator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListTransducedAccessorImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Injector.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/SecureLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/SchemaTypeTransducer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapterMarker.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Transducer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesExImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyXsiLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SecureLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXExConnector.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TagName.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValidatingUnmarshaller.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Utils.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/episode/Bindings.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/episode/Klass.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/episode/Package.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/episode/SchemaBindings.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Form.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/GroupKind.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Tree.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Util.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Particle.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/TODO.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/ByteArrayOutputStreamEx.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/CollisionCheckStack.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/DataSourceSource.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/EditDistance.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/FatalAdapter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/FlattenIterator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/QNameMap.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/StackRecorder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/TypeCast.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/XmlFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/WellKnownNamespace.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/ValidationEventLocatorEx.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/WhiteSpaceProcessor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/XmlAccessorFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDEventListener.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDParser.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/EndOfInputException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/EntityDecl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/ExternalEntity.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/InputEntity.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/InternalEntity.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/MessageCatalog.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/Resolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/SimpleHashtable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlChars.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlNames.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlReader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/BASE64EncodingAlgorithm.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/BooleanEncodingAlgorithm.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithm.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmState.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/DoubleEncodingAlgorithm.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/FloatEncodingAlgorithm.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/IEEE754FloatingPointEncodingAlgorithm.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/IntegerEncodingAlgorithm.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/IntEncodingAlgorithm.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/ShortEncodingAlgorithm.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/alphabet/BuiltInRestrictedAlphabets.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/CommonResourceBundle.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/Decoder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/DecoderStateTables.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/Encoder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/EncodingConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/Notation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/OctetBufferListener.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/XMLChar.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/QualifiedName.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/Features.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/Properties.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/SystemIdResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/EventLocation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/CharactersEvent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/CommentEvent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/DTDEvent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/EmptyIterator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/EndDocumentEvent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/EndElementEvent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/EntityDeclarationImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/EntityReferenceEvent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/EventBase.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/NamespaceBase.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/ProcessingInstructionEvent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/ReadIterator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/StartDocumentEvent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/StartElementEvent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocatorBase.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventReader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/StAXFilteredEvent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/Util.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/XMLConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXEventFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXInputFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXOutputFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/StAXManager.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/util/StAXFilteredParser.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/util/StAXParserWrapper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/FI_DOM_Or_XML_DOM_SAX_SAXEvent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_SAXEvent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_XML.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/FI_StAX_SAX_Or_XML_SAX_SAXEvent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/PrintTable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/SAX2StAXWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/SAXEventSerializer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/StAX2SAXReader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/TransformInputOutput.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/VocabularyGenerator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_FI.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_SAX_FI.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_FI.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_StAX_FI.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/UnparsedEntity.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/CharArray.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/CharArrayArray.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/CharArrayIntMap.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/CharArrayString.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/ContiguousCharArrayArray.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/FixedEntryStringIntMap.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/KeyIntMap.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/LocalNameQualifiedNamesMap.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/NamespaceContextImplementation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/PrefixArray.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/QualifiedNameArray.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/StringArray.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/StringIntMap.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/ValueArray.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/ValueArrayResourceException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/vocab/ParserVocabulary.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/vocab/SerializerVocabulary.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/vocab/Vocabulary.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/Header.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePullMultipart.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParseException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BEncoderStream.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/LineInputStream.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/OutputUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QEncoderStream.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUEncoderStream.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/Envelope.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/CommentImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/Base64.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/CharReader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/CharWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/ParserPool.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/SAAJUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithm.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmIndexes.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/ExternalVocabulary.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetParser.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetResult.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSource.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/RestrictedAlphabet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmAttributes.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmContentHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/ExtendedContentHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetReader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/FastInfosetDefaultHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/PrimitiveTypeContentHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/RestrictedAlphabetContentHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/FastInfosetStreamReader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/LowLevelFastInfosetStreamWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/Vocabulary.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/VocabularyApplicationData.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/ASCIIUtility.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/BASE64DecoderStream.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/Chunk.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/ChunkInputStream.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/CleanUpExecutorFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/Data.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/DataFile.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/DataHead.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/DecodingException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/FactoryFinder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/FileData.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/FinalArrayList.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/Header.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/InternetHeaders.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/LineInputStream.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEConfig.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEEvent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParser.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEPart.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MimeUtility.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/PropUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/QPDecoderStream.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/TempFiles.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/UUDecoderStream.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/WeakDataFile.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/Base64Encoder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/Base64EncoderStream.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/ByteArrayOutputStreamEx.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/StreamingDataHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/Annotations.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/BuildException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/CommentList.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/DataPatternBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/Div.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/ElementAnnotationBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/Grammar.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/GrammarSection.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/Include.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/IncludedGrammar.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/NameClassBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/Scope.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/om/Location.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/om/ParsedElementAnnotation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/om/ParsedNameClass.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/om/ParsedPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/util/LocatorImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/AfterPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/Alphabet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/AttributePattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/BinaryPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/ChoicePattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/DataExceptPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/DataPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/DuplicateAttributeDetector.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/ElementPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/EmptyPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/ErrorPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/GroupPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/InterleavePattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/ListPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/NotAllowedPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/OneOrMorePattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/Pattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/PatternBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/PatternInterner.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/RefPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/RestrictionViolationException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/SchemaBuilderImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/SchemaPatternBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/StringPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/TextPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/ValuePattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/visitor/ChildElementFinder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/visitor/PatternFunction.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/visitor/PatternVisitor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/visitor/PatternWalker.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/Annotation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/CommentListImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DAnnotation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DataPatternBuilderImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DAttributePattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DChoicePattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DContainerPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DDataPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DDefine.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DElementPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DEmptyPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DGrammarPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DGroupPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DInterleavePattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DListPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DMixedPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DNotAllowedPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DOMPrinter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DOneOrMorePattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DOptionalPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DPatternVisitor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DPatternWalker.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DRefPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DSchemaBuilderImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DTextPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DUnaryPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DValuePattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DXMLPrinter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DXmlTokenPattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DZeroOrMorePattern.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/ElementAnnotationBuilderImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/ElementWrapper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/GrammarBuilderImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/IncludeImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/Main.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/PatternParseable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibrary.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/builtin/CompatibilityDatatypeLibrary.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/CachedDatatypeLibraryFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/CascadingDatatypeLibraryFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/DoNothingDatatypeLibraryFactoryImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/AnyNameClass.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/AnyNameExceptNameClass.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/ChoiceNameClass.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NameClass.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NameClassBuilderImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NameClassVisitor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NameClassWalker.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NsNameClass.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NsNameExceptNameClass.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NullNameClass.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/OverlapDetector.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/SimpleNameClass.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/CompactParseable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxTokenManager.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/EOFException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/EscapeSyntaxException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/JavaCharStream.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/ParseException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/Token.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/TokenMgrError.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/UCode_UCodeESC_CharStream.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/Context.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/AnnotationsHost.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/Base.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/CommentListHost.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/DataPatternBuilderHost.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/DivHost.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/ElementAnnotationBuilderHost.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/GrammarHost.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/GrammarSectionHost.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/IncludeHost.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/LocationHost.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/NameClassBuilderHost.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/ParsedElementAnnotationHost.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/ParsedNameClassHost.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/ParsedPatternHost.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/SchemaBuilderHost.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/ScopeHost.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/IllegalSchemaException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/Parseable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/xml/DtdContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/xml/SAXParseable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/xml/SchemaParser.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/util/Localizer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/util/Uri.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/util/Utf16.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/sax/AbstractLexicalHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/sax/JAXPXMLReaderCreator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/sax/XmlBaseHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/sax/XMLReaderCreator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/util/EncodingMap.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/util/Naming.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/util/WellKnownNamespaces.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AbstractCreator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AttributesHolder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/FragmentedArray.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/Features.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/Properties.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/NamespaceContexHelper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/annotation/XmlAttribute.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/annotation/XmlCDATA.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/annotation/XmlElement.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/annotation/XmlNamespace.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/annotation/XmlValue.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/Attribute.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/Cdata.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/Comment.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/ContainerElement.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/Content.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/ContentVisitor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/DatatypeWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/Document.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/EndDocument.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/EndTag.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/IllegalAnnotationException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/IllegalSignatureException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/NamespaceDecl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/NamespaceResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/NamespaceSupport.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/CharacterEscapeHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/DataWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/DelegatingXMLStreamWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/DomSerializer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/DumbEscapeHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/DumpSerializer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/IndentingXMLFilter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/IndentingXMLStreamWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/ResultFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/SaxSerializer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/StaxSerializer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/StreamSerializer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/TXWResult.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/TXWSerializer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/XmlSerializer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/XMLWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/Pcdata.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/StartDocument.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/StartTag.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/Text.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/TXW.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/TxwException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/TypedXmlWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/EndpointReferenceUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/EPRSDDocumentFilter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/model/ActionNotSupportedException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/model/InvalidAddressingHeaderException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/model/MissingAddressingHeaderException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/policy/AddressingFeatureConfigurator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/policy/AddressingPolicyMapConfigurator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/policy/AddressingPolicyValidator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/policy/AddressingPrefixMapper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/ProblemAction.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/ProblemHeaderQName.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionAddressingConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaClientTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaServerTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/v200408/ProblemAction.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/v200408/ProblemHeaderQName.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/W3CAddressingConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/W3CAddressingMetadataConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/W3CWsaClientTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/W3CWsaServerTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaActionUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaClientTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaServerTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaTubeHelper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WSEPRExtension.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/AddressingPropertySet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/EPRHeader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/NonAnonymousResponseProcessor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/OneWayFeature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/BindingID.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/BindingIDFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/Cancelable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/client/SelectOptimalEncodingFeature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/client/ServiceInterceptorFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/client/ThrowableInPacketCompletionFeature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/client/WSPortInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/Component.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ComponentEx.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ComponentFeature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ComponentRegistry.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ComponentsFeature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/config/management/EndpointCreationAttributes.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/config/management/ManagedEndpointFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/config/management/policy/ManagedClientAssertion.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/config/management/policy/ManagedServiceAssertion.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/config/management/policy/ManagementAssertion.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/config/management/Reconfigurable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/ClientCallBridge.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/Databinding.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/DatabindingConfig.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/DatabindingFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/EndpointCallBridge.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/JavaCallInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/MappingInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/MetadataReader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/SoapBodyStyle.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/WSDLGenInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/DistributedPropertySet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/EndpointAddress.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/fastinfoset/FastInfosetFeature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/FeatureConstructor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/FeatureListValidator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/FeatureListValidatorAnnotation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ha/HaInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ha/StickyFeature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/handler/MessageHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/handler/MessageHandlerContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ImpliesWebServiceFeature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/AddressingUtils.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Attachment.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/AttachmentEx.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/AttachmentSet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/ExceptionHasMessage.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/FilterMessageImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Header.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/HeaderList.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Headers.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Message.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/MessageContextFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/MessageHeaders.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/MessageMetadata.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/MessageWrapper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/MessageWritable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Packet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/saaj/SAAJFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/saaj/SAAJMessageHeaders.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/saaj/SaajStaxWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/stream/InputStreamMessage.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/stream/StreamBasedMessage.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/stream/XMLStreamReaderMessage.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/StreamingSOAP.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/SuppressAutomaticWSARequestHeadersFeature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/CheckedException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/ExceptionType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/JavaMethod.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/MEP.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/Parameter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/ParameterBinding.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/SEIModel.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/soap/SOAPBinding.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLBoundFault.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLBoundOperation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLBoundPortType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLFault.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLInput.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLMessage.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLModel.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLOperation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLOutput.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLPart.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLPort.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLPortType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/EditableWSDLService.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundFault.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLDescriptorKind.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtensible.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtension.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFault.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFeaturedObject.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLInput.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLMessage.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLObject.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOutput.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPart.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPartDescriptor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPort.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLService.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/WSDLOperationMapping.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Codec.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Codecs.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/ContentType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Engine.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Fiber.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptorFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterPipeImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractPipeImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractTubeImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/helper/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/helper/PipeAdapter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/NextAction.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Pipe.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/PipeCloner.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/PipeClonerImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/PipelineAssembler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/SOAPBindingCodec.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/StreamSOAPCodec.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Stubs.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/SyncStartForAsyncFeature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/ThrowableContainerPropertySet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/TransportPipeFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Tube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/TubeCloner.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/TubelineAssembler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/AlternativeSelector.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/ModelGenerator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/ModelTranslator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/ModelUnmarshaller.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/PolicyResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/PolicyResolverFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/SourceModel.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/subject/BindingSubject.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/ValidationProcessor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/PropertySet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ResourceLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/AbstractInstanceResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/AbstractServerAsyncTransport.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/Adapter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/AsyncProvider.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/AsyncProviderCallback.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/BoundEndpoint.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/Container.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ContainerResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/DocumentAddressResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/EndpointAwareCodec.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/EndpointComponent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/EndpointData.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/EndpointReferenceExtensionContributor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/HttpEndpoint.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolverAnnotation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/Invoker.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/LazyMOMProvider.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/MethodUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/Module.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/PortAddressResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ProviderInvokerTubeFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ResourceInjector.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/SDDocument.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/SDDocumentFilter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ServiceDefinition.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ThreadLocalContainerResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/TransportBackChannel.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/WebModule.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/WebServiceContextDelegate.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/WSWebServiceContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ServiceSharedFeatureMarker.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/SOAPVersion.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/WebServiceFeatureFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/WSBinding.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/MetaDataResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/MetadataResolverFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/PolicyWSDLParserExtension.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/ServiceDescriptor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/XMLEntityResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGeneratorExtension.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGenExtnContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/WSDLLocator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/WSFeatureList.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/WSService.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/DefaultClientTubelineAssemblyContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/DefaultServerTubelineAssemblyContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/dev/ClientTubelineAssemblyContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/dev/ServerTubelineAssemblyContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/dev/TubeFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/dev/TubelineAssemblyContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/dev/TubelineAssemblyContextUpdater.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/dev/TubelineAssemblyDecorator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws/AddressingTubeFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws/BasicTransportTubeFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws/HandlerTubeFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws/MonitoringTubeFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws/MustUnderstandTubeFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws/TerminalTubeFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws/ValidationTubeFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/MetroConfigLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/MetroConfigName.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/MetroConfigNameImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/MetroTubelineAssembler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/TubeCreator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/TubelineAssemblyContextImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/TubelineAssemblyController.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/binding/BindingImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/binding/FeatureListUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/binding/HTTPBindingImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/AsyncInvoker.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/AsyncResponseImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/BindingProviderProperties.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/ClientContainer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/ClientSchemaValidationTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/ClientTransportException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/ContentNegotiation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/DataSourceDispatch.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/DispatchImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/JAXBDispatch.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/MessageDispatch.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/PacketDispatch.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/RESTSourceDispatch.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/SOAPMessageDispatch.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/SOAPSourceDispatch.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/HandlerConfiguration.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/HandlerConfigurator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/MonitorRootClient.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/PortInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/RequestContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/ResponseContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/ResponseContextReceiver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/SCAnnotations.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/AsyncMethodHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/BodyBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/CallbackMethodHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MessageFiller.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/pacakge-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/PollingMethodHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/ResponseBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIMethodHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/StubAsyncHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/StubHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SyncMethodHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/ValueGetter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/ValueGetterFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/ValueSetter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/ValueSetterFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/SEIPortInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/SenderException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/Stub.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/Closeable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/commons/xmlutil/Converter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/config/management/policy/ManagementAssertionCreator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/config/management/policy/ManagementPolicyValidator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/config/management/policy/ManagementPrefixMapper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/config/metro/dev/FeatureReader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/config/metro/util/ParserUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/DatabindingFactoryImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/DatabindingImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/DatabindingProviderImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/glassfish/BridgeWrapper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/glassfish/JAXBRIContextFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/glassfish/JAXBRIContextWrapper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/glassfish/MarshallerBridge.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/glassfish/RawAccessorWrapper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/glassfish/WrapperBridge.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/BindingTypeFeature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/EPRRecipe.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/HttpConfigFeature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/JAXBContextFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/JAXWSProperties.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressing.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressingFeature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/SchemaValidation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/SchemaValidationFeature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/Serialization.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/SerializationFeature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/ServerSideException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/StreamingAttachment.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/StreamingAttachmentFeature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/StreamingDataHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/UsesJAXBContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/UsesJAXBContextFeature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/ValidationErrorHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/WSBindingProvider.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/dump/LoggingDumpTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/dump/MessageDumper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/dump/MessageDumping.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/dump/MessageDumpingFeature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/dump/MessageDumpingTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/dump/MessageDumpingTubeFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/ContentType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/ContentTypeImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/DataHandlerDataSource.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/DataSourceStreamingDataHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetCodec.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetMIMETypes.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderRecyclable.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP11Codec.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP12Codec.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAPCodec.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/HasEncoding.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/HeaderTokenizer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/ImageDataContentHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MimeCodec.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MIMEPartStreamingDataHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MtomCodec.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/ParameterList.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/EncodingConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/EncodingPolicyValidator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/EncodingPrefixMapper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/FastInfosetFeatureConfigurator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/MtomFeatureConfigurator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/MtomPolicyMapConfigurator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/SelectOptimalEncodingFeatureConfigurator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/RootOnlyCodec.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/DeserializationException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/SerializationException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/SerializerConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/SOAP12Constants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/SOAPConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAP12NamespaceConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAPNamespaceConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/SOAPBindingCodec.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StringDataContentHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/SwACodec.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/TagInfoset.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/xml/XMLCodec.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/xml/XMLConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/xml/XMLMessage.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/xml/XMLPropertyBag.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/XmlDataContentHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/CodeType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/DetailType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/ExceptionBean.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/ReasonType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/ServerSOAPFaultException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SOAP11Fault.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SOAP12Fault.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SubcodeType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/TextType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/ClientLogicalHandlerTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/ClientMessageHandlerTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/ClientSOAPHandlerTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/HandlerChainsModel.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/HandlerException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/HandlerProcessor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/HandlerTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/LogicalMessageContextImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/LogicalMessageImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/MessageContextImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/MessageHandlerContextImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/MessageUpdatableContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/PortInfoImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/ServerLogicalHandlerTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/ServerMessageHandlerTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/ServerSOAPHandlerTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/SOAPHandlerProcessor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/SOAPMessageContextImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/XMLHandlerProcessor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/AbstractHeaderImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/AbstractMessageImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/AttachmentSetImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/AttachmentUnmarshallerImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/ByteArrayAttachment.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/DataHandlerAttachment.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/DOMHeader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/DOMMessage.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/EmptyMessageImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/FaultDetailHeader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/FaultMessage.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/AttachmentMarshallerImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBBridgeSource.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBDispatchMessage.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/MarshallerBridge.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/JAXBAttachment.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/MimeAttachmentSet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/PayloadElementSniffer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/ProblemActionHeader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/RelatesToHeader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/RootElementSniffer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/saaj/SAAJHeader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/source/PayloadSourceMessage.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/source/ProtocolSourceMessage.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/source/SourceUtils.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/OutboundStreamHeader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/PayloadStreamReaderMessage.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/StreamAttachment.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/StreamHeader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/StreamHeader11.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/StreamHeader12.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/StreamMessage.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/StringHeader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/Util.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/XMLReaderImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/AbstractWrapperBeanGenerator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/CheckedExceptionImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/ExternalMetadataReader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/FieldSignature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/Injector.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/JavaMethodImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/ParameterImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/ReflectAnnotationReader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/RuntimeModeler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/RuntimeModelerException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/soap/SOAPBindingImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/SOAPSEIModel.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/Utils.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/WrapperParameter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/AbstractExtensibleImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/AbstractFeaturedObjectImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/AbstractObjectImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundFaultImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundOperationImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundPortTypeImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLDirectProperties.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLFaultImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLInputImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLMessageImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLModelImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLOperationImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLOutputImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLPartDescriptorImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLPartImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortProperties.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortTypeImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLProperties.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLServiceImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationVisitor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Attribute.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/ByteVector.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassAdapter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassReader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassVisitor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Edge.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldVisitor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Frame.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Handler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Item.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Label.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodAdapter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodVisitor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Opcodes.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Type.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/AssertionSet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/AssertionValidationProcessor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/ComplexAssertion.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/EffectiveAlternativeSelector.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/EffectivePolicyModifier.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerEndpointScope.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerMessageScope.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerOperationScope.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerServiceScope.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/DefaultPolicyResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/PolicyMapBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/PolicyUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/PolicyWSDLGeneratorExtension.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/PolicyWSDLParserExtension.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/SafePolicyReader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/spi/PolicyFeatureConfigurator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/spi/PolicyMapConfigurator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/WSDLBoundFaultContainer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/NestedPolicy.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/Policy.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyAssertion.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyIntersector.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMap.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapExtender.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapKey.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapKeyHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapMutator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMerger.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyScope.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicySubject.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/LocalizationMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyLogger.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/RuntimePolicyUtilsException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/ServiceConfigurationError.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/ServiceFinder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/SimpleAssertion.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/AssertionData.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ExternalAttachmentsUnmarshaller.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/CompactModelGenerator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/DefaultPolicyAssertionCreator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/ModelNode.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/NormalizedModelGenerator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelGenerator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelMarshaller.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelTranslator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelUnmarshaller.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyReferenceData.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModel.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModelContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/NamespaceVersion.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/XmlToken.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelMarshaller.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelUnmarshaller.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/AbstractQNameValidator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/AssertionCreationException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionCreator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionValidator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PrefixMapper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/PolicyMapKeyConverter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/WsdlBindingSubject.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/protocol/soap/ClientMUTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/protocol/soap/MessageCreationException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/protocol/soap/MUTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/protocol/soap/ServerMUTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/protocol/soap/VersionMismatchException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/protocol/xml/XMLMessageException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/AddressingMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/BindingApiMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/ClientMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/DispatchMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/EncodingMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/HandlerMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/HttpserverMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/ManagementMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/ModelerMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/PolicyMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/SenderMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/ServerMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/SoapMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/StreamingMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/TubelineassemblyMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/UtilMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/WsservletMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/XmlmessageMessages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/MetroConfig.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/ObjectFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/TubeFactoryConfig.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/TubeFactoryList.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/TubelineDefinition.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/TubelineFeature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/TubelineFeatureReader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/TubelineMapping.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/Tubelines.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/AbstractMultiInstanceResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/AbstractWebServiceContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/DefaultResourceInjector.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/DraconianValidationErrorHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/EndpointAwareTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/EndpointFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/EndpointMessageContextImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/InvokerTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/MonitorBase.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/MonitorRootService.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/AsyncProviderInvokerTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/MessageProviderArgumentBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/ProviderArgumentsBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/ProviderEndpointModel.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/ProviderInvokerTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/SOAPProviderArgumentBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/SyncProviderInvokerTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/XMLProviderArgumentBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/SDDocumentImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/EndpointArgumentsBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/EndpointResponseMessageBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/Invoker.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/InvokerSource.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/InvokerTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/MessageFiller.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/SEIInvokerTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/TieHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/ValueGetter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/ServerPropertyConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/ServerRtException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/ServerSchemaValidationTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/ServiceDefinitionImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/SingletonResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/UnsupportedMediaException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/WSDLGenResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/WSEndpointImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/WSEndpointMOMProxy.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/BindingContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/BindingContextFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/BindingHelper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/BindingInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/DatabindingException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/DatabindingProvider.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/FieldGetter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/FieldSetter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/JAXBWrapperAccessor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/MethodGetter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/MethodSetter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/OldBridge.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/PropertyAccessor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/PropertyGetter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/PropertyGetterBase.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/PropertySetter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/PropertySetterBase.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/RepeatedElementBridge.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/TypeInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/Utils.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/WrapperAccessor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/WrapperBridge.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/WrapperComposite.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/XMLBridge.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ProviderImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/Attributes.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/DOMStreamReader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/MtomStreamWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/PrefixFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/PrefixFactoryImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/SourceReaderFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/TidyXMLStreamReader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/XMLReaderException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/DeferredTransportPipe.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/Headers.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/client/HttpClientTransport.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/client/HttpResponseProperties.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/DeploymentDescriptorParser.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/HttpAdapter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/HttpAdapterList.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/HttpMetadataPublisher.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/ResourceLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/HttpEndpoint.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/PortableConnectionImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/PortableHttpHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapterList.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/ServerConnectionImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/ServerContainer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/WSHttpHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/ASCIIUtility.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/ByteArrayBuffer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/ByteArrayDataSource.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/CompletedFuture.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/Constants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/DOMUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/LocatableWebServiceException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/FastInfosetReflection.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/FastInfosetUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/HandlerAnnotationInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/InjectionPlan.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/JAXWSUtils.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/MetadataUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/NamespaceSupport.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/NoCloseInputStream.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/NoCloseOutputStream.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/pipe/DumpTube.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/pipe/StandalonePipeAssembler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/pipe/StandaloneTubeAssembler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/Pool.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/QNameMap.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/ReadAllStream.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/RuntimeVersion.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/ServiceConfigurationError.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/ServiceFinder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/StreamUtils.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/StringUtils.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/UtilException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/Version.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/VersionUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/CDATA.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/ContentHandlerToXMLStreamWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/DummyLocation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/NamedNodeMapIterator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/NamespaceContextExAdaper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/NodeListIterator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/StAXResult.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/StAXSource.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XMLReaderComposite.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderFilter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToXMLStreamWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XMLStreamWriterFilter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/ActionBasedOperationFinder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/ActionBasedOperationSignature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/DispatchException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/OperationDispatcher.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/DelegatingParserExtension.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/EntityResolverWrapper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/ErrorHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/FoolProofParserExtension.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/InaccessibleWSDLException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/MemberSubmissionAddressingWSDLParserExtension.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/MexEntityResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/MIMEConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/ParserUtil.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/SOAPConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingMetadataWSDLParserExtension.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingWSDLParserExtension.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/WSDLConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionContextImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionFacade.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/PayloadQNameBasedOperationFinder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/SDDocumentResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/SOAPActionBasedOperationFinder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Binding.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/BindingOperationType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Definitions.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Documented.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Fault.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/FaultType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Address.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Binding.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Operation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/http/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Import.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Message.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/OpenAtts.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Operation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/ParamType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Part.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Port.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/PortType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Service.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/Body.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/BodyType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/Header.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/HeaderFault.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPAddress.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPBinding.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPFault.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPOperation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Body.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/BodyType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Header.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/HeaderFault.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPAddress.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPBinding.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPFault.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPOperation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/StartWithExtensionsType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Types.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Import.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Schema.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/DocumentLocationResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/TXWContentHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/UsingAddressing.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingMetadataWSDLGeneratorExtension.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingWSDLGeneratorExtension.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGeneratorExtensionFacade.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/WSDLPatcher.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/WSDLResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/WSDLOperationFinder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/ForeignAttributes.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/AnnotationImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/AttGroupDeclImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/AttributeDeclImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/AttributesHolder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/AttributeUseImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ComplexTypeImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ComponentImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/Const.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ContentTypeImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/DeclarationImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ElementDecl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/EmptyImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/FacetImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ForeignAttributesImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/IdentityConstraintImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ListSimpleTypeImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ModelGroupDeclImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ModelGroupImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/NotationImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/BaseContentRef.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/DefaultAnnotationParser.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/DelayedRef.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/NGCCRuntimeEx.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/ParserContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/Patch.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/PatcherManager.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/SchemaDocumentImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/annotation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/AttributesImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/erSet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/ersSet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/facet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/foreignAttributes.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/group.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventReceiver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventSource.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCInterleaveFilter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/occurs.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/particle.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qualification.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/redefine.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/Schema.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/xpath.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/SubstGroupBaseTypeRef.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ParticleImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/Ref.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/RestrictionSimpleTypeImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/AbstractAxisImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/Axis.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/Iterators.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/ParseException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/SCDImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/SCDParser.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/SCDParserConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/SCDParserTokenManager.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/SimpleCharStream.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/Step.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/Token.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/TokenMgrError.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/SchemaImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/SchemaSetImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/SimpleTypeImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/UName.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/UnionSimpleTypeImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/Util.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/util/DraconianErrorHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/util/ResourceEntityResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/util/SchemaTreeTraverser.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/util/SchemaWriter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/util/Uri.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/WildcardImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/XPathImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/AnnotationContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/AnnotationParser.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/AnnotationParserFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/JAXPParser.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/SchemaDocument.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/XMLParser.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/XSOMParser.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/SCD.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/ComponentNameFunction.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/DeferedCollection.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/NameGetter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/SimpleTypeSet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/TypeClosure.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/TypeSet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/XSFinder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/XSFunctionFilter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSContentTypeFunction.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSContentTypeVisitor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSFunction.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeFunction.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeVisitor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSTermFunction.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSTermFunctionWithParam.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSTermVisitor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSVisitor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSWildcardFunction.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSWildcardVisitor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XmlString.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSAnnotation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSAttContainer.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSAttGroupDecl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSAttributeDecl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSAttributeUse.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSComplexType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSComponent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSContentType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSDeclaration.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSElementDecl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSFacet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSIdentityConstraint.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSListSimpleType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSModelGroup.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSModelGroupDecl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSNotation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSParticle.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSRestrictionSimpleType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSSchema.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSSchemaSet.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSSimpleType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSTerm.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSUnionSimpleType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSVariety.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSWildcard.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSXPath.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/annotation/Generated.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/annotation/PostConstruct.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/annotation/PreDestroy.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/annotation/Resource.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/annotation/Resources.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/jws/HandlerChain.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/jws/Oneway.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/jws/soap/InitParam.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/jws/soap/SOAPBinding.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/jws/soap/SOAPMessageHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/jws/soap/SOAPMessageHandlers.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/jws/WebMethod.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/jws/WebParam.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/jws/WebResult.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/jws/WebService.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlAdapter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/DomHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/W3CDomHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessOrder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorOrder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyAttribute.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyElement.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttachmentRef.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttribute.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElement.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementDecl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRef.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRefs.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElements.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementWrapper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnum.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnumValue.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlID.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlIDREF.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlInlineBinaryData.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlList.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlMimeType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlMixed.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNs.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNsForm.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlRegistry.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlRootElement.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchema.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchemaType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchemaTypes.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSeeAlso.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlTransient.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/XmlValue.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentMarshaller.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/Binder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/ContextFinder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/DataBindingException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverter.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterInterface.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/Element.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/GetPropertyAction.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/ParseConversionEventImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/PrintConversionEventImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXB.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBElement.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBIntrospector.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/JAXBPermission.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/MarshalException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/Marshaller.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/NotIdentifiableEvent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/ParseConversionEvent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/PrintConversionEvent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/PropertyException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/SchemaOutputResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/TypeConstraintException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/UnmarshalException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/Unmarshaller.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/UnmarshallerHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/util/JAXBResult.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/util/JAXBSource.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/util/Messages.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/util/ValidationEventCollector.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationEvent.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationEventHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationEventLocator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/ValidationException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/Validator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/WhiteSpaceProcessor.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/AttachmentPart.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/Detail.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/DetailEntry.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/FactoryFinder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/MessageFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeaders.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/Name.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/Node.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/SAAJMetaFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/SAAJResult.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBody.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBodyElement.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConnection.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConnectionFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConstants.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElement.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElementFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPEnvelope.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFault.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFaultElement.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeaderElement.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPMessage.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPPart.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/Text.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/Action.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/AsyncHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/Binding.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/BindingProvider.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/BindingType.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/Dispatch.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/Endpoint.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/EndpointContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/EndpointReference.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/FaultAction.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/Handler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/HandlerResolver.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/LogicalHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/LogicalMessageContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/MessageContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/PortInfo.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/soap/SOAPHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/soap/SOAPMessageContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/Holder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/http/HTTPBinding.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/http/HTTPException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/LogicalMessage.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/ProtocolException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/Provider.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/RequestWrapper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/RespectBinding.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/RespectBindingFeature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/Response.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/ResponseWrapper.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/Service.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/ServiceMode.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/Addressing.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/AddressingFeature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/MTOM.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/MTOMFeature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/SOAPBinding.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/SOAPFaultException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/FactoryFinder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/HttpContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/HttpExchange.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/HttpHandler.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/Invoker.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/Provider.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/ServiceDelegate.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/WebServiceFeatureAnnotation.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/WebEndpoint.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/WebFault.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceClient.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceContext.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceFeature.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServicePermission.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceProvider.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceRef.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/WebServiceRefs.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/wsaddressing/package-info.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/org/relaxng/datatype/Datatype.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/org/relaxng/datatype/DatatypeBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/org/relaxng/datatype/DatatypeException.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/org/relaxng/datatype/DatatypeLibrary.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/org/relaxng/datatype/DatatypeLibraryFactory.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/org/relaxng/datatype/DatatypeStreamingValidator.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/org/relaxng/datatype/helpers/StreamingValidatorImpl.java
-@OPENJDK@/jaxws/src/share/jaxws_classes/org/relaxng/datatype/ValidationContext.java
-@OPENJDK@/jdk/src/share/classes/com/sun/awt/AWTUtilities.java
-@OPENJDK@/jdk/src/share/classes/com/sun/awt/SecurityWarning.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/AccessorElementHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/ArrayElementHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/BooleanElementHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/ByteElementHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/CharElementHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/ClassElementHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/DoubleElementHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/ElementHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/FalseElementHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/FieldElementHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/FloatElementHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/IntElementHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/JavaElementHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/LongElementHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/MethodElementHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/NewElementHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/NullElementHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/ObjectElementHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/PropertyElementHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/ShortElementHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/StringElementHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/TrueElementHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/ValueObject.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/ValueObjectImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/VarElementHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/VoidElementHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/editors/BooleanEditor.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/editors/ByteEditor.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/editors/ColorEditor.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/editors/DoubleEditor.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/editors/EnumEditor.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/editors/FloatEditor.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/editors/FontEditor.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/editors/IntegerEditor.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/editors/LongEditor.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/editors/NumberEditor.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/editors/ShortEditor.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/editors/StringEditor.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/finder/AbstractFinder.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/finder/BeanInfoFinder.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/finder/ClassFinder.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/finder/ConstructorFinder.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/finder/FieldFinder.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/finder/InstanceFinder.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/finder/MethodFinder.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/finder/PersistenceDelegateFinder.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/finder/PrimitiveTypeMap.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/finder/PrimitiveWrapperMap.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/finder/PropertyEditorFinder.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/finder/Signature.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/finder/SignatureException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/infos/ComponentBeanInfo.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/TypeResolver.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/util/Cache.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/WeakCache.java
-@OPENJDK@/jdk/src/share/classes/com/sun/beans/WildcardTypeImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/AESCipher.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/AESConstants.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/AESCrypt.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/AESKeyGenerator.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/AESParameters.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/AESWrapCipher.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/ai.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/ARCFOURCipher.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/BlockCipherParamsCore.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/BlowfishCipher.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/BlowfishConstants.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/BlowfishCrypt.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/BlowfishKeyGenerator.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/BlowfishParameters.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/CipherBlockChaining.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/CipherCore.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/CipherFeedback.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/CipherTextStealing.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/CipherWithWrappingSpi.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/ConstructKeys.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/CounterMode.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/DESCipher.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/DESConstants.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/DESCrypt.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/DESedeCipher.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/DESedeCrypt.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/DESedeKey.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/DESedeKeyFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/DESedeKeyGenerator.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/DESedeParameters.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/DESKey.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/DESKeyFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/DESKeyGenerator.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/DESParameters.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/DHKeyFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/DHParameters.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/DHPrivateKey.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/DHPublicKey.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/ElectronicCodeBook.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/EncryptedPrivateKeyInfo.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/FeedbackCipher.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/GaloisCounterMode.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/GCMParameters.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/GCTR.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/GHASH.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/HmacCore.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/HmacMD5.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/HmacMD5KeyGenerator.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/HmacPKCS12PBESHA1.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/HmacSHA1.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/HmacSHA1KeyGenerator.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/ISO10126Padding.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/JceKeyStore.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/KeyGeneratorCore.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/KeyProtector.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/OAEPParameters.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/OutputFeedback.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/Padding.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/PBECipherCore.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/PBEKey.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/PBEKeyFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/PBEParameters.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/PBES1Core.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/PBES2Core.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/PBES2Parameters.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/PBEWithMD5AndDESCipher.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/PBEWithMD5AndTripleDESCipher.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/PBKDF2Core.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/PBKDF2HmacSHA1Factory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/PBMAC1Core.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/PCBC.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/PKCS12PBECipherCore.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/PKCS5Padding.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/PrivateKeyInfo.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/RC2Cipher.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/RC2Crypt.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/RC2Parameters.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/RSACipher.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/SealedObjectForKeyProtector.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/SslMacCore.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/SunJCE.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/SymmetricCipher.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java
-@OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPCompressionTypes.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPConstants.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriter.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPMetadata.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormat.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormatResources.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/common/BitFile.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/common/BogusColorSpace.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/common/I18N.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/common/I18NImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/common/ImageUtil.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/common/InputStreamAdapter.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/common/LZWCompressor.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/common/LZWStringTable.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/common/PaletteBuilder.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/common/ReaderUtil.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormat.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormatResources.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/common/SubImageInputStream.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadata.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormat.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormatResources.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriter.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFMetadata.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadata.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormat.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormatResources.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFWritableImageMetadata.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFWritableStreamMetadata.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEG.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormat.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormatResources.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/png/RowFilter.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReader.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriter.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadata.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadataFormat.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/spi/FileImageInputStreamSpi.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/spi/FileImageOutputStreamSpi.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/spi/InputStreamImageInputStreamSpi.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/spi/OutputStreamImageOutputStreamSpi.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/spi/RAFImageInputStreamSpi.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/spi/RAFImageOutputStreamSpi.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/stream/CloseableDisposerRecord.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/stream/StreamCloser.java
-@OPENJDK@/jdk/src/share/classes/com/sun/imageio/stream/StreamFinalizer.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jarsigner/ContentSigner.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jarsigner/ContentSignerParameters.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/browser/dom/DOMAccessException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/browser/dom/DOMAccessor.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/browser/dom/DOMAction.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/browser/dom/DOMService.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/browser/dom/DOMServiceProvider.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/browser/dom/DOMUnsupportedException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/browser/net/ProxyInfo.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/browser/net/ProxyService.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/browser/net/ProxyServiceProvider.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/Painter.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifBorders.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifButtonListener.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxMenuItemUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifComboBoxUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopIconUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifEditorPaneUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifGraphicsUtils.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifIconFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameTitlePane.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuBarUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuItemUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseListener.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseMotionListener.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifOptionPaneUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifPasswordFieldUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuSeparatorUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifProgressBarUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonMenuItemUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarButton.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifSeparatorUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifSliderUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneDivider.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifTabbedPaneUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifTextAreaUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifTextFieldUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifTextPaneUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifTextUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifTreeCellRenderer.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/MotifTreeUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/nimbus/AbstractRegionPainter.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/AnimationController.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/DesktopProperty.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/TMSchema.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsBorders.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonListener.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxMenuItemUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsClassicLookAndFeel.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopIconUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopManager.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopPaneUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsEditorPaneUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameTitlePane.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUIAccessor.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsOptionPaneUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPasswordFieldUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupWindow.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonMenuItemUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollPaneUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSeparatorUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSliderUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSpinnerUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneDivider.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTabbedPaneUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTextAreaUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTextFieldUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTextPaneUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTextUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsToggleButtonUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarSeparatorUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/XPStyle.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/swing/SwingUtilities3.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/AdaptiveCoding.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassWriter.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/Code.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingMethod.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/Constants.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/DriverResource.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/DriverResource_ja.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/DriverResource_zh_CN.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/Histogram.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/Instruction.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/AbsentInformationException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/Accessible.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/ArrayReference.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/ArrayType.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/BooleanType.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/BooleanValue.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/Bootstrap.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/ByteType.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/ByteValue.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/CharType.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/CharValue.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/ClassLoaderReference.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/ClassNotLoadedException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/ClassNotPreparedException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/ClassObjectReference.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/ClassType.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/connect/AttachingConnector.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/connect/Connector.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/connect/LaunchingConnector.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/connect/ListeningConnector.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/connect/spi/Connection.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/connect/spi/TransportService.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/connect/Transport.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/connect/TransportTimeoutException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/connect/VMStartException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/DoubleType.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/DoubleValue.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/event/AccessWatchpointEvent.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/event/BreakpointEvent.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/event/ClassPrepareEvent.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/event/ClassUnloadEvent.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/event/Event.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/event/EventIterator.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/event/EventQueue.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/event/EventSet.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/event/ExceptionEvent.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/event/LocatableEvent.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/event/MethodEntryEvent.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/event/MethodExitEvent.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/event/ModificationWatchpointEvent.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/event/MonitorContendedEnteredEvent.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/event/MonitorContendedEnterEvent.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/event/MonitorWaitedEvent.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/event/MonitorWaitEvent.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/event/StepEvent.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/event/ThreadDeathEvent.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/event/ThreadStartEvent.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/event/VMDeathEvent.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/event/VMDisconnectEvent.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/event/VMStartEvent.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/event/WatchpointEvent.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/Field.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/FloatType.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/FloatValue.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/IncompatibleThreadStateException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/InconsistentDebugInfoException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/IntegerType.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/IntegerValue.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/InterfaceType.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/InternalException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/InvalidCodeIndexException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/InvalidLineNumberException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/InvalidStackFrameException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/InvalidTypeException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/InvocationException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/JDIPermission.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/LocalVariable.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/Locatable.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/Location.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/LongType.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/LongValue.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/Method.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/Mirror.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/MonitorInfo.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/NativeMethodException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/ObjectCollectedException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/ObjectReference.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/PathSearchingVirtualMachine.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/PrimitiveType.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/PrimitiveValue.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/ReferenceType.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/request/AccessWatchpointRequest.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/request/BreakpointRequest.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/request/ClassPrepareRequest.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/request/ClassUnloadRequest.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/request/DuplicateRequestException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/request/EventRequest.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/request/EventRequestManager.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/request/ExceptionRequest.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/request/InvalidRequestStateException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/request/MethodEntryRequest.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/request/MethodExitRequest.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/request/ModificationWatchpointRequest.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/request/MonitorContendedEnteredRequest.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/request/MonitorContendedEnterRequest.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/request/MonitorWaitedRequest.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/request/MonitorWaitRequest.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/request/StepRequest.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/request/ThreadDeathRequest.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/request/ThreadStartRequest.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/request/VMDeathRequest.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/request/WatchpointRequest.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/ShortType.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/ShortValue.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/StackFrame.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/StringReference.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/ThreadGroupReference.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/ThreadReference.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/Type.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/TypeComponent.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/Value.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/VirtualMachine.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/VirtualMachineManager.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/VMCannotBeModifiedException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/VMDisconnectedException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/VMMismatchException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/VMOutOfMemoryException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/VoidType.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jdi/VoidValue.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/defaults/JmxProperties.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/defaults/ServiceName.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/interceptor/MBeanServerInterceptor.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/ConvertingMethod.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/DescriptorCache.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/DynamicMBean2.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/GetPropertyAction.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/Introspector.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServerBuilder.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanAnalyzer.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanIntrospector.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanServerDelegateImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanSupport.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/ModifiableClassLoaderRepository.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/MXBeanIntrospector.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/MXBeanLookup.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/MXBeanMapping.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/MXBeanMappingFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/MXBeanProxy.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/MXBeanSupport.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/NamedObject.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/ObjectInputStreamWithLoader.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/PerInterface.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/Repository.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/SecureClassLoaderRepository.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/StandardMBeanIntrospector.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/StandardMBeanSupport.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/SunJmxMBeanServer.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/Util.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/WeakIdentityHashMap.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayQueue.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/internal/ClientCommunicatorAdmin.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/internal/ClientListenerInfo.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/internal/IIOPHelper.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/internal/IIOPProxy.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/internal/NotificationBuffer.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/internal/NotificationBufferFilter.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/internal/ProxyRef.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/internal/RMIExporter.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/internal/ServerCommunicatorAdmin.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/internal/Unmarshal.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/protocol/iiop/ClientProvider.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/protocol/iiop/ProxyInputStream.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/protocol/iiop/ServerProvider.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/protocol/rmi/ClientProvider.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/protocol/rmi/ServerProvider.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/security/FileLoginModule.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/security/JMXPluggableAuthenticator.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/security/JMXSubjectDomainCombiner.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/security/MBeanServerAccessController.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/security/NotificationAccessController.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/util/CacheMap.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/util/ClassLoaderWithRepository.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/util/ClassLogger.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/util/EnvHelp.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/util/OrderClassLoaders.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/cosnaming/CNBindingEnumeration.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/cosnaming/CNCtx.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/cosnaming/CNCtxFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/cosnaming/CorbanameUrl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/cosnaming/ExceptionMapper.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/cosnaming/IiopUrl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/cosnaming/OrbReuseTracker.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/cosnaming/RemoteToCorba.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/dns/DnsClient.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/dns/DnsContext.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/dns/DnsContextFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/dns/DnsName.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/dns/DnsNameParser.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/dns/DnsUrl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/dns/Header.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/dns/NameNode.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/dns/Resolver.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/dns/ResourceRecord.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/dns/ResourceRecords.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/dns/ZoneNode.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/AbstractLdapNamingEnumeration.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/BasicControl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/Ber.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/BerDecoder.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/BerEncoder.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/BindingWithControls.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/ClientId.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/Connection.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/DefaultResponseControlFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/DigestClientId.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/EntryChangeResponseControl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/EventQueue.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/EventSupport.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/ext/StartTlsResponseImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/Filter.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/LdapAttribute.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/LdapClient.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/LdapClientFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtx.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/LdapEntry.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/LdapName.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/LdapNameParser.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/LdapNamingEnumeration.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/LdapPoolManager.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/LdapReferralContext.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/LdapReferralException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/LdapRequest.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/LdapResult.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/LdapSchemaCtx.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/LdapSearchEnumeration.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/LdapURL.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/ManageReferralControl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/NameClassPairWithControls.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/NotifierArgs.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/Obj.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/PersistentSearchControl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/pool/ConnectionDesc.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/pool/Connections.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/pool/ConnectionsRef.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/pool/ConnectionsWeakRef.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/pool/Pool.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/pool/PoolCallback.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/pool/PoolCleaner.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/pool/PooledConnection.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/pool/PooledConnectionFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/ReferralEnumeration.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/sasl/SaslInputStream.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/sasl/SaslOutputStream.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/SearchResultWithControls.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/ServiceLocator.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/SimpleClientId.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/UnsolicitedResponseImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/VersionHelper.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/VersionHelper12.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/rmi/registry/ReferenceWrapper.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/rmi/registry/RegistryContextFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/rmi/registry/RemoteReference.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/AtomicContext.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/AtomicDirContext.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/ComponentContext.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/ComponentDirContext.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/HeadTail.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeContext.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeDirContext.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/StringHeadTail.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/toolkit/dir/AttrFilter.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/toolkit/dir/ContainmentFilter.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/toolkit/dir/ContextEnumerator.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/toolkit/dir/DirSearch.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/toolkit/dir/LazySearchEnumerationImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/toolkit/url/GenericURLDirContext.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/toolkit/url/Uri.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/toolkit/url/UrlUtil.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/url/corbaname/corbanameURLContextFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/url/dns/dnsURLContext.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/url/dns/dnsURLContextFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/url/iiop/iiopURLContext.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/url/iiop/iiopURLContextFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/url/iiopname/iiopnameURLContextFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/url/ldap/ldapURLContext.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/url/ldap/ldapURLContextFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/url/ldaps/ldapsURLContextFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/url/rmi/rmiURLContext.java
-@OPENJDK@/jdk/src/share/classes/com/sun/jndi/url/rmi/rmiURLContextFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/management/DiagnosticCommandMBean.java
-@OPENJDK@/jdk/src/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java
-@OPENJDK@/jdk/src/share/classes/com/sun/management/GarbageCollectorMXBean.java
-@OPENJDK@/jdk/src/share/classes/com/sun/management/GcInfo.java
-@OPENJDK@/jdk/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java
-@OPENJDK@/jdk/src/share/classes/com/sun/management/OperatingSystemMXBean.java
-@OPENJDK@/jdk/src/share/classes/com/sun/management/package-info.java
-@OPENJDK@/jdk/src/share/classes/com/sun/management/ThreadMXBean.java
-@OPENJDK@/jdk/src/share/classes/com/sun/management/UnixOperatingSystemMXBean.java
-@OPENJDK@/jdk/src/share/classes/com/sun/management/VMOption.java
-@OPENJDK@/jdk/src/share/classes/com/sun/media/sound/MidiDeviceReceiverEnvelope.java
-@OPENJDK@/jdk/src/share/classes/com/sun/media/sound/MidiDeviceTransmitterEnvelope.java
-@OPENJDK@/jdk/src/share/classes/com/sun/naming/internal/FactoryEnumeration.java
-@OPENJDK@/jdk/src/share/classes/com/sun/naming/internal/NamedWeakReference.java
-@OPENJDK@/jdk/src/share/classes/com/sun/naming/internal/ResourceManager.java
-@OPENJDK@/jdk/src/share/classes/com/sun/naming/internal/VersionHelper.java
-@OPENJDK@/jdk/src/share/classes/com/sun/naming/internal/VersionHelper12.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/httpserver/Authenticator.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/httpserver/BasicAuthenticator.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/httpserver/Filter.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/httpserver/Headers.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/httpserver/HttpContext.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/httpserver/HttpExchange.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/httpserver/HttpHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/httpserver/HttpPrincipal.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/httpserver/HttpsConfigurator.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/httpserver/HttpServer.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/httpserver/HttpsExchange.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/httpserver/HttpsParameters.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/httpserver/HttpsServer.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/httpserver/package-info.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/httpserver/spi/package-info.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/ssl/HostnameVerifier.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/ssl/HttpsURLConnection.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/ssl/internal/ssl/Provider.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/DelegateHttpsURLConnection.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/Handler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/ssl/KeyManager.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/ssl/KeyManagerFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/ssl/KeyManagerFactorySpi.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/ssl/SSLContext.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/ssl/SSLContextSpi.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/ssl/SSLPermission.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/ssl/SSLSecurity.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/ssl/TrustManager.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/ssl/TrustManagerFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/ssl/TrustManagerFactorySpi.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/ssl/X509KeyManager.java
-@OPENJDK@/jdk/src/share/classes/com/sun/net/ssl/X509TrustManager.java
-@OPENJDK@/jdk/src/share/classes/com/sun/nio/file/ExtendedCopyOption.java
-@OPENJDK@/jdk/src/share/classes/com/sun/nio/file/ExtendedOpenOption.java
-@OPENJDK@/jdk/src/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java
-@OPENJDK@/jdk/src/share/classes/com/sun/nio/file/SensitivityWatchEventModifier.java
-@OPENJDK@/jdk/src/share/classes/com/sun/nio/sctp/AbstractNotificationHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/nio/sctp/Association.java
-@OPENJDK@/jdk/src/share/classes/com/sun/nio/sctp/AssociationChangeNotification.java
-@OPENJDK@/jdk/src/share/classes/com/sun/nio/sctp/HandlerResult.java
-@OPENJDK@/jdk/src/share/classes/com/sun/nio/sctp/IllegalReceiveException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/nio/sctp/IllegalUnbindException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/nio/sctp/InvalidStreamException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/nio/sctp/MessageInfo.java
-@OPENJDK@/jdk/src/share/classes/com/sun/nio/sctp/Notification.java
-@OPENJDK@/jdk/src/share/classes/com/sun/nio/sctp/NotificationHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/nio/sctp/package-info.java
-@OPENJDK@/jdk/src/share/classes/com/sun/nio/sctp/PeerAddressChangeNotification.java
-@OPENJDK@/jdk/src/share/classes/com/sun/nio/sctp/SctpChannel.java
-@OPENJDK@/jdk/src/share/classes/com/sun/nio/sctp/SctpMultiChannel.java
-@OPENJDK@/jdk/src/share/classes/com/sun/nio/sctp/SctpServerChannel.java
-@OPENJDK@/jdk/src/share/classes/com/sun/nio/sctp/SctpSocketOption.java
-@OPENJDK@/jdk/src/share/classes/com/sun/nio/sctp/SctpStandardSocketOptions.java
-@OPENJDK@/jdk/src/share/classes/com/sun/nio/sctp/SendFailedNotification.java
-@OPENJDK@/jdk/src/share/classes/com/sun/nio/sctp/ShutdownNotification.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/Algorithm.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/ClassLoaderUtils.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/IntegrityHmac.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureBaseRSA.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureDSA.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureECDSA.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/MessageDigestAlgorithm.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithmSpi.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizationException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizerSpi.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/AttrCompare.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/C14nHelper.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11_OmitComments.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11_WithComments.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclOmitComments.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315OmitComments.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315WithComments.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerPhysical.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/UtfHelpper.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/InvalidCanonicalizerException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AgreementMethod.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherData.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherReference.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherValue.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/DocumentSerializer.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedData.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedKey.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedType.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionMethod.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperties.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperty.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/Reference.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/ReferenceList.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/Serializer.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/Transforms.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherInput.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherParameters.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLEncryptionException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/AlgorithmAlreadyRegisteredException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/Base64DecodingException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/XMLSecurityException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/XMLSecurityRuntimeException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/DEREncodedKeyValue.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyInfoContent.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyInfoReference.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyName.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyValue.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/DSAKeyValue.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/KeyValueContent.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/RSAKeyValue.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/MgmtData.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/PGPData.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/RetrievalMethod.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/SPKIData.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509Certificate.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509CRL.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509DataContent.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509Digest.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509IssuerSerial.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SKI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SubjectName.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/X509Data.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/ContentHandlerAlreadyRegisteredException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/DEREncodedKeyValueResolver.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/DSAKeyValueResolver.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/EncryptedKeyResolver.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/PrivateKeyResolver.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RSAKeyValueResolver.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/SecretKeyResolver.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/SingleKeyResolver.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509CertificateResolver.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509DigestResolver.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SKIResolver.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SubjectNameResolver.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/InvalidKeyResolverException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverSpi.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyUtils.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/KeyStoreResolver.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/SingleCertificateResolver.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolver.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverSpi.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidDigestValueException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidSignatureValueException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/MissingResourceFailureException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/NodeFilter.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/ObjectContainer.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Reference.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceData.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceNodeSetData.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceOctetStreamData.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/ReferenceSubTreeData.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/ReferenceNotInitializedException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperties.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperty.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignedInfo.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignature.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInputDebugger.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderUtils.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/FuncHere.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformBase64Decode.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N11.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N11_WithComments.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusive.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusiveWithComments.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NWithComments.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformEnvelopedSignature.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath2Filter.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPointer.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/InvalidTransformException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer04.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathContainer.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathFilterCHGPContainer.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformationException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformParam.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transforms.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformSpi.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/Base64.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ClassLoaderUtils.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/Constants.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/DigesterOutputStream.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/DOMNamespaceContext.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementChecker.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementCheckerImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionConstants.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionElementProxy.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/HelperNodeList.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IgnoreAllErrorHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/JavaUtils.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/JDKXPathAPI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/JDKXPathFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverAnonymous.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverDirectHTTP.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverFragment.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverLocalFilesystem.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverXPointer.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverContext.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverSpi.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/Signature11ElementProxy.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/SignatureElementProxy.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/SignerOutputStream.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncBufferedOutputStream.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XalanXPathAPI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XalanXPathFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XPathAPI.java
-@OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XPathFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/pept/Delegate.java
-@OPENJDK@/jdk/src/share/classes/com/sun/pept/encoding/Decoder.java
-@OPENJDK@/jdk/src/share/classes/com/sun/pept/encoding/Encoder.java
-@OPENJDK@/jdk/src/share/classes/com/sun/pept/ept/Acceptor.java
-@OPENJDK@/jdk/src/share/classes/com/sun/pept/ept/ContactInfo.java
-@OPENJDK@/jdk/src/share/classes/com/sun/pept/ept/ContactInfoList.java
-@OPENJDK@/jdk/src/share/classes/com/sun/pept/ept/ContactInfoListIterator.java
-@OPENJDK@/jdk/src/share/classes/com/sun/pept/ept/EPTFactory.java
-@OPENJDK@/jdk/src/share/classes/com/sun/pept/ept/MessageInfo.java
-@OPENJDK@/jdk/src/share/classes/com/sun/pept/presentation/MessageStruct.java
-@OPENJDK@/jdk/src/share/classes/com/sun/pept/presentation/Stub.java
-@OPENJDK@/jdk/src/share/classes/com/sun/pept/presentation/TargetFinder.java
-@OPENJDK@/jdk/src/share/classes/com/sun/pept/presentation/Tie.java
-@OPENJDK@/jdk/src/share/classes/com/sun/pept/protocol/Interceptors.java
-@OPENJDK@/jdk/src/share/classes/com/sun/pept/protocol/MessageDispatcher.java
-@OPENJDK@/jdk/src/share/classes/com/sun/pept/transport/Connection.java
-@OPENJDK@/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java
-@OPENJDK@/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java
-@OPENJDK@/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/rowset/FilteredRowSetImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/rowset/internal/BaseRow.java
-@OPENJDK@/jdk/src/share/classes/com/sun/rowset/internal/CachedRowSetReader.java
-@OPENJDK@/jdk/src/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java
-@OPENJDK@/jdk/src/share/classes/com/sun/rowset/internal/InsertRow.java
-@OPENJDK@/jdk/src/share/classes/com/sun/rowset/internal/Row.java
-@OPENJDK@/jdk/src/share/classes/com/sun/rowset/internal/SyncResolverImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/rowset/internal/WebRowSetXmlReader.java
-@OPENJDK@/jdk/src/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java
-@OPENJDK@/jdk/src/share/classes/com/sun/rowset/internal/XmlErrorHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/rowset/internal/XmlResolver.java
-@OPENJDK@/jdk/src/share/classes/com/sun/rowset/JdbcRowSetImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/rowset/JdbcRowSetResourceBundle.java
-@OPENJDK@/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/rowset/providers/RIOptimisticProvider.java
-@OPENJDK@/jdk/src/share/classes/com/sun/rowset/providers/RIXMLProvider.java
-@OPENJDK@/jdk/src/share/classes/com/sun/rowset/RowSetFactoryImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/rowset/WebRowSetImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/callback/package-info.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/LdapPrincipal.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/login/package-info.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/module/Crypt.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/module/LdapLoginModule.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/module/NTLoginModule.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/module/NTSystem.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/module/package-info.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/NTDomainPrincipal.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/NTNumericCredential.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/NTSid.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/NTSidDomainPrincipal.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/NTSidGroupPrincipal.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/NTSidPrimaryGroupPrincipal.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/NTSidUserPrincipal.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/NTUserPrincipal.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/package-info.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/PrincipalComparator.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/SolarisPrincipal.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/UnixNumericGroupPrincipal.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/UnixPrincipal.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/UserPrincipal.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/auth/X500Principal.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/jgss/AuthorizationDataEntry.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/jgss/ExtendedGSSContext.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/jgss/ExtendedGSSCredential.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/jgss/GSSUtil.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/jgss/InquireSecContextPermission.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/jgss/InquireType.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/jgss/package-info.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/ntlm/Client.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/ntlm/NTLMException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/ntlm/Server.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/ntlm/Version.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/sasl/ClientFactoryImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/sasl/CramMD5Base.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/sasl/CramMD5Client.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/sasl/CramMD5Server.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/sasl/digest/DigestMD5Client.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/sasl/digest/DigestMD5Server.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/sasl/digest/FactoryImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/sasl/digest/SecurityCtx.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/sasl/ExternalClient.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/sasl/gsskerb/FactoryImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Base.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/sasl/ntlm/FactoryImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/sasl/ntlm/NTLMClient.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/sasl/ntlm/NTLMServer.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/sasl/PlainClient.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/sasl/Provider.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/sasl/ServerFactoryImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/security/sasl/util/PolicyUtils.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/attach/AgentInitializationException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/attach/AgentLoadException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/attach/AttachNotSupportedException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/attach/AttachPermission.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/attach/spi/AttachProvider.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/attach/VirtualMachine.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/attach/VirtualMachineDescriptor.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/AbstractLauncher.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/ArrayReferenceImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/ArrayTypeImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/BaseLineInfo.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/BooleanTypeImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/BooleanValueImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/ByteTypeImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/ByteValueImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/CharTypeImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/CharValueImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/ClassLoaderReferenceImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/ClassObjectReferenceImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/ClassTypeImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/CommandSender.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/ConcreteMethodImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/ConnectorImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/DoubleTypeImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/DoubleValueImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/EventQueueImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/EventRequestManagerImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/EventSetImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/FieldImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/FloatTypeImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/FloatValueImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/GenericAttachingConnector.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/GenericListeningConnector.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/IntegerTypeImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/IntegerValueImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/InterfaceTypeImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/InternalEventHandler.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/JDWPException.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/JNITypeParser.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/LineInfo.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/LocalVariableImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/LocationImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/LockObject.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/LongTypeImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/LongValueImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/MethodImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/MirrorImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/MonitorInfoImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/NonConcreteMethodImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/ObjectReferenceImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/ObsoleteMethodImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/Packet.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/PacketStream.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/PrimitiveTypeImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/PrimitiveValueImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/ProcessAttachingConnector.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/RawCommandLineLauncher.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/ReferenceTypeImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/SDE.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/ShortTypeImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/ShortValueImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/SocketAttachingConnector.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/SocketListeningConnector.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/SocketTransportService.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/StackFrameImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/StratumLineInfo.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/StringReferenceImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/TargetVM.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/ThreadAction.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/ThreadGroupReferenceImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/ThreadListener.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/TypeComponentImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/TypeImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/ValueContainer.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/ValueImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/VirtualMachineManagerImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/VirtualMachineManagerService.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/VMAction.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/VMListener.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/VMModifiers.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/VMState.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/VoidTypeImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/jdi/VoidValueImpl.java
-@OPENJDK@/jdk/src/share/classes/com/sun/tools/script/shell/Main.java
-@OPENJDK@/jdk/src/share/classes/java/applet/Applet.java
-@OPENJDK@/jdk/src/share/classes/java/applet/AppletContext.java
-@OPENJDK@/jdk/src/share/classes/java/applet/AppletStub.java
-@OPENJDK@/jdk/src/share/classes/java/applet/AudioClip.java
-@OPENJDK@/jdk/src/share/classes/java/awt/ActiveEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Adjustable.java
-@OPENJDK@/jdk/src/share/classes/java/awt/AlphaComposite.java
-@OPENJDK@/jdk/src/share/classes/java/awt/AttributeValue.java
-@OPENJDK@/jdk/src/share/classes/java/awt/AWTError.java
-@OPENJDK@/jdk/src/share/classes/java/awt/AWTEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/AWTEventMulticaster.java
-@OPENJDK@/jdk/src/share/classes/java/awt/AWTException.java
-@OPENJDK@/jdk/src/share/classes/java/awt/AWTKeyStroke.java
-@OPENJDK@/jdk/src/share/classes/java/awt/AWTPermission.java
-@OPENJDK@/jdk/src/share/classes/java/awt/BasicStroke.java
-@OPENJDK@/jdk/src/share/classes/java/awt/BorderLayout.java
-@OPENJDK@/jdk/src/share/classes/java/awt/BufferCapabilities.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Button.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Canvas.java
-@OPENJDK@/jdk/src/share/classes/java/awt/CardLayout.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Checkbox.java
-@OPENJDK@/jdk/src/share/classes/java/awt/CheckboxGroup.java
-@OPENJDK@/jdk/src/share/classes/java/awt/CheckboxMenuItem.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Choice.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Color.java
-@OPENJDK@/jdk/src/share/classes/java/awt/color/CMMException.java
-@OPENJDK@/jdk/src/share/classes/java/awt/color/ColorSpace.java
-@OPENJDK@/jdk/src/share/classes/java/awt/color/ICC_Profile.java
-@OPENJDK@/jdk/src/share/classes/java/awt/color/ICC_ProfileGray.java
-@OPENJDK@/jdk/src/share/classes/java/awt/color/ICC_ProfileRGB.java
-@OPENJDK@/jdk/src/share/classes/java/awt/color/ProfileDataException.java
-@OPENJDK@/jdk/src/share/classes/java/awt/ColorPaintContext.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Component.java
-@OPENJDK@/jdk/src/share/classes/java/awt/ComponentOrientation.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Composite.java
-@OPENJDK@/jdk/src/share/classes/java/awt/CompositeContext.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Conditional.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Container.java
-@OPENJDK@/jdk/src/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Cursor.java
-@OPENJDK@/jdk/src/share/classes/java/awt/datatransfer/Clipboard.java
-@OPENJDK@/jdk/src/share/classes/java/awt/datatransfer/ClipboardOwner.java
-@OPENJDK@/jdk/src/share/classes/java/awt/datatransfer/DataFlavor.java
-@OPENJDK@/jdk/src/share/classes/java/awt/datatransfer/FlavorEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/datatransfer/FlavorListener.java
-@OPENJDK@/jdk/src/share/classes/java/awt/datatransfer/FlavorMap.java
-@OPENJDK@/jdk/src/share/classes/java/awt/datatransfer/FlavorTable.java
-@OPENJDK@/jdk/src/share/classes/java/awt/datatransfer/MimeType.java
-@OPENJDK@/jdk/src/share/classes/java/awt/datatransfer/MimeTypeParameterList.java
-@OPENJDK@/jdk/src/share/classes/java/awt/datatransfer/MimeTypeParseException.java
-@OPENJDK@/jdk/src/share/classes/java/awt/datatransfer/StringSelection.java
-@OPENJDK@/jdk/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java
-@OPENJDK@/jdk/src/share/classes/java/awt/datatransfer/Transferable.java
-@OPENJDK@/jdk/src/share/classes/java/awt/datatransfer/UnsupportedFlavorException.java
-@OPENJDK@/jdk/src/share/classes/java/awt/DefaultFocusTraversalPolicy.java
-@OPENJDK@/jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Desktop.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Dialog.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Dimension.java
-@OPENJDK@/jdk/src/share/classes/java/awt/DisplayMode.java
-@OPENJDK@/jdk/src/share/classes/java/awt/dnd/Autoscroll.java
-@OPENJDK@/jdk/src/share/classes/java/awt/dnd/DnDConstants.java
-@OPENJDK@/jdk/src/share/classes/java/awt/dnd/DnDEventMulticaster.java
-@OPENJDK@/jdk/src/share/classes/java/awt/dnd/DragGestureEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/dnd/DragGestureListener.java
-@OPENJDK@/jdk/src/share/classes/java/awt/dnd/DragGestureRecognizer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/dnd/DragSource.java
-@OPENJDK@/jdk/src/share/classes/java/awt/dnd/DragSourceAdapter.java
-@OPENJDK@/jdk/src/share/classes/java/awt/dnd/DragSourceContext.java
-@OPENJDK@/jdk/src/share/classes/java/awt/dnd/DragSourceDragEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/dnd/DragSourceDropEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/dnd/DragSourceEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/dnd/DragSourceListener.java
-@OPENJDK@/jdk/src/share/classes/java/awt/dnd/DragSourceMotionListener.java
-@OPENJDK@/jdk/src/share/classes/java/awt/dnd/DropTarget.java
-@OPENJDK@/jdk/src/share/classes/java/awt/dnd/DropTargetAdapter.java
-@OPENJDK@/jdk/src/share/classes/java/awt/dnd/DropTargetContext.java
-@OPENJDK@/jdk/src/share/classes/java/awt/dnd/DropTargetDragEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/dnd/DropTargetDropEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/dnd/DropTargetEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/dnd/DropTargetListener.java
-@OPENJDK@/jdk/src/share/classes/java/awt/dnd/InvalidDnDOperationException.java
-@OPENJDK@/jdk/src/share/classes/java/awt/dnd/MouseDragGestureRecognizer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/dnd/peer/DragSourceContextPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/dnd/peer/DropTargetContextPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/dnd/peer/DropTargetPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/dnd/SerializationTester.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Event.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/ActionEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/ActionListener.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/AdjustmentEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/AdjustmentListener.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/AWTEventListener.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/AWTEventListenerProxy.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/ComponentAdapter.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/ComponentEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/ComponentListener.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/ContainerAdapter.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/ContainerEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/ContainerListener.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/FocusAdapter.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/FocusEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/FocusListener.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/HierarchyBoundsAdapter.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/HierarchyBoundsListener.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/HierarchyEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/HierarchyListener.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/InputEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/InputMethodEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/InputMethodListener.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/InvocationEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/ItemEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/ItemListener.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/KeyAdapter.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/KeyEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/KeyListener.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/MouseAdapter.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/MouseEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/MouseListener.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/MouseMotionAdapter.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/MouseMotionListener.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/MouseWheelEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/MouseWheelListener.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/NativeLibLoader.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/PaintEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/TextEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/TextListener.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/WindowAdapter.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/WindowEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/WindowFocusListener.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/WindowListener.java
-@OPENJDK@/jdk/src/share/classes/java/awt/event/WindowStateListener.java
-@OPENJDK@/jdk/src/share/classes/java/awt/EventDispatchThread.java
-@OPENJDK@/jdk/src/share/classes/java/awt/EventFilter.java
-@OPENJDK@/jdk/src/share/classes/java/awt/EventQueue.java
-@OPENJDK@/jdk/src/share/classes/java/awt/FileDialog.java
-@OPENJDK@/jdk/src/share/classes/java/awt/FlowLayout.java
-@OPENJDK@/jdk/src/share/classes/java/awt/FocusTraversalPolicy.java
-@OPENJDK@/jdk/src/share/classes/java/awt/font/CharArrayIterator.java
-@OPENJDK@/jdk/src/share/classes/java/awt/font/FontRenderContext.java
-@OPENJDK@/jdk/src/share/classes/java/awt/font/GlyphJustificationInfo.java
-@OPENJDK@/jdk/src/share/classes/java/awt/font/GlyphMetrics.java
-@OPENJDK@/jdk/src/share/classes/java/awt/font/GlyphVector.java
-@OPENJDK@/jdk/src/share/classes/java/awt/font/GraphicAttribute.java
-@OPENJDK@/jdk/src/share/classes/java/awt/font/ImageGraphicAttribute.java
-@OPENJDK@/jdk/src/share/classes/java/awt/font/LayoutPath.java
-@OPENJDK@/jdk/src/share/classes/java/awt/font/LineBreakMeasurer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/font/LineMetrics.java
-@OPENJDK@/jdk/src/share/classes/java/awt/font/MultipleMaster.java
-@OPENJDK@/jdk/src/share/classes/java/awt/font/NumericShaper.java
-@OPENJDK@/jdk/src/share/classes/java/awt/font/OpenType.java
-@OPENJDK@/jdk/src/share/classes/java/awt/font/ShapeGraphicAttribute.java
-@OPENJDK@/jdk/src/share/classes/java/awt/font/StyledParagraph.java
-@OPENJDK@/jdk/src/share/classes/java/awt/font/TextAttribute.java
-@OPENJDK@/jdk/src/share/classes/java/awt/font/TextHitInfo.java
-@OPENJDK@/jdk/src/share/classes/java/awt/font/TextJustifier.java
-@OPENJDK@/jdk/src/share/classes/java/awt/font/TextLayout.java
-@OPENJDK@/jdk/src/share/classes/java/awt/font/TextLine.java
-@OPENJDK@/jdk/src/share/classes/java/awt/font/TextMeasurer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/font/TransformAttribute.java
-@OPENJDK@/jdk/src/share/classes/java/awt/FontFormatException.java
-@OPENJDK@/jdk/src/share/classes/java/awt/FontMetrics.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Frame.java
-@OPENJDK@/jdk/src/share/classes/java/awt/geom/AffineTransform.java
-@OPENJDK@/jdk/src/share/classes/java/awt/geom/Arc2D.java
-@OPENJDK@/jdk/src/share/classes/java/awt/geom/ArcIterator.java
-@OPENJDK@/jdk/src/share/classes/java/awt/geom/Area.java
-@OPENJDK@/jdk/src/share/classes/java/awt/geom/CubicCurve2D.java
-@OPENJDK@/jdk/src/share/classes/java/awt/geom/CubicIterator.java
-@OPENJDK@/jdk/src/share/classes/java/awt/geom/Dimension2D.java
-@OPENJDK@/jdk/src/share/classes/java/awt/geom/Ellipse2D.java
-@OPENJDK@/jdk/src/share/classes/java/awt/geom/EllipseIterator.java
-@OPENJDK@/jdk/src/share/classes/java/awt/geom/FlatteningPathIterator.java
-@OPENJDK@/jdk/src/share/classes/java/awt/geom/GeneralPath.java
-@OPENJDK@/jdk/src/share/classes/java/awt/geom/IllegalPathStateException.java
-@OPENJDK@/jdk/src/share/classes/java/awt/geom/Line2D.java
-@OPENJDK@/jdk/src/share/classes/java/awt/geom/LineIterator.java
-@OPENJDK@/jdk/src/share/classes/java/awt/geom/NoninvertibleTransformException.java
-@OPENJDK@/jdk/src/share/classes/java/awt/geom/Path2D.java
-@OPENJDK@/jdk/src/share/classes/java/awt/geom/PathIterator.java
-@OPENJDK@/jdk/src/share/classes/java/awt/geom/Point2D.java
-@OPENJDK@/jdk/src/share/classes/java/awt/geom/QuadCurve2D.java
-@OPENJDK@/jdk/src/share/classes/java/awt/geom/QuadIterator.java
-@OPENJDK@/jdk/src/share/classes/java/awt/geom/Rectangle2D.java
-@OPENJDK@/jdk/src/share/classes/java/awt/geom/RectangularShape.java
-@OPENJDK@/jdk/src/share/classes/java/awt/geom/RectIterator.java
-@OPENJDK@/jdk/src/share/classes/java/awt/geom/RoundRectangle2D.java
-@OPENJDK@/jdk/src/share/classes/java/awt/geom/RoundRectIterator.java
-@OPENJDK@/jdk/src/share/classes/java/awt/GradientPaint.java
-@OPENJDK@/jdk/src/share/classes/java/awt/GradientPaintContext.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Graphics.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Graphics2D.java
-@OPENJDK@/jdk/src/share/classes/java/awt/GraphicsCallback.java
-@OPENJDK@/jdk/src/share/classes/java/awt/GraphicsConfigTemplate.java
-@OPENJDK@/jdk/src/share/classes/java/awt/GraphicsDevice.java
-@OPENJDK@/jdk/src/share/classes/java/awt/GraphicsEnvironment.java
-@OPENJDK@/jdk/src/share/classes/java/awt/GridBagConstraints.java
-@OPENJDK@/jdk/src/share/classes/java/awt/GridBagLayout.java
-@OPENJDK@/jdk/src/share/classes/java/awt/GridBagLayoutInfo.java
-@OPENJDK@/jdk/src/share/classes/java/awt/GridLayout.java
-@OPENJDK@/jdk/src/share/classes/java/awt/HeadlessException.java
-@OPENJDK@/jdk/src/share/classes/java/awt/IllegalComponentStateException.java
-@OPENJDK@/jdk/src/share/classes/java/awt/im/InputContext.java
-@OPENJDK@/jdk/src/share/classes/java/awt/im/InputMethodHighlight.java
-@OPENJDK@/jdk/src/share/classes/java/awt/im/InputMethodRequests.java
-@OPENJDK@/jdk/src/share/classes/java/awt/im/InputSubset.java
-@OPENJDK@/jdk/src/share/classes/java/awt/im/spi/InputMethod.java
-@OPENJDK@/jdk/src/share/classes/java/awt/im/spi/InputMethodContext.java
-@OPENJDK@/jdk/src/share/classes/java/awt/im/spi/InputMethodDescriptor.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/AreaAveragingScaleFilter.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/BandedSampleModel.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/BufferedImageFilter.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/BufferedImageOp.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/BufferStrategy.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/ByteLookupTable.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/ColorModel.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/ComponentColorModel.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/ComponentSampleModel.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/CropImageFilter.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/DirectColorModel.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/FilteredImageSource.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/ImageConsumer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/ImageFilter.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/ImageObserver.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/ImageProducer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/ImagingOpException.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/Kernel.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/LookupTable.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/MemoryImageSource.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/MultiPixelPackedSampleModel.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/PackedColorModel.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/PixelGrabber.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/PixelInterleavedSampleModel.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/Raster.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/RasterFormatException.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/RasterOp.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/renderable/ContextualRenderedImageFactory.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/renderable/ParameterBlock.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/renderable/RenderableImage.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/renderable/RenderableImageOp.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/renderable/RenderableImageProducer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/renderable/RenderContext.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/renderable/RenderedImageFactory.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/RenderedImage.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/ReplicateScaleFilter.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/RGBImageFilter.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/SampleModel.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/ShortLookupTable.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/SinglePixelPackedSampleModel.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/TileObserver.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/VolatileImage.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/WritableRaster.java
-@OPENJDK@/jdk/src/share/classes/java/awt/image/WritableRenderedImage.java
-@OPENJDK@/jdk/src/share/classes/java/awt/ImageCapabilities.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Insets.java
-@OPENJDK@/jdk/src/share/classes/java/awt/ItemSelectable.java
-@OPENJDK@/jdk/src/share/classes/java/awt/JobAttributes.java
-@OPENJDK@/jdk/src/share/classes/java/awt/KeyboardFocusManager.java
-@OPENJDK@/jdk/src/share/classes/java/awt/KeyEventDispatcher.java
-@OPENJDK@/jdk/src/share/classes/java/awt/KeyEventPostProcessor.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Label.java
-@OPENJDK@/jdk/src/share/classes/java/awt/LayoutManager.java
-@OPENJDK@/jdk/src/share/classes/java/awt/LayoutManager2.java
-@OPENJDK@/jdk/src/share/classes/java/awt/LinearGradientPaint.java
-@OPENJDK@/jdk/src/share/classes/java/awt/LinearGradientPaintContext.java
-@OPENJDK@/jdk/src/share/classes/java/awt/List.java
-@OPENJDK@/jdk/src/share/classes/java/awt/MediaTracker.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Menu.java
-@OPENJDK@/jdk/src/share/classes/java/awt/MenuBar.java
-@OPENJDK@/jdk/src/share/classes/java/awt/MenuComponent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/MenuContainer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/MenuItem.java
-@OPENJDK@/jdk/src/share/classes/java/awt/MenuShortcut.java
-@OPENJDK@/jdk/src/share/classes/java/awt/ModalEventFilter.java
-@OPENJDK@/jdk/src/share/classes/java/awt/MouseInfo.java
-@OPENJDK@/jdk/src/share/classes/java/awt/MultipleGradientPaint.java
-@OPENJDK@/jdk/src/share/classes/java/awt/MultipleGradientPaintContext.java
-@OPENJDK@/jdk/src/share/classes/java/awt/PageAttributes.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Paint.java
-@OPENJDK@/jdk/src/share/classes/java/awt/PaintContext.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Panel.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/ButtonPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/CanvasPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/CheckboxMenuItemPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/CheckboxPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/ChoicePeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/ComponentPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/ContainerPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/DesktopPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/DialogPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/FileDialogPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/FontPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/FramePeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/KeyboardFocusManagerPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/LabelPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/LightweightPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/ListPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/MenuBarPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/MenuComponentPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/MenuItemPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/MenuPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/MouseInfoPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/PanelPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/PopupMenuPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/RobotPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/ScrollbarPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/ScrollPanePeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/SystemTrayPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/TextAreaPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/TextComponentPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/TextFieldPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/TrayIconPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/peer/WindowPeer.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Point.java
-@OPENJDK@/jdk/src/share/classes/java/awt/PointerInfo.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Polygon.java
-@OPENJDK@/jdk/src/share/classes/java/awt/PopupMenu.java
-@OPENJDK@/jdk/src/share/classes/java/awt/print/Book.java
-@OPENJDK@/jdk/src/share/classes/java/awt/print/Pageable.java
-@OPENJDK@/jdk/src/share/classes/java/awt/print/PageFormat.java
-@OPENJDK@/jdk/src/share/classes/java/awt/print/Paper.java
-@OPENJDK@/jdk/src/share/classes/java/awt/print/Printable.java
-@OPENJDK@/jdk/src/share/classes/java/awt/print/PrinterAbortException.java
-@OPENJDK@/jdk/src/share/classes/java/awt/print/PrinterException.java
-@OPENJDK@/jdk/src/share/classes/java/awt/print/PrinterGraphics.java
-@OPENJDK@/jdk/src/share/classes/java/awt/print/PrinterIOException.java
-@OPENJDK@/jdk/src/share/classes/java/awt/print/PrinterJob.java
-@OPENJDK@/jdk/src/share/classes/java/awt/PrintGraphics.java
-@OPENJDK@/jdk/src/share/classes/java/awt/PrintJob.java
-@OPENJDK@/jdk/src/share/classes/java/awt/RadialGradientPaint.java
-@OPENJDK@/jdk/src/share/classes/java/awt/RadialGradientPaintContext.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Rectangle.java
-@OPENJDK@/jdk/src/share/classes/java/awt/RenderingHints.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Robot.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Scrollbar.java
-@OPENJDK@/jdk/src/share/classes/java/awt/ScrollPane.java
-@OPENJDK@/jdk/src/share/classes/java/awt/ScrollPaneAdjustable.java
-@OPENJDK@/jdk/src/share/classes/java/awt/SecondaryLoop.java
-@OPENJDK@/jdk/src/share/classes/java/awt/SentEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/SequencedEvent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Shape.java
-@OPENJDK@/jdk/src/share/classes/java/awt/SplashScreen.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Stroke.java
-@OPENJDK@/jdk/src/share/classes/java/awt/SystemColor.java
-@OPENJDK@/jdk/src/share/classes/java/awt/SystemTray.java
-@OPENJDK@/jdk/src/share/classes/java/awt/TextArea.java
-@OPENJDK@/jdk/src/share/classes/java/awt/TextComponent.java
-@OPENJDK@/jdk/src/share/classes/java/awt/TextField.java
-@OPENJDK@/jdk/src/share/classes/java/awt/TexturePaint.java
-@OPENJDK@/jdk/src/share/classes/java/awt/TexturePaintContext.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Toolkit.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Transparency.java
-@OPENJDK@/jdk/src/share/classes/java/awt/TrayIcon.java
-@OPENJDK@/jdk/src/share/classes/java/awt/WaitDispatchSupport.java
-@OPENJDK@/jdk/src/share/classes/java/awt/Window.java
-@OPENJDK@/jdk/src/share/classes/java/beans/AppletInitializer.java
-@OPENJDK@/jdk/src/share/classes/java/beans/beancontext/BeanContext.java
-@OPENJDK@/jdk/src/share/classes/java/beans/beancontext/BeanContextChild.java
-@OPENJDK@/jdk/src/share/classes/java/beans/beancontext/BeanContextChildComponentProxy.java
-@OPENJDK@/jdk/src/share/classes/java/beans/beancontext/BeanContextChildSupport.java
-@OPENJDK@/jdk/src/share/classes/java/beans/beancontext/BeanContextContainerProxy.java
-@OPENJDK@/jdk/src/share/classes/java/beans/beancontext/BeanContextEvent.java
-@OPENJDK@/jdk/src/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java
-@OPENJDK@/jdk/src/share/classes/java/beans/beancontext/BeanContextMembershipListener.java
-@OPENJDK@/jdk/src/share/classes/java/beans/beancontext/BeanContextProxy.java
-@OPENJDK@/jdk/src/share/classes/java/beans/beancontext/BeanContextServiceAvailableEvent.java
-@OPENJDK@/jdk/src/share/classes/java/beans/beancontext/BeanContextServiceProvider.java
-@OPENJDK@/jdk/src/share/classes/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java
-@OPENJDK@/jdk/src/share/classes/java/beans/beancontext/BeanContextServiceRevokedEvent.java
-@OPENJDK@/jdk/src/share/classes/java/beans/beancontext/BeanContextServiceRevokedListener.java
-@OPENJDK@/jdk/src/share/classes/java/beans/beancontext/BeanContextServices.java
-@OPENJDK@/jdk/src/share/classes/java/beans/beancontext/BeanContextServicesListener.java
-@OPENJDK@/jdk/src/share/classes/java/beans/beancontext/BeanContextServicesSupport.java
-@OPENJDK@/jdk/src/share/classes/java/beans/beancontext/BeanContextSupport.java
-@OPENJDK@/jdk/src/share/classes/java/beans/BeanDescriptor.java
-@OPENJDK@/jdk/src/share/classes/java/beans/BeanInfo.java
-@OPENJDK@/jdk/src/share/classes/java/beans/Beans.java
-@OPENJDK@/jdk/src/share/classes/java/beans/ChangeListenerMap.java
-@OPENJDK@/jdk/src/share/classes/java/beans/ConstructorProperties.java
-@OPENJDK@/jdk/src/share/classes/java/beans/Customizer.java
-@OPENJDK@/jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java
-@OPENJDK@/jdk/src/share/classes/java/beans/DesignMode.java
-@OPENJDK@/jdk/src/share/classes/java/beans/Encoder.java
-@OPENJDK@/jdk/src/share/classes/java/beans/EventHandler.java
-@OPENJDK@/jdk/src/share/classes/java/beans/EventSetDescriptor.java
-@OPENJDK@/jdk/src/share/classes/java/beans/ExceptionListener.java
-@OPENJDK@/jdk/src/share/classes/java/beans/Expression.java
-@OPENJDK@/jdk/src/share/classes/java/beans/FeatureDescriptor.java
-@OPENJDK@/jdk/src/share/classes/java/beans/IndexedPropertyChangeEvent.java
-@OPENJDK@/jdk/src/share/classes/java/beans/IndexedPropertyDescriptor.java
-@OPENJDK@/jdk/src/share/classes/java/beans/IntrospectionException.java
-@OPENJDK@/jdk/src/share/classes/java/beans/Introspector.java
-@OPENJDK@/jdk/src/share/classes/java/beans/MetaData.java
-@OPENJDK@/jdk/src/share/classes/java/beans/MethodDescriptor.java
-@OPENJDK@/jdk/src/share/classes/java/beans/MethodRef.java
-@OPENJDK@/jdk/src/share/classes/java/beans/NameGenerator.java
-@OPENJDK@/jdk/src/share/classes/java/beans/ParameterDescriptor.java
-@OPENJDK@/jdk/src/share/classes/java/beans/PersistenceDelegate.java
-@OPENJDK@/jdk/src/share/classes/java/beans/PropertyChangeEvent.java
-@OPENJDK@/jdk/src/share/classes/java/beans/PropertyChangeListener.java
-@OPENJDK@/jdk/src/share/classes/java/beans/PropertyChangeListenerProxy.java
-@OPENJDK@/jdk/src/share/classes/java/beans/PropertyChangeSupport.java
-@OPENJDK@/jdk/src/share/classes/java/beans/PropertyDescriptor.java
-@OPENJDK@/jdk/src/share/classes/java/beans/PropertyEditor.java
-@OPENJDK@/jdk/src/share/classes/java/beans/PropertyEditorManager.java
-@OPENJDK@/jdk/src/share/classes/java/beans/PropertyEditorSupport.java
-@OPENJDK@/jdk/src/share/classes/java/beans/PropertyVetoException.java
-@OPENJDK@/jdk/src/share/classes/java/beans/SimpleBeanInfo.java
-@OPENJDK@/jdk/src/share/classes/java/beans/Statement.java
-@OPENJDK@/jdk/src/share/classes/java/beans/ThreadGroupContext.java
-@OPENJDK@/jdk/src/share/classes/java/beans/Transient.java
-@OPENJDK@/jdk/src/share/classes/java/beans/VetoableChangeListener.java
-@OPENJDK@/jdk/src/share/classes/java/beans/VetoableChangeListenerProxy.java
-@OPENJDK@/jdk/src/share/classes/java/beans/VetoableChangeSupport.java
-@OPENJDK@/jdk/src/share/classes/java/beans/Visibility.java
-@OPENJDK@/jdk/src/share/classes/java/beans/WeakIdentityMap.java
-@OPENJDK@/jdk/src/share/classes/java/beans/XMLDecoder.java
-@OPENJDK@/jdk/src/share/classes/java/beans/XMLEncoder.java
-@OPENJDK@/jdk/src/share/classes/java/io/Bits.java
-@OPENJDK@/jdk/src/share/classes/java/io/BufferedInputStream.java
-@OPENJDK@/jdk/src/share/classes/java/io/BufferedOutputStream.java
-@OPENJDK@/jdk/src/share/classes/java/io/BufferedReader.java
-@OPENJDK@/jdk/src/share/classes/java/io/BufferedWriter.java
-@OPENJDK@/jdk/src/share/classes/java/io/ByteArrayInputStream.java
-@OPENJDK@/jdk/src/share/classes/java/io/ByteArrayOutputStream.java
-@OPENJDK@/jdk/src/share/classes/java/io/CharArrayReader.java
-@OPENJDK@/jdk/src/share/classes/java/io/CharArrayWriter.java
-@OPENJDK@/jdk/src/share/classes/java/io/CharConversionException.java
-@OPENJDK@/jdk/src/share/classes/java/io/Closeable.java
-@OPENJDK@/jdk/src/share/classes/java/io/Console.java
-@OPENJDK@/jdk/src/share/classes/java/io/DataInput.java
-@OPENJDK@/jdk/src/share/classes/java/io/DataInputStream.java
-@OPENJDK@/jdk/src/share/classes/java/io/DataOutput.java
-@OPENJDK@/jdk/src/share/classes/java/io/DataOutputStream.java
-@OPENJDK@/jdk/src/share/classes/java/io/DeleteOnExitHook.java
-@OPENJDK@/jdk/src/share/classes/java/io/EOFException.java
-@OPENJDK@/jdk/src/share/classes/java/io/ExpiringCache.java
-@OPENJDK@/jdk/src/share/classes/java/io/Externalizable.java
-@OPENJDK@/jdk/src/share/classes/java/io/File.java
-@OPENJDK@/jdk/src/share/classes/java/io/FileFilter.java
-@OPENJDK@/jdk/src/share/classes/java/io/FilenameFilter.java
-@OPENJDK@/jdk/src/share/classes/java/io/FileNotFoundException.java
-@OPENJDK@/jdk/src/share/classes/java/io/FilePermission.java
-@OPENJDK@/jdk/src/share/classes/java/io/FileReader.java
-@OPENJDK@/jdk/src/share/classes/java/io/FileSystem.java
-@OPENJDK@/jdk/src/share/classes/java/io/FileWriter.java
-@OPENJDK@/jdk/src/share/classes/java/io/FilterInputStream.java
-@OPENJDK@/jdk/src/share/classes/java/io/FilterOutputStream.java
-@OPENJDK@/jdk/src/share/classes/java/io/FilterReader.java
-@OPENJDK@/jdk/src/share/classes/java/io/FilterWriter.java
-@OPENJDK@/jdk/src/share/classes/java/io/Flushable.java
-@OPENJDK@/jdk/src/share/classes/java/io/InputStream.java
-@OPENJDK@/jdk/src/share/classes/java/io/InputStreamReader.java
-@OPENJDK@/jdk/src/share/classes/java/io/InterruptedIOException.java
-@OPENJDK@/jdk/src/share/classes/java/io/InvalidClassException.java
-@OPENJDK@/jdk/src/share/classes/java/io/InvalidObjectException.java
-@OPENJDK@/jdk/src/share/classes/java/io/IOError.java
-@OPENJDK@/jdk/src/share/classes/java/io/IOException.java
-@OPENJDK@/jdk/src/share/classes/java/io/LineNumberInputStream.java
-@OPENJDK@/jdk/src/share/classes/java/io/LineNumberReader.java
-@OPENJDK@/jdk/src/share/classes/java/io/NotActiveException.java
-@OPENJDK@/jdk/src/share/classes/java/io/NotSerializableException.java
-@OPENJDK@/jdk/src/share/classes/java/io/ObjectInput.java
-@OPENJDK@/jdk/src/share/classes/java/io/ObjectInputStream.java
-@OPENJDK@/jdk/src/share/classes/java/io/ObjectInputValidation.java
-@OPENJDK@/jdk/src/share/classes/java/io/ObjectOutput.java
-@OPENJDK@/jdk/src/share/classes/java/io/ObjectOutputStream.java
-@OPENJDK@/jdk/src/share/classes/java/io/ObjectStreamConstants.java
-@OPENJDK@/jdk/src/share/classes/java/io/ObjectStreamException.java
-@OPENJDK@/jdk/src/share/classes/java/io/OptionalDataException.java
-@OPENJDK@/jdk/src/share/classes/java/io/OutputStream.java
-@OPENJDK@/jdk/src/share/classes/java/io/OutputStreamWriter.java
-@OPENJDK@/jdk/src/share/classes/java/io/PipedInputStream.java
-@OPENJDK@/jdk/src/share/classes/java/io/PipedOutputStream.java
-@OPENJDK@/jdk/src/share/classes/java/io/PipedReader.java
-@OPENJDK@/jdk/src/share/classes/java/io/PipedWriter.java
-@OPENJDK@/jdk/src/share/classes/java/io/PrintStream.java
-@OPENJDK@/jdk/src/share/classes/java/io/PrintWriter.java
-@OPENJDK@/jdk/src/share/classes/java/io/PushbackInputStream.java
-@OPENJDK@/jdk/src/share/classes/java/io/PushbackReader.java
-@OPENJDK@/jdk/src/share/classes/java/io/Reader.java
-@OPENJDK@/jdk/src/share/classes/java/io/SequenceInputStream.java
-@OPENJDK@/jdk/src/share/classes/java/io/SerialCallbackContext.java
-@OPENJDK@/jdk/src/share/classes/java/io/Serializable.java
-@OPENJDK@/jdk/src/share/classes/java/io/SerializablePermission.java
-@OPENJDK@/jdk/src/share/classes/java/io/StreamCorruptedException.java
-@OPENJDK@/jdk/src/share/classes/java/io/StreamTokenizer.java
-@OPENJDK@/jdk/src/share/classes/java/io/StringBufferInputStream.java
-@OPENJDK@/jdk/src/share/classes/java/io/StringReader.java
-@OPENJDK@/jdk/src/share/classes/java/io/StringWriter.java
-@OPENJDK@/jdk/src/share/classes/java/io/SyncFailedException.java
-@OPENJDK@/jdk/src/share/classes/java/io/UncheckedIOException.java
-@OPENJDK@/jdk/src/share/classes/java/io/UnsupportedEncodingException.java
-@OPENJDK@/jdk/src/share/classes/java/io/UTFDataFormatException.java
-@OPENJDK@/jdk/src/share/classes/java/io/WriteAbortedException.java
-@OPENJDK@/jdk/src/share/classes/java/io/Writer.java
-@OPENJDK@/jdk/src/share/classes/java/lang/AbstractMethodError.java
-@OPENJDK@/jdk/src/share/classes/java/lang/AbstractStringBuilder.java
-@OPENJDK@/jdk/src/share/classes/java/lang/annotation/Annotation.java
-@OPENJDK@/jdk/src/share/classes/java/lang/annotation/AnnotationFormatError.java
-@OPENJDK@/jdk/src/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/annotation/Documented.java
-@OPENJDK@/jdk/src/share/classes/java/lang/annotation/ElementType.java
-@OPENJDK@/jdk/src/share/classes/java/lang/annotation/IncompleteAnnotationException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/annotation/Inherited.java
-@OPENJDK@/jdk/src/share/classes/java/lang/annotation/Native.java
-@OPENJDK@/jdk/src/share/classes/java/lang/annotation/package-info.java
-@OPENJDK@/jdk/src/share/classes/java/lang/annotation/Repeatable.java
-@OPENJDK@/jdk/src/share/classes/java/lang/annotation/Retention.java
-@OPENJDK@/jdk/src/share/classes/java/lang/annotation/RetentionPolicy.java
-@OPENJDK@/jdk/src/share/classes/java/lang/annotation/Target.java
-@OPENJDK@/jdk/src/share/classes/java/lang/Appendable.java
-@OPENJDK@/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java
-@OPENJDK@/jdk/src/share/classes/java/lang/ArithmeticException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/ArrayIndexOutOfBoundsException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/ArrayStoreException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/AssertionError.java
-@OPENJDK@/jdk/src/share/classes/java/lang/AssertionStatusDirectives.java
-@OPENJDK@/jdk/src/share/classes/java/lang/AutoCloseable.java
-@OPENJDK@/jdk/src/share/classes/java/lang/Boolean.java
-@OPENJDK@/jdk/src/share/classes/java/lang/BootstrapMethodError.java
-@OPENJDK@/jdk/src/share/classes/java/lang/Byte.java
-@OPENJDK@/jdk/src/share/classes/java/lang/Character.java
-@OPENJDK@/jdk/src/share/classes/java/lang/CharacterData.java
-@OPENJDK@/jdk/src/share/classes/java/lang/CharacterName.java
-@OPENJDK@/jdk/src/share/classes/java/lang/CharSequence.java
-@OPENJDK@/jdk/src/share/classes/java/lang/ClassCastException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/ClassCircularityError.java
-@OPENJDK@/jdk/src/share/classes/java/lang/ClassFormatError.java
-@OPENJDK@/jdk/src/share/classes/java/lang/ClassNotFoundException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/ClassValue.java
-@OPENJDK@/jdk/src/share/classes/java/lang/Cloneable.java
-@OPENJDK@/jdk/src/share/classes/java/lang/CloneNotSupportedException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/Comparable.java
-@OPENJDK@/jdk/src/share/classes/java/lang/Compiler.java
-@OPENJDK@/jdk/src/share/classes/java/lang/ConditionalSpecialCasing.java
-@OPENJDK@/jdk/src/share/classes/java/lang/Deprecated.java
-@OPENJDK@/jdk/src/share/classes/java/lang/Double.java
-@OPENJDK@/jdk/src/share/classes/java/lang/EnumConstantNotPresentException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/Error.java
-@OPENJDK@/jdk/src/share/classes/java/lang/Exception.java
-@OPENJDK@/jdk/src/share/classes/java/lang/ExceptionInInitializerError.java
-@OPENJDK@/jdk/src/share/classes/java/lang/Float.java
-@OPENJDK@/jdk/src/share/classes/java/lang/FunctionalInterface.java
-@OPENJDK@/jdk/src/share/classes/java/lang/IllegalAccessError.java
-@OPENJDK@/jdk/src/share/classes/java/lang/IllegalAccessException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/IllegalArgumentException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/IllegalMonitorStateException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/IllegalStateException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/IllegalThreadStateException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/IncompatibleClassChangeError.java
-@OPENJDK@/jdk/src/share/classes/java/lang/IndexOutOfBoundsException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/InheritableThreadLocal.java
-@OPENJDK@/jdk/src/share/classes/java/lang/InstantiationError.java
-@OPENJDK@/jdk/src/share/classes/java/lang/InstantiationException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/instrument/ClassDefinition.java
-@OPENJDK@/jdk/src/share/classes/java/lang/instrument/ClassFileTransformer.java
-@OPENJDK@/jdk/src/share/classes/java/lang/instrument/IllegalClassFormatException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/instrument/Instrumentation.java
-@OPENJDK@/jdk/src/share/classes/java/lang/instrument/UnmodifiableClassException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/Integer.java
-@OPENJDK@/jdk/src/share/classes/java/lang/InternalError.java
-@OPENJDK@/jdk/src/share/classes/java/lang/InterruptedException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/CallSite.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/ConstantCallSite.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/DontInline.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/ForceInline.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/InfoFromMemberName.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/InvokeDynamic.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/Invokers.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/LambdaConversionException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/LambdaForm.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/LambdaMetafactory.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/MemberName.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/MethodHandle.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/MethodHandleInfo.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/MethodHandles.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/MethodHandleStatics.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/MethodType.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/MethodTypeForm.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/MutableCallSite.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/package-info.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/ProxyClassesDumper.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/SerializedLambda.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/SimpleMethodHandle.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/Stable.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/SwitchPoint.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/TypeConvertingMethodAdapter.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/VolatileCallSite.java
-@OPENJDK@/jdk/src/share/classes/java/lang/invoke/WrongMethodTypeException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/Iterable.java
-@OPENJDK@/jdk/src/share/classes/java/lang/LinkageError.java
-@OPENJDK@/jdk/src/share/classes/java/lang/Long.java
-@OPENJDK@/jdk/src/share/classes/java/lang/management/BufferPoolMXBean.java
-@OPENJDK@/jdk/src/share/classes/java/lang/management/ClassLoadingMXBean.java
-@OPENJDK@/jdk/src/share/classes/java/lang/management/CompilationMXBean.java
-@OPENJDK@/jdk/src/share/classes/java/lang/management/GarbageCollectorMXBean.java
-@OPENJDK@/jdk/src/share/classes/java/lang/management/LockInfo.java
-@OPENJDK@/jdk/src/share/classes/java/lang/management/ManagementFactory.java
-@OPENJDK@/jdk/src/share/classes/java/lang/management/ManagementPermission.java
-@OPENJDK@/jdk/src/share/classes/java/lang/management/MemoryManagerMXBean.java
-@OPENJDK@/jdk/src/share/classes/java/lang/management/MemoryMXBean.java
-@OPENJDK@/jdk/src/share/classes/java/lang/management/MemoryNotificationInfo.java
-@OPENJDK@/jdk/src/share/classes/java/lang/management/MemoryPoolMXBean.java
-@OPENJDK@/jdk/src/share/classes/java/lang/management/MemoryType.java
-@OPENJDK@/jdk/src/share/classes/java/lang/management/MemoryUsage.java
-@OPENJDK@/jdk/src/share/classes/java/lang/management/MonitorInfo.java
-@OPENJDK@/jdk/src/share/classes/java/lang/management/OperatingSystemMXBean.java
-@OPENJDK@/jdk/src/share/classes/java/lang/management/PlatformLoggingMXBean.java
-@OPENJDK@/jdk/src/share/classes/java/lang/management/PlatformManagedObject.java
-@OPENJDK@/jdk/src/share/classes/java/lang/management/RuntimeMXBean.java
-@OPENJDK@/jdk/src/share/classes/java/lang/management/ThreadInfo.java
-@OPENJDK@/jdk/src/share/classes/java/lang/management/ThreadMXBean.java
-@OPENJDK@/jdk/src/share/classes/java/lang/Math.java
-@OPENJDK@/jdk/src/share/classes/java/lang/NegativeArraySizeException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/NoClassDefFoundError.java
-@OPENJDK@/jdk/src/share/classes/java/lang/NoSuchFieldError.java
-@OPENJDK@/jdk/src/share/classes/java/lang/NoSuchFieldException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/NoSuchMethodError.java
-@OPENJDK@/jdk/src/share/classes/java/lang/NoSuchMethodException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/NullPointerException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/Number.java
-@OPENJDK@/jdk/src/share/classes/java/lang/NumberFormatException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/Object.java
-@OPENJDK@/jdk/src/share/classes/java/lang/OutOfMemoryError.java
-@OPENJDK@/jdk/src/share/classes/java/lang/Override.java
-@OPENJDK@/jdk/src/share/classes/java/lang/package-info.java
-@OPENJDK@/jdk/src/share/classes/java/lang/Package.java
-@OPENJDK@/jdk/src/share/classes/java/lang/Process.java
-@OPENJDK@/jdk/src/share/classes/java/lang/ProcessBuilder.java
-@OPENJDK@/jdk/src/share/classes/java/lang/Readable.java
-@OPENJDK@/jdk/src/share/classes/java/lang/ref/FinalReference.java
-@OPENJDK@/jdk/src/share/classes/java/lang/ref/PhantomReference.java
-@OPENJDK@/jdk/src/share/classes/java/lang/ref/WeakReference.java
-@OPENJDK@/jdk/src/share/classes/java/lang/reflect/AccessibleObject.java
-@OPENJDK@/jdk/src/share/classes/java/lang/reflect/AnnotatedArrayType.java
-@OPENJDK@/jdk/src/share/classes/java/lang/reflect/AnnotatedElement.java
-@OPENJDK@/jdk/src/share/classes/java/lang/reflect/AnnotatedParameterizedType.java
-@OPENJDK@/jdk/src/share/classes/java/lang/reflect/AnnotatedType.java
-@OPENJDK@/jdk/src/share/classes/java/lang/reflect/AnnotatedTypeVariable.java
-@OPENJDK@/jdk/src/share/classes/java/lang/reflect/AnnotatedWildcardType.java
-@OPENJDK@/jdk/src/share/classes/java/lang/reflect/Array.java
-@OPENJDK@/jdk/src/share/classes/java/lang/reflect/GenericArrayType.java
-@OPENJDK@/jdk/src/share/classes/java/lang/reflect/GenericDeclaration.java
-@OPENJDK@/jdk/src/share/classes/java/lang/reflect/GenericSignatureFormatError.java
-@OPENJDK@/jdk/src/share/classes/java/lang/reflect/InvocationHandler.java
-@OPENJDK@/jdk/src/share/classes/java/lang/reflect/InvocationTargetException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/reflect/MalformedParametersException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/reflect/Member.java
-@OPENJDK@/jdk/src/share/classes/java/lang/reflect/Modifier.java
-@OPENJDK@/jdk/src/share/classes/java/lang/reflect/package-info.java
-@OPENJDK@/jdk/src/share/classes/java/lang/reflect/Parameter.java
-@OPENJDK@/jdk/src/share/classes/java/lang/reflect/ParameterizedType.java
-@OPENJDK@/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java
-@OPENJDK@/jdk/src/share/classes/java/lang/reflect/ReflectPermission.java
-@OPENJDK@/jdk/src/share/classes/java/lang/reflect/Type.java
-@OPENJDK@/jdk/src/share/classes/java/lang/reflect/TypeVariable.java
-@OPENJDK@/jdk/src/share/classes/java/lang/reflect/UndeclaredThrowableException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/reflect/WeakCache.java
-@OPENJDK@/jdk/src/share/classes/java/lang/reflect/WildcardType.java
-@OPENJDK@/jdk/src/share/classes/java/lang/ReflectiveOperationException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/Runnable.java
-@OPENJDK@/jdk/src/share/classes/java/lang/Runtime.java
-@OPENJDK@/jdk/src/share/classes/java/lang/RuntimeException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/RuntimePermission.java
-@OPENJDK@/jdk/src/share/classes/java/lang/SafeVarargs.java
-@OPENJDK@/jdk/src/share/classes/java/lang/SecurityException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/SecurityManager.java
-@OPENJDK@/jdk/src/share/classes/java/lang/Short.java
-@OPENJDK@/jdk/src/share/classes/java/lang/StackOverflowError.java
-@OPENJDK@/jdk/src/share/classes/java/lang/StackTraceElement.java
-@OPENJDK@/jdk/src/share/classes/java/lang/StrictMath.java
-@OPENJDK@/jdk/src/share/classes/java/lang/String.java
-@OPENJDK@/jdk/src/share/classes/java/lang/StringBuffer.java
-@OPENJDK@/jdk/src/share/classes/java/lang/StringBuilder.java
-@OPENJDK@/jdk/src/share/classes/java/lang/StringCoding.java
-@OPENJDK@/jdk/src/share/classes/java/lang/StringIndexOutOfBoundsException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/SuppressWarnings.java
-@OPENJDK@/jdk/src/share/classes/java/lang/ThreadDeath.java
-@OPENJDK@/jdk/src/share/classes/java/lang/ThreadGroup.java
-@OPENJDK@/jdk/src/share/classes/java/lang/ThreadLocal.java
-@OPENJDK@/jdk/src/share/classes/java/lang/Throwable.java
-@OPENJDK@/jdk/src/share/classes/java/lang/TypeNotPresentException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/UnknownError.java
-@OPENJDK@/jdk/src/share/classes/java/lang/UnsatisfiedLinkError.java
-@OPENJDK@/jdk/src/share/classes/java/lang/UnsupportedClassVersionError.java
-@OPENJDK@/jdk/src/share/classes/java/lang/UnsupportedOperationException.java
-@OPENJDK@/jdk/src/share/classes/java/lang/VerifyError.java
-@OPENJDK@/jdk/src/share/classes/java/lang/VirtualMachineError.java
-@OPENJDK@/jdk/src/share/classes/java/lang/Void.java
-@OPENJDK@/jdk/src/share/classes/java/math/BigDecimal.java
-@OPENJDK@/jdk/src/share/classes/java/math/BigInteger.java
-@OPENJDK@/jdk/src/share/classes/java/math/BitSieve.java
-@OPENJDK@/jdk/src/share/classes/java/math/MathContext.java
-@OPENJDK@/jdk/src/share/classes/java/math/MutableBigInteger.java
-@OPENJDK@/jdk/src/share/classes/java/math/package-info.java
-@OPENJDK@/jdk/src/share/classes/java/math/RoundingMode.java
-@OPENJDK@/jdk/src/share/classes/java/math/SignedMutableBigInteger.java
-@OPENJDK@/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
-@OPENJDK@/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
-@OPENJDK@/jdk/src/share/classes/java/net/Authenticator.java
-@OPENJDK@/jdk/src/share/classes/java/net/BindException.java
-@OPENJDK@/jdk/src/share/classes/java/net/CacheRequest.java
-@OPENJDK@/jdk/src/share/classes/java/net/CacheResponse.java
-@OPENJDK@/jdk/src/share/classes/java/net/ConnectException.java
-@OPENJDK@/jdk/src/share/classes/java/net/ContentHandler.java
-@OPENJDK@/jdk/src/share/classes/java/net/ContentHandlerFactory.java
-@OPENJDK@/jdk/src/share/classes/java/net/CookieHandler.java
-@OPENJDK@/jdk/src/share/classes/java/net/CookieManager.java
-@OPENJDK@/jdk/src/share/classes/java/net/CookiePolicy.java
-@OPENJDK@/jdk/src/share/classes/java/net/CookieStore.java
-@OPENJDK@/jdk/src/share/classes/java/net/DatagramPacket.java
-@OPENJDK@/jdk/src/share/classes/java/net/DatagramSocket.java
-@OPENJDK@/jdk/src/share/classes/java/net/DatagramSocketImpl.java
-@OPENJDK@/jdk/src/share/classes/java/net/DatagramSocketImplFactory.java
-@OPENJDK@/jdk/src/share/classes/java/net/FileNameMap.java
-@OPENJDK@/jdk/src/share/classes/java/net/HostPortrange.java
-@OPENJDK@/jdk/src/share/classes/java/net/HttpConnectSocketImpl.java
-@OPENJDK@/jdk/src/share/classes/java/net/HttpCookie.java
-@OPENJDK@/jdk/src/share/classes/java/net/HttpRetryException.java
-@OPENJDK@/jdk/src/share/classes/java/net/HttpURLConnection.java
-@OPENJDK@/jdk/src/share/classes/java/net/IDN.java
-@OPENJDK@/jdk/src/share/classes/java/net/Inet4Address.java
-@OPENJDK@/jdk/src/share/classes/java/net/Inet4AddressImpl.java
-@OPENJDK@/jdk/src/share/classes/java/net/Inet6Address.java
-@OPENJDK@/jdk/src/share/classes/java/net/Inet6AddressImpl.java
-@OPENJDK@/jdk/src/share/classes/java/net/InetAddress.java
-@OPENJDK@/jdk/src/share/classes/java/net/InetAddressContainer.java
-@OPENJDK@/jdk/src/share/classes/java/net/InetAddressImpl.java
-@OPENJDK@/jdk/src/share/classes/java/net/InetSocketAddress.java
-@OPENJDK@/jdk/src/share/classes/java/net/InMemoryCookieStore.java
-@OPENJDK@/jdk/src/share/classes/java/net/InterfaceAddress.java
-@OPENJDK@/jdk/src/share/classes/java/net/JarURLConnection.java
-@OPENJDK@/jdk/src/share/classes/java/net/MalformedURLException.java
-@OPENJDK@/jdk/src/share/classes/java/net/MulticastSocket.java
-@OPENJDK@/jdk/src/share/classes/java/net/NetPermission.java
-@OPENJDK@/jdk/src/share/classes/java/net/NetworkInterface.java
-@OPENJDK@/jdk/src/share/classes/java/net/NoRouteToHostException.java
-@OPENJDK@/jdk/src/share/classes/java/net/PasswordAuthentication.java
-@OPENJDK@/jdk/src/share/classes/java/net/PortUnreachableException.java
-@OPENJDK@/jdk/src/share/classes/java/net/ProtocolException.java
-@OPENJDK@/jdk/src/share/classes/java/net/ProtocolFamily.java
-@OPENJDK@/jdk/src/share/classes/java/net/Proxy.java
-@OPENJDK@/jdk/src/share/classes/java/net/ProxySelector.java
-@OPENJDK@/jdk/src/share/classes/java/net/ResponseCache.java
-@OPENJDK@/jdk/src/share/classes/java/net/SdpSocketImpl.java
-@OPENJDK@/jdk/src/share/classes/java/net/SecureCacheResponse.java
-@OPENJDK@/jdk/src/share/classes/java/net/ServerSocket.java
-@OPENJDK@/jdk/src/share/classes/java/net/Socket.java
-@OPENJDK@/jdk/src/share/classes/java/net/SocketAddress.java
-@OPENJDK@/jdk/src/share/classes/java/net/SocketException.java
-@OPENJDK@/jdk/src/share/classes/java/net/SocketImpl.java
-@OPENJDK@/jdk/src/share/classes/java/net/SocketImplFactory.java
-@OPENJDK@/jdk/src/share/classes/java/net/SocketOption.java
-@OPENJDK@/jdk/src/share/classes/java/net/SocketOptions.java
-@OPENJDK@/jdk/src/share/classes/java/net/SocketPermission.java
-@OPENJDK@/jdk/src/share/classes/java/net/SocketTimeoutException.java
-@OPENJDK@/jdk/src/share/classes/java/net/SocksConsts.java
-@OPENJDK@/jdk/src/share/classes/java/net/SocksSocketImpl.java
-@OPENJDK@/jdk/src/share/classes/java/net/StandardProtocolFamily.java
-@OPENJDK@/jdk/src/share/classes/java/net/StandardSocketOptions.java
-@OPENJDK@/jdk/src/share/classes/java/net/UnknownHostException.java
-@OPENJDK@/jdk/src/share/classes/java/net/UnknownServiceException.java
-@OPENJDK@/jdk/src/share/classes/java/net/URI.java
-@OPENJDK@/jdk/src/share/classes/java/net/URISyntaxException.java
-@OPENJDK@/jdk/src/share/classes/java/net/URL.java
-@OPENJDK@/jdk/src/share/classes/java/net/URLClassLoader.java
-@OPENJDK@/jdk/src/share/classes/java/net/URLConnection.java
-@OPENJDK@/jdk/src/share/classes/java/net/URLDecoder.java
-@OPENJDK@/jdk/src/share/classes/java/net/URLEncoder.java
-@OPENJDK@/jdk/src/share/classes/java/net/URLPermission.java
-@OPENJDK@/jdk/src/share/classes/java/net/URLStreamHandler.java
-@OPENJDK@/jdk/src/share/classes/java/net/URLStreamHandlerFactory.java
-@OPENJDK@/jdk/src/share/classes/java/nio/Buffer.java
-@OPENJDK@/jdk/src/share/classes/java/nio/ByteOrder.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/AsynchronousByteChannel.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/AsynchronousChannel.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/AsynchronousChannelGroup.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/AsynchronousFileChannel.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/AsynchronousSocketChannel.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/ByteChannel.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/Channel.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/Channels.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/CompletionHandler.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/DatagramChannel.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/FileChannel.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/FileLock.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/GatheringByteChannel.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/InterruptibleChannel.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/MembershipKey.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/MulticastChannel.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/NetworkChannel.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/package-info.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/Pipe.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/ReadableByteChannel.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/ScatteringByteChannel.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/SeekableByteChannel.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/SelectableChannel.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/SelectionKey.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/Selector.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/ServerSocketChannel.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/SocketChannel.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/spi/AbstractInterruptibleChannel.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/spi/AbstractSelectionKey.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/spi/AbstractSelector.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/spi/SelectorProvider.java
-@OPENJDK@/jdk/src/share/classes/java/nio/channels/WritableByteChannel.java
-@OPENJDK@/jdk/src/share/classes/java/nio/CharBufferSpliterator.java
-@OPENJDK@/jdk/src/share/classes/java/nio/charset/Charset.java
-@OPENJDK@/jdk/src/share/classes/java/nio/charset/CoderMalfunctionError.java
-@OPENJDK@/jdk/src/share/classes/java/nio/charset/CoderResult.java
-@OPENJDK@/jdk/src/share/classes/java/nio/charset/CodingErrorAction.java
-@OPENJDK@/jdk/src/share/classes/java/nio/charset/MalformedInputException.java
-@OPENJDK@/jdk/src/share/classes/java/nio/charset/spi/CharsetProvider.java
-@OPENJDK@/jdk/src/share/classes/java/nio/charset/StandardCharsets.java
-@OPENJDK@/jdk/src/share/classes/java/nio/charset/UnmappableCharacterException.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/AccessDeniedException.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/AccessMode.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/AtomicMoveNotSupportedException.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/attribute/AclEntry.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/attribute/AclEntryFlag.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/attribute/AclEntryPermission.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/attribute/AclEntryType.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/attribute/AclFileAttributeView.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/attribute/AttributeView.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/attribute/BasicFileAttributes.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/attribute/BasicFileAttributeView.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/attribute/DosFileAttributes.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/attribute/DosFileAttributeView.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/attribute/FileAttribute.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/attribute/FileAttributeView.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/attribute/FileOwnerAttributeView.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/attribute/FileStoreAttributeView.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/attribute/FileTime.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/attribute/GroupPrincipal.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/attribute/package-info.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/attribute/PosixFileAttributes.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/attribute/PosixFileAttributeView.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/attribute/PosixFilePermission.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/attribute/PosixFilePermissions.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/attribute/UserPrincipal.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/attribute/UserPrincipalLookupService.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/attribute/UserPrincipalNotFoundException.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/ClosedDirectoryStreamException.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/ClosedFileSystemException.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/ClosedWatchServiceException.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/CopyMoveHelper.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/CopyOption.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/DirectoryIteratorException.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/DirectoryNotEmptyException.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/DirectoryStream.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/FileAlreadyExistsException.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/Files.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/FileStore.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/FileSystem.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/FileSystemAlreadyExistsException.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/FileSystemException.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/FileSystemLoopException.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/FileSystemNotFoundException.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/FileSystems.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/FileTreeIterator.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/FileTreeWalker.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/FileVisitOption.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/FileVisitor.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/FileVisitResult.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/InvalidPathException.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/LinkOption.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/LinkPermission.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/NoSuchFileException.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/NotDirectoryException.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/NotLinkException.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/OpenOption.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/package-info.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/Path.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/PathMatcher.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/Paths.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/ProviderMismatchException.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/ProviderNotFoundException.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/ReadOnlyFileSystemException.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/SecureDirectoryStream.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/SimpleFileVisitor.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/spi/FileSystemProvider.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/spi/FileTypeDetector.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/spi/package-info.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/StandardCopyOption.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/StandardOpenOption.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/StandardWatchEventKinds.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/TempFileHelper.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/Watchable.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/WatchEvent.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/WatchKey.java
-@OPENJDK@/jdk/src/share/classes/java/nio/file/WatchService.java
-@OPENJDK@/jdk/src/share/classes/java/nio/MappedByteBuffer.java
-@OPENJDK@/jdk/src/share/classes/java/nio/StringCharBuffer.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/AccessException.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/activation/Activatable.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/activation/ActivateFailedException.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/activation/ActivationDesc.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/activation/ActivationException.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/activation/ActivationGroup.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/activation/ActivationGroupDesc.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/activation/ActivationGroupID.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/activation/ActivationID.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/activation/ActivationInstantiator.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/activation/ActivationMonitor.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/activation/ActivationSystem.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/activation/Activator.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/activation/UnknownGroupException.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/activation/UnknownObjectException.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/AlreadyBoundException.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/ConnectException.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/ConnectIOException.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/dgc/DGC.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/dgc/Lease.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/dgc/VMID.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/MarshalException.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/MarshalledObject.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/Naming.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/NoSuchObjectException.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/NotBoundException.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/registry/LocateRegistry.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/registry/Registry.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/registry/RegistryHandler.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/Remote.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/RemoteException.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/RMISecurityException.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/RMISecurityManager.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/server/ExportException.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/server/LoaderHandler.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/server/LogStream.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/server/ObjID.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/server/Operation.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/server/RemoteCall.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/server/RemoteObject.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/server/RemoteRef.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/server/RemoteServer.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/server/RemoteStub.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/server/RMIClassLoader.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/server/RMIClassLoaderSpi.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/server/RMIClientSocketFactory.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/server/RMIFailureHandler.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/server/RMIServerSocketFactory.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/server/RMISocketFactory.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/server/ServerCloneException.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/server/ServerNotActiveException.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/server/ServerRef.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/server/Skeleton.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/server/SkeletonMismatchException.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/server/SkeletonNotFoundException.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/server/SocketSecurityException.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/server/UID.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/server/UnicastRemoteObject.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/server/Unreferenced.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/ServerError.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/ServerException.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/ServerRuntimeException.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/StubNotFoundException.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/UnexpectedException.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/UnknownHostException.java
-@OPENJDK@/jdk/src/share/classes/java/rmi/UnmarshalException.java
-@OPENJDK@/jdk/src/share/classes/java/security/AccessControlContext.java
-@OPENJDK@/jdk/src/share/classes/java/security/AccessControlException.java
-@OPENJDK@/jdk/src/share/classes/java/security/acl/Acl.java
-@OPENJDK@/jdk/src/share/classes/java/security/acl/AclEntry.java
-@OPENJDK@/jdk/src/share/classes/java/security/acl/AclNotFoundException.java
-@OPENJDK@/jdk/src/share/classes/java/security/acl/Group.java
-@OPENJDK@/jdk/src/share/classes/java/security/acl/LastOwnerException.java
-@OPENJDK@/jdk/src/share/classes/java/security/acl/NotOwnerException.java
-@OPENJDK@/jdk/src/share/classes/java/security/acl/Owner.java
-@OPENJDK@/jdk/src/share/classes/java/security/acl/Permission.java
-@OPENJDK@/jdk/src/share/classes/java/security/AlgorithmConstraints.java
-@OPENJDK@/jdk/src/share/classes/java/security/AlgorithmParameterGenerator.java
-@OPENJDK@/jdk/src/share/classes/java/security/AlgorithmParameterGeneratorSpi.java
-@OPENJDK@/jdk/src/share/classes/java/security/AlgorithmParameters.java
-@OPENJDK@/jdk/src/share/classes/java/security/AlgorithmParametersSpi.java
-@OPENJDK@/jdk/src/share/classes/java/security/AllPermission.java
-@OPENJDK@/jdk/src/share/classes/java/security/AuthProvider.java
-@OPENJDK@/jdk/src/share/classes/java/security/BasicPermission.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/Certificate.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CertificateEncodingException.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CertificateException.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CertificateExpiredException.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CertificateFactory.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CertificateFactorySpi.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CertificateNotYetValidException.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CertificateParsingException.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CertificateRevokedException.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CertPath.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CertPathBuilder.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CertPathBuilderException.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CertPathBuilderResult.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CertPathBuilderSpi.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CertPathChecker.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CertPathHelperImpl.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CertPathParameters.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CertPathValidator.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CertPathValidatorException.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CertPathValidatorResult.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CertPathValidatorSpi.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CertSelector.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CertStore.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CertStoreException.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CertStoreParameters.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CertStoreSpi.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CollectionCertStoreParameters.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CRL.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CRLException.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CRLReason.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/CRLSelector.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/Extension.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/LDAPCertStoreParameters.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/PKIXBuilderParameters.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/PKIXCertPathChecker.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/PKIXParameters.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/PKIXReason.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/PKIXRevocationChecker.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/PolicyNode.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/PolicyQualifierInfo.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/TrustAnchor.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/X509Certificate.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/X509CertSelector.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/X509CRL.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/X509CRLEntry.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/X509CRLSelector.java
-@OPENJDK@/jdk/src/share/classes/java/security/cert/X509Extension.java
-@OPENJDK@/jdk/src/share/classes/java/security/Certificate.java
-@OPENJDK@/jdk/src/share/classes/java/security/CodeSigner.java
-@OPENJDK@/jdk/src/share/classes/java/security/CodeSource.java
-@OPENJDK@/jdk/src/share/classes/java/security/CryptoPrimitive.java
-@OPENJDK@/jdk/src/share/classes/java/security/DigestException.java
-@OPENJDK@/jdk/src/share/classes/java/security/DigestInputStream.java
-@OPENJDK@/jdk/src/share/classes/java/security/DigestOutputStream.java
-@OPENJDK@/jdk/src/share/classes/java/security/DomainCombiner.java
-@OPENJDK@/jdk/src/share/classes/java/security/DomainLoadStoreParameter.java
-@OPENJDK@/jdk/src/share/classes/java/security/GeneralSecurityException.java
-@OPENJDK@/jdk/src/share/classes/java/security/Guard.java
-@OPENJDK@/jdk/src/share/classes/java/security/GuardedObject.java
-@OPENJDK@/jdk/src/share/classes/java/security/Identity.java
-@OPENJDK@/jdk/src/share/classes/java/security/IdentityScope.java
-@OPENJDK@/jdk/src/share/classes/java/security/interfaces/DSAKey.java
-@OPENJDK@/jdk/src/share/classes/java/security/interfaces/DSAKeyPairGenerator.java
-@OPENJDK@/jdk/src/share/classes/java/security/interfaces/DSAParams.java
-@OPENJDK@/jdk/src/share/classes/java/security/interfaces/DSAPrivateKey.java
-@OPENJDK@/jdk/src/share/classes/java/security/interfaces/DSAPublicKey.java
-@OPENJDK@/jdk/src/share/classes/java/security/interfaces/ECKey.java
-@OPENJDK@/jdk/src/share/classes/java/security/interfaces/ECPrivateKey.java
-@OPENJDK@/jdk/src/share/classes/java/security/interfaces/ECPublicKey.java
-@OPENJDK@/jdk/src/share/classes/java/security/interfaces/RSAKey.java
-@OPENJDK@/jdk/src/share/classes/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java
-@OPENJDK@/jdk/src/share/classes/java/security/interfaces/RSAPrivateCrtKey.java
-@OPENJDK@/jdk/src/share/classes/java/security/interfaces/RSAPrivateKey.java
-@OPENJDK@/jdk/src/share/classes/java/security/interfaces/RSAPublicKey.java
-@OPENJDK@/jdk/src/share/classes/java/security/InvalidAlgorithmParameterException.java
-@OPENJDK@/jdk/src/share/classes/java/security/InvalidKeyException.java
-@OPENJDK@/jdk/src/share/classes/java/security/InvalidParameterException.java
-@OPENJDK@/jdk/src/share/classes/java/security/Key.java
-@OPENJDK@/jdk/src/share/classes/java/security/KeyException.java
-@OPENJDK@/jdk/src/share/classes/java/security/KeyFactory.java
-@OPENJDK@/jdk/src/share/classes/java/security/KeyFactorySpi.java
-@OPENJDK@/jdk/src/share/classes/java/security/KeyManagementException.java
-@OPENJDK@/jdk/src/share/classes/java/security/KeyPair.java
-@OPENJDK@/jdk/src/share/classes/java/security/KeyPairGenerator.java
-@OPENJDK@/jdk/src/share/classes/java/security/KeyPairGeneratorSpi.java
-@OPENJDK@/jdk/src/share/classes/java/security/KeyRep.java
-@OPENJDK@/jdk/src/share/classes/java/security/KeyStore.java
-@OPENJDK@/jdk/src/share/classes/java/security/KeyStoreException.java
-@OPENJDK@/jdk/src/share/classes/java/security/KeyStoreSpi.java
-@OPENJDK@/jdk/src/share/classes/java/security/MessageDigest.java
-@OPENJDK@/jdk/src/share/classes/java/security/MessageDigestSpi.java
-@OPENJDK@/jdk/src/share/classes/java/security/NoSuchAlgorithmException.java
-@OPENJDK@/jdk/src/share/classes/java/security/NoSuchProviderException.java
-@OPENJDK@/jdk/src/share/classes/java/security/Permission.java
-@OPENJDK@/jdk/src/share/classes/java/security/PermissionCollection.java
-@OPENJDK@/jdk/src/share/classes/java/security/Permissions.java
-@OPENJDK@/jdk/src/share/classes/java/security/PKCS12Attribute.java
-@OPENJDK@/jdk/src/share/classes/java/security/Policy.java
-@OPENJDK@/jdk/src/share/classes/java/security/PolicySpi.java
-@OPENJDK@/jdk/src/share/classes/java/security/Principal.java
-@OPENJDK@/jdk/src/share/classes/java/security/PrivateKey.java
-@OPENJDK@/jdk/src/share/classes/java/security/PrivilegedAction.java
-@OPENJDK@/jdk/src/share/classes/java/security/PrivilegedActionException.java
-@OPENJDK@/jdk/src/share/classes/java/security/PrivilegedExceptionAction.java
-@OPENJDK@/jdk/src/share/classes/java/security/Provider.java
-@OPENJDK@/jdk/src/share/classes/java/security/ProviderException.java
-@OPENJDK@/jdk/src/share/classes/java/security/PublicKey.java
-@OPENJDK@/jdk/src/share/classes/java/security/SecureClassLoader.java
-@OPENJDK@/jdk/src/share/classes/java/security/SecureRandom.java
-@OPENJDK@/jdk/src/share/classes/java/security/SecureRandomSpi.java
-@OPENJDK@/jdk/src/share/classes/java/security/Security.java
-@OPENJDK@/jdk/src/share/classes/java/security/SecurityPermission.java
-@OPENJDK@/jdk/src/share/classes/java/security/Signature.java
-@OPENJDK@/jdk/src/share/classes/java/security/SignatureException.java
-@OPENJDK@/jdk/src/share/classes/java/security/SignatureSpi.java
-@OPENJDK@/jdk/src/share/classes/java/security/SignedObject.java
-@OPENJDK@/jdk/src/share/classes/java/security/Signer.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/AlgorithmParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/DSAGenParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/DSAParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/DSAPrivateKeySpec.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/DSAPublicKeySpec.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/ECField.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/ECFieldF2m.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/ECFieldFp.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/ECGenParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/ECParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/ECPoint.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/ECPrivateKeySpec.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/ECPublicKeySpec.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/EllipticCurve.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/EncodedKeySpec.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/InvalidKeySpecException.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/InvalidParameterSpecException.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/KeySpec.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/MGF1ParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/PKCS8EncodedKeySpec.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/PSSParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/RSAKeyGenParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/RSAOtherPrimeInfo.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/RSAPrivateCrtKeySpec.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/RSAPrivateKeySpec.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/RSAPublicKeySpec.java
-@OPENJDK@/jdk/src/share/classes/java/security/spec/X509EncodedKeySpec.java
-@OPENJDK@/jdk/src/share/classes/java/security/Timestamp.java
-@OPENJDK@/jdk/src/share/classes/java/security/UnrecoverableEntryException.java
-@OPENJDK@/jdk/src/share/classes/java/security/UnrecoverableKeyException.java
-@OPENJDK@/jdk/src/share/classes/java/security/UnresolvedPermission.java
-@OPENJDK@/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java
-@OPENJDK@/jdk/src/share/classes/java/security/URIParameter.java
-@OPENJDK@/jdk/src/share/classes/java/sql/Array.java
-@OPENJDK@/jdk/src/share/classes/java/sql/BatchUpdateException.java
-@OPENJDK@/jdk/src/share/classes/java/sql/Blob.java
-@OPENJDK@/jdk/src/share/classes/java/sql/CallableStatement.java
-@OPENJDK@/jdk/src/share/classes/java/sql/ClientInfoStatus.java
-@OPENJDK@/jdk/src/share/classes/java/sql/Clob.java
-@OPENJDK@/jdk/src/share/classes/java/sql/Connection.java
-@OPENJDK@/jdk/src/share/classes/java/sql/DatabaseMetaData.java
-@OPENJDK@/jdk/src/share/classes/java/sql/DataTruncation.java
-@OPENJDK@/jdk/src/share/classes/java/sql/Date.java
-@OPENJDK@/jdk/src/share/classes/java/sql/Driver.java
-@OPENJDK@/jdk/src/share/classes/java/sql/DriverAction.java
-@OPENJDK@/jdk/src/share/classes/java/sql/DriverManager.java
-@OPENJDK@/jdk/src/share/classes/java/sql/DriverPropertyInfo.java
-@OPENJDK@/jdk/src/share/classes/java/sql/JDBCType.java
-@OPENJDK@/jdk/src/share/classes/java/sql/NClob.java
-@OPENJDK@/jdk/src/share/classes/java/sql/ParameterMetaData.java
-@OPENJDK@/jdk/src/share/classes/java/sql/PreparedStatement.java
-@OPENJDK@/jdk/src/share/classes/java/sql/PseudoColumnUsage.java
-@OPENJDK@/jdk/src/share/classes/java/sql/Ref.java
-@OPENJDK@/jdk/src/share/classes/java/sql/ResultSet.java
-@OPENJDK@/jdk/src/share/classes/java/sql/ResultSetMetaData.java
-@OPENJDK@/jdk/src/share/classes/java/sql/RowId.java
-@OPENJDK@/jdk/src/share/classes/java/sql/RowIdLifetime.java
-@OPENJDK@/jdk/src/share/classes/java/sql/Savepoint.java
-@OPENJDK@/jdk/src/share/classes/java/sql/SQLClientInfoException.java
-@OPENJDK@/jdk/src/share/classes/java/sql/SQLData.java
-@OPENJDK@/jdk/src/share/classes/java/sql/SQLDataException.java
-@OPENJDK@/jdk/src/share/classes/java/sql/SQLException.java
-@OPENJDK@/jdk/src/share/classes/java/sql/SQLFeatureNotSupportedException.java
-@OPENJDK@/jdk/src/share/classes/java/sql/SQLInput.java
-@OPENJDK@/jdk/src/share/classes/java/sql/SQLIntegrityConstraintViolationException.java
-@OPENJDK@/jdk/src/share/classes/java/sql/SQLInvalidAuthorizationSpecException.java
-@OPENJDK@/jdk/src/share/classes/java/sql/SQLNonTransientConnectionException.java
-@OPENJDK@/jdk/src/share/classes/java/sql/SQLNonTransientException.java
-@OPENJDK@/jdk/src/share/classes/java/sql/SQLOutput.java
-@OPENJDK@/jdk/src/share/classes/java/sql/SQLPermission.java
-@OPENJDK@/jdk/src/share/classes/java/sql/SQLRecoverableException.java
-@OPENJDK@/jdk/src/share/classes/java/sql/SQLSyntaxErrorException.java
-@OPENJDK@/jdk/src/share/classes/java/sql/SQLTimeoutException.java
-@OPENJDK@/jdk/src/share/classes/java/sql/SQLTransactionRollbackException.java
-@OPENJDK@/jdk/src/share/classes/java/sql/SQLTransientConnectionException.java
-@OPENJDK@/jdk/src/share/classes/java/sql/SQLTransientException.java
-@OPENJDK@/jdk/src/share/classes/java/sql/SQLType.java
-@OPENJDK@/jdk/src/share/classes/java/sql/SQLWarning.java
-@OPENJDK@/jdk/src/share/classes/java/sql/SQLXML.java
-@OPENJDK@/jdk/src/share/classes/java/sql/Statement.java
-@OPENJDK@/jdk/src/share/classes/java/sql/Struct.java
-@OPENJDK@/jdk/src/share/classes/java/sql/Time.java
-@OPENJDK@/jdk/src/share/classes/java/sql/Timestamp.java
-@OPENJDK@/jdk/src/share/classes/java/sql/Types.java
-@OPENJDK@/jdk/src/share/classes/java/sql/Wrapper.java
-@OPENJDK@/jdk/src/share/classes/java/text/Annotation.java
-@OPENJDK@/jdk/src/share/classes/java/text/AttributedCharacterIterator.java
-@OPENJDK@/jdk/src/share/classes/java/text/AttributedString.java
-@OPENJDK@/jdk/src/share/classes/java/text/Bidi.java
-@OPENJDK@/jdk/src/share/classes/java/text/BreakIterator.java
-@OPENJDK@/jdk/src/share/classes/java/text/CalendarBuilder.java
-@OPENJDK@/jdk/src/share/classes/java/text/CharacterIterator.java
-@OPENJDK@/jdk/src/share/classes/java/text/CharacterIteratorFieldDelegate.java
-@OPENJDK@/jdk/src/share/classes/java/text/ChoiceFormat.java
-@OPENJDK@/jdk/src/share/classes/java/text/CollationElementIterator.java
-@OPENJDK@/jdk/src/share/classes/java/text/CollationKey.java
-@OPENJDK@/jdk/src/share/classes/java/text/Collator.java
-@OPENJDK@/jdk/src/share/classes/java/text/DateFormat.java
-@OPENJDK@/jdk/src/share/classes/java/text/DateFormatSymbols.java
-@OPENJDK@/jdk/src/share/classes/java/text/DecimalFormat.java
-@OPENJDK@/jdk/src/share/classes/java/text/DecimalFormatSymbols.java
-@OPENJDK@/jdk/src/share/classes/java/text/DigitList.java
-@OPENJDK@/jdk/src/share/classes/java/text/DontCareFieldPosition.java
-@OPENJDK@/jdk/src/share/classes/java/text/EntryPair.java
-@OPENJDK@/jdk/src/share/classes/java/text/FieldPosition.java
-@OPENJDK@/jdk/src/share/classes/java/text/Format.java
-@OPENJDK@/jdk/src/share/classes/java/text/MergeCollation.java
-@OPENJDK@/jdk/src/share/classes/java/text/MessageFormat.java
-@OPENJDK@/jdk/src/share/classes/java/text/Normalizer.java
-@OPENJDK@/jdk/src/share/classes/java/text/NumberFormat.java
-@OPENJDK@/jdk/src/share/classes/java/text/ParseException.java
-@OPENJDK@/jdk/src/share/classes/java/text/ParsePosition.java
-@OPENJDK@/jdk/src/share/classes/java/text/PatternEntry.java
-@OPENJDK@/jdk/src/share/classes/java/text/RBCollationTables.java
-@OPENJDK@/jdk/src/share/classes/java/text/RBTableBuilder.java
-@OPENJDK@/jdk/src/share/classes/java/text/RuleBasedCollationKey.java
-@OPENJDK@/jdk/src/share/classes/java/text/RuleBasedCollator.java
-@OPENJDK@/jdk/src/share/classes/java/text/SimpleDateFormat.java
-@OPENJDK@/jdk/src/share/classes/java/text/spi/BreakIteratorProvider.java
-@OPENJDK@/jdk/src/share/classes/java/text/spi/CollatorProvider.java
-@OPENJDK@/jdk/src/share/classes/java/text/spi/DateFormatProvider.java
-@OPENJDK@/jdk/src/share/classes/java/text/spi/DateFormatSymbolsProvider.java
-@OPENJDK@/jdk/src/share/classes/java/text/spi/DecimalFormatSymbolsProvider.java
-@OPENJDK@/jdk/src/share/classes/java/text/spi/NumberFormatProvider.java
-@OPENJDK@/jdk/src/share/classes/java/text/StringCharacterIterator.java
-@OPENJDK@/jdk/src/share/classes/java/time/chrono/AbstractChronology.java
-@OPENJDK@/jdk/src/share/classes/java/time/chrono/ChronoLocalDate.java
-@OPENJDK@/jdk/src/share/classes/java/time/chrono/ChronoLocalDateImpl.java
-@OPENJDK@/jdk/src/share/classes/java/time/chrono/ChronoLocalDateTime.java
-@OPENJDK@/jdk/src/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java
-@OPENJDK@/jdk/src/share/classes/java/time/chrono/Chronology.java
-@OPENJDK@/jdk/src/share/classes/java/time/chrono/ChronoPeriod.java
-@OPENJDK@/jdk/src/share/classes/java/time/chrono/ChronoPeriodImpl.java
-@OPENJDK@/jdk/src/share/classes/java/time/chrono/ChronoZonedDateTime.java
-@OPENJDK@/jdk/src/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java
-@OPENJDK@/jdk/src/share/classes/java/time/chrono/Era.java
-@OPENJDK@/jdk/src/share/classes/java/time/chrono/HijrahChronology.java
-@OPENJDK@/jdk/src/share/classes/java/time/chrono/HijrahDate.java
-@OPENJDK@/jdk/src/share/classes/java/time/chrono/HijrahEra.java
-@OPENJDK@/jdk/src/share/classes/java/time/chrono/IsoChronology.java
-@OPENJDK@/jdk/src/share/classes/java/time/chrono/IsoEra.java
-@OPENJDK@/jdk/src/share/classes/java/time/chrono/JapaneseChronology.java
-@OPENJDK@/jdk/src/share/classes/java/time/chrono/JapaneseDate.java
-@OPENJDK@/jdk/src/share/classes/java/time/chrono/JapaneseEra.java
-@OPENJDK@/jdk/src/share/classes/java/time/chrono/MinguoChronology.java
-@OPENJDK@/jdk/src/share/classes/java/time/chrono/MinguoDate.java
-@OPENJDK@/jdk/src/share/classes/java/time/chrono/MinguoEra.java
-@OPENJDK@/jdk/src/share/classes/java/time/chrono/Ser.java
-@OPENJDK@/jdk/src/share/classes/java/time/chrono/ThaiBuddhistChronology.java
-@OPENJDK@/jdk/src/share/classes/java/time/chrono/ThaiBuddhistDate.java
-@OPENJDK@/jdk/src/share/classes/java/time/chrono/ThaiBuddhistEra.java
-@OPENJDK@/jdk/src/share/classes/java/time/Clock.java
-@OPENJDK@/jdk/src/share/classes/java/time/DateTimeException.java
-@OPENJDK@/jdk/src/share/classes/java/time/DayOfWeek.java
-@OPENJDK@/jdk/src/share/classes/java/time/Duration.java
-@OPENJDK@/jdk/src/share/classes/java/time/format/DateTimeFormatter.java
-@OPENJDK@/jdk/src/share/classes/java/time/format/DateTimeFormatterBuilder.java
-@OPENJDK@/jdk/src/share/classes/java/time/format/DateTimeParseContext.java
-@OPENJDK@/jdk/src/share/classes/java/time/format/DateTimeParseException.java
-@OPENJDK@/jdk/src/share/classes/java/time/format/DateTimePrintContext.java
-@OPENJDK@/jdk/src/share/classes/java/time/format/DateTimeTextProvider.java
-@OPENJDK@/jdk/src/share/classes/java/time/format/DecimalStyle.java
-@OPENJDK@/jdk/src/share/classes/java/time/format/FormatStyle.java
-@OPENJDK@/jdk/src/share/classes/java/time/format/Parsed.java
-@OPENJDK@/jdk/src/share/classes/java/time/format/ResolverStyle.java
-@OPENJDK@/jdk/src/share/classes/java/time/format/SignStyle.java
-@OPENJDK@/jdk/src/share/classes/java/time/format/TextStyle.java
-@OPENJDK@/jdk/src/share/classes/java/time/format/ZoneName.java
-@OPENJDK@/jdk/src/share/classes/java/time/Instant.java
-@OPENJDK@/jdk/src/share/classes/java/time/LocalDate.java
-@OPENJDK@/jdk/src/share/classes/java/time/LocalDateTime.java
-@OPENJDK@/jdk/src/share/classes/java/time/LocalTime.java
-@OPENJDK@/jdk/src/share/classes/java/time/Month.java
-@OPENJDK@/jdk/src/share/classes/java/time/MonthDay.java
-@OPENJDK@/jdk/src/share/classes/java/time/OffsetDateTime.java
-@OPENJDK@/jdk/src/share/classes/java/time/OffsetTime.java
-@OPENJDK@/jdk/src/share/classes/java/time/Period.java
-@OPENJDK@/jdk/src/share/classes/java/time/Ser.java
-@OPENJDK@/jdk/src/share/classes/java/time/temporal/ChronoField.java
-@OPENJDK@/jdk/src/share/classes/java/time/temporal/ChronoUnit.java
-@OPENJDK@/jdk/src/share/classes/java/time/temporal/IsoFields.java
-@OPENJDK@/jdk/src/share/classes/java/time/temporal/JulianFields.java
-@OPENJDK@/jdk/src/share/classes/java/time/temporal/Temporal.java
-@OPENJDK@/jdk/src/share/classes/java/time/temporal/TemporalAccessor.java
-@OPENJDK@/jdk/src/share/classes/java/time/temporal/TemporalAdjuster.java
-@OPENJDK@/jdk/src/share/classes/java/time/temporal/TemporalAdjusters.java
-@OPENJDK@/jdk/src/share/classes/java/time/temporal/TemporalAmount.java
-@OPENJDK@/jdk/src/share/classes/java/time/temporal/TemporalField.java
-@OPENJDK@/jdk/src/share/classes/java/time/temporal/TemporalQueries.java
-@OPENJDK@/jdk/src/share/classes/java/time/temporal/TemporalQuery.java
-@OPENJDK@/jdk/src/share/classes/java/time/temporal/TemporalUnit.java
-@OPENJDK@/jdk/src/share/classes/java/time/temporal/UnsupportedTemporalTypeException.java
-@OPENJDK@/jdk/src/share/classes/java/time/temporal/ValueRange.java
-@OPENJDK@/jdk/src/share/classes/java/time/temporal/WeekFields.java
-@OPENJDK@/jdk/src/share/classes/java/time/Year.java
-@OPENJDK@/jdk/src/share/classes/java/time/YearMonth.java
-@OPENJDK@/jdk/src/share/classes/java/time/zone/Ser.java
-@OPENJDK@/jdk/src/share/classes/java/time/zone/TzdbZoneRulesProvider.java
-@OPENJDK@/jdk/src/share/classes/java/time/zone/ZoneOffsetTransition.java
-@OPENJDK@/jdk/src/share/classes/java/time/zone/ZoneOffsetTransitionRule.java
-@OPENJDK@/jdk/src/share/classes/java/time/zone/ZoneRules.java
-@OPENJDK@/jdk/src/share/classes/java/time/zone/ZoneRulesException.java
-@OPENJDK@/jdk/src/share/classes/java/time/zone/ZoneRulesProvider.java
-@OPENJDK@/jdk/src/share/classes/java/time/ZonedDateTime.java
-@OPENJDK@/jdk/src/share/classes/java/time/ZoneId.java
-@OPENJDK@/jdk/src/share/classes/java/time/ZoneOffset.java
-@OPENJDK@/jdk/src/share/classes/java/time/ZoneRegion.java
-@OPENJDK@/jdk/src/share/classes/java/util/AbstractCollection.java
-@OPENJDK@/jdk/src/share/classes/java/util/AbstractList.java
-@OPENJDK@/jdk/src/share/classes/java/util/AbstractMap.java
-@OPENJDK@/jdk/src/share/classes/java/util/AbstractQueue.java
-@OPENJDK@/jdk/src/share/classes/java/util/AbstractSequentialList.java
-@OPENJDK@/jdk/src/share/classes/java/util/AbstractSet.java
-@OPENJDK@/jdk/src/share/classes/java/util/ArrayDeque.java
-@OPENJDK@/jdk/src/share/classes/java/util/ArrayList.java
-@OPENJDK@/jdk/src/share/classes/java/util/ArrayPrefixHelpers.java
-@OPENJDK@/jdk/src/share/classes/java/util/Arrays.java
-@OPENJDK@/jdk/src/share/classes/java/util/ArraysParallelSortHelpers.java
-@OPENJDK@/jdk/src/share/classes/java/util/Base64.java
-@OPENJDK@/jdk/src/share/classes/java/util/BitSet.java
-@OPENJDK@/jdk/src/share/classes/java/util/Calendar.java
-@OPENJDK@/jdk/src/share/classes/java/util/Collection.java
-@OPENJDK@/jdk/src/share/classes/java/util/Collections.java
-@OPENJDK@/jdk/src/share/classes/java/util/ComparableTimSort.java
-@OPENJDK@/jdk/src/share/classes/java/util/Comparator.java
-@OPENJDK@/jdk/src/share/classes/java/util/Comparators.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/AbstractExecutorService.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/ArrayBlockingQueue.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/atomic/AtomicMarkableReference.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/atomic/DoubleAccumulator.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/atomic/DoubleAdder.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/atomic/LongAccumulator.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/atomic/LongAdder.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/atomic/package-info.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/BlockingDeque.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/BlockingQueue.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/BrokenBarrierException.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/Callable.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/CancellationException.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/CompletableFuture.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/CompletionException.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/CompletionService.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/CompletionStage.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/ConcurrentHashMap.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/ConcurrentMap.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/ConcurrentNavigableMap.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/ConcurrentSkipListMap.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/ConcurrentSkipListSet.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/CopyOnWriteArrayList.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/CopyOnWriteArraySet.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/CountDownLatch.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/CountedCompleter.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/CyclicBarrier.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/Delayed.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/DelayQueue.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/Exchanger.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/ExecutionException.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/Executor.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/ExecutorCompletionService.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/Executors.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/ExecutorService.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/ForkJoinTask.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/ForkJoinWorkerThread.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/Future.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/FutureTask.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/LinkedBlockingDeque.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/LinkedBlockingQueue.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/LinkedTransferQueue.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/locks/AbstractOwnableSynchronizer.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/locks/Condition.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/locks/Lock.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/locks/package-info.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/locks/ReadWriteLock.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/locks/ReentrantLock.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/locks/StampedLock.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/package-info.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/Phaser.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/PriorityBlockingQueue.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/RecursiveAction.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/RecursiveTask.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/RejectedExecutionException.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/RejectedExecutionHandler.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/RunnableFuture.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/RunnableScheduledFuture.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/ScheduledExecutorService.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/ScheduledFuture.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/Semaphore.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/SynchronousQueue.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/ThreadFactory.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/ThreadLocalRandom.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/ThreadPoolExecutor.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/TimeoutException.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/TimeUnit.java
-@OPENJDK@/jdk/src/share/classes/java/util/concurrent/TransferQueue.java
-@OPENJDK@/jdk/src/share/classes/java/util/ConcurrentModificationException.java
-@OPENJDK@/jdk/src/share/classes/java/util/Currency.java
-@OPENJDK@/jdk/src/share/classes/java/util/Date.java
-@OPENJDK@/jdk/src/share/classes/java/util/Deque.java
-@OPENJDK@/jdk/src/share/classes/java/util/Dictionary.java
-@OPENJDK@/jdk/src/share/classes/java/util/DoubleSummaryStatistics.java
-@OPENJDK@/jdk/src/share/classes/java/util/DualPivotQuicksort.java
-@OPENJDK@/jdk/src/share/classes/java/util/DuplicateFormatFlagsException.java
-@OPENJDK@/jdk/src/share/classes/java/util/EmptyStackException.java
-@OPENJDK@/jdk/src/share/classes/java/util/Enumeration.java
-@OPENJDK@/jdk/src/share/classes/java/util/EnumMap.java
-@OPENJDK@/jdk/src/share/classes/java/util/EnumSet.java
-@OPENJDK@/jdk/src/share/classes/java/util/EventListener.java
-@OPENJDK@/jdk/src/share/classes/java/util/EventListenerProxy.java
-@OPENJDK@/jdk/src/share/classes/java/util/EventObject.java
-@OPENJDK@/jdk/src/share/classes/java/util/FormatFlagsConversionMismatchException.java
-@OPENJDK@/jdk/src/share/classes/java/util/Formattable.java
-@OPENJDK@/jdk/src/share/classes/java/util/FormattableFlags.java
-@OPENJDK@/jdk/src/share/classes/java/util/Formatter.java
-@OPENJDK@/jdk/src/share/classes/java/util/FormatterClosedException.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/BiConsumer.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/BiFunction.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/BinaryOperator.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/BiPredicate.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/BooleanSupplier.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/Consumer.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/DoubleBinaryOperator.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/DoubleConsumer.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/DoubleFunction.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/DoublePredicate.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/DoubleSupplier.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/DoubleToIntFunction.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/DoubleToLongFunction.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/DoubleUnaryOperator.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/Function.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/IntBinaryOperator.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/IntConsumer.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/IntFunction.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/IntPredicate.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/IntSupplier.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/IntToDoubleFunction.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/IntToLongFunction.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/IntUnaryOperator.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/LongBinaryOperator.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/LongConsumer.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/LongFunction.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/LongPredicate.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/LongSupplier.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/LongToDoubleFunction.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/LongToIntFunction.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/LongUnaryOperator.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/ObjDoubleConsumer.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/ObjIntConsumer.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/ObjLongConsumer.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/Predicate.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/Supplier.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/ToDoubleBiFunction.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/ToDoubleFunction.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/ToIntBiFunction.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/ToIntFunction.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/ToLongBiFunction.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/ToLongFunction.java
-@OPENJDK@/jdk/src/share/classes/java/util/function/UnaryOperator.java
-@OPENJDK@/jdk/src/share/classes/java/util/GregorianCalendar.java
-@OPENJDK@/jdk/src/share/classes/java/util/HashMap.java
-@OPENJDK@/jdk/src/share/classes/java/util/HashSet.java
-@OPENJDK@/jdk/src/share/classes/java/util/Hashtable.java
-@OPENJDK@/jdk/src/share/classes/java/util/IdentityHashMap.java
-@OPENJDK@/jdk/src/share/classes/java/util/IllegalFormatCodePointException.java
-@OPENJDK@/jdk/src/share/classes/java/util/IllegalFormatConversionException.java
-@OPENJDK@/jdk/src/share/classes/java/util/IllegalFormatException.java
-@OPENJDK@/jdk/src/share/classes/java/util/IllegalFormatFlagsException.java
-@OPENJDK@/jdk/src/share/classes/java/util/IllegalFormatPrecisionException.java
-@OPENJDK@/jdk/src/share/classes/java/util/IllegalFormatWidthException.java
-@OPENJDK@/jdk/src/share/classes/java/util/IllformedLocaleException.java
-@OPENJDK@/jdk/src/share/classes/java/util/InputMismatchException.java
-@OPENJDK@/jdk/src/share/classes/java/util/IntSummaryStatistics.java
-@OPENJDK@/jdk/src/share/classes/java/util/InvalidPropertiesFormatException.java
-@OPENJDK@/jdk/src/share/classes/java/util/Iterator.java
-@OPENJDK@/jdk/src/share/classes/java/util/JapaneseImperialCalendar.java
-@OPENJDK@/jdk/src/share/classes/java/util/jar/Attributes.java
-@OPENJDK@/jdk/src/share/classes/java/util/jar/JarEntry.java
-@OPENJDK@/jdk/src/share/classes/java/util/jar/JarException.java
-@OPENJDK@/jdk/src/share/classes/java/util/jar/JarFile.java
-@OPENJDK@/jdk/src/share/classes/java/util/jar/JarInputStream.java
-@OPENJDK@/jdk/src/share/classes/java/util/jar/JarOutputStream.java
-@OPENJDK@/jdk/src/share/classes/java/util/jar/JarVerifier.java
-@OPENJDK@/jdk/src/share/classes/java/util/jar/JavaUtilJarAccessImpl.java
-@OPENJDK@/jdk/src/share/classes/java/util/jar/Manifest.java
-@OPENJDK@/jdk/src/share/classes/java/util/jar/Pack200.java
-@OPENJDK@/jdk/src/share/classes/java/util/JumboEnumSet.java
-@OPENJDK@/jdk/src/share/classes/java/util/LinkedHashMap.java
-@OPENJDK@/jdk/src/share/classes/java/util/LinkedHashSet.java
-@OPENJDK@/jdk/src/share/classes/java/util/LinkedList.java
-@OPENJDK@/jdk/src/share/classes/java/util/List.java
-@OPENJDK@/jdk/src/share/classes/java/util/ListIterator.java
-@OPENJDK@/jdk/src/share/classes/java/util/ListResourceBundle.java
-@OPENJDK@/jdk/src/share/classes/java/util/Locale.java
-@OPENJDK@/jdk/src/share/classes/java/util/LocaleISOData.java
-@OPENJDK@/jdk/src/share/classes/java/util/logging/ConsoleHandler.java
-@OPENJDK@/jdk/src/share/classes/java/util/logging/ErrorManager.java
-@OPENJDK@/jdk/src/share/classes/java/util/logging/FileHandler.java
-@OPENJDK@/jdk/src/share/classes/java/util/logging/Filter.java
-@OPENJDK@/jdk/src/share/classes/java/util/logging/Formatter.java
-@OPENJDK@/jdk/src/share/classes/java/util/logging/Handler.java
-@OPENJDK@/jdk/src/share/classes/java/util/logging/Level.java
-@OPENJDK@/jdk/src/share/classes/java/util/logging/Logger.java
-@OPENJDK@/jdk/src/share/classes/java/util/logging/Logging.java
-@OPENJDK@/jdk/src/share/classes/java/util/logging/LoggingMXBean.java
-@OPENJDK@/jdk/src/share/classes/java/util/logging/LoggingPermission.java
-@OPENJDK@/jdk/src/share/classes/java/util/logging/LoggingProxyImpl.java
-@OPENJDK@/jdk/src/share/classes/java/util/logging/LogManager.java
-@OPENJDK@/jdk/src/share/classes/java/util/logging/LogRecord.java
-@OPENJDK@/jdk/src/share/classes/java/util/logging/MemoryHandler.java
-@OPENJDK@/jdk/src/share/classes/java/util/logging/SimpleFormatter.java
-@OPENJDK@/jdk/src/share/classes/java/util/logging/SocketHandler.java
-@OPENJDK@/jdk/src/share/classes/java/util/logging/StreamHandler.java
-@OPENJDK@/jdk/src/share/classes/java/util/logging/XMLFormatter.java
-@OPENJDK@/jdk/src/share/classes/java/util/LongSummaryStatistics.java
-@OPENJDK@/jdk/src/share/classes/java/util/Map.java
-@OPENJDK@/jdk/src/share/classes/java/util/MissingFormatArgumentException.java
-@OPENJDK@/jdk/src/share/classes/java/util/MissingFormatWidthException.java
-@OPENJDK@/jdk/src/share/classes/java/util/MissingResourceException.java
-@OPENJDK@/jdk/src/share/classes/java/util/NavigableMap.java
-@OPENJDK@/jdk/src/share/classes/java/util/NavigableSet.java
-@OPENJDK@/jdk/src/share/classes/java/util/NoSuchElementException.java
-@OPENJDK@/jdk/src/share/classes/java/util/Objects.java
-@OPENJDK@/jdk/src/share/classes/java/util/Observable.java
-@OPENJDK@/jdk/src/share/classes/java/util/Observer.java
-@OPENJDK@/jdk/src/share/classes/java/util/Optional.java
-@OPENJDK@/jdk/src/share/classes/java/util/OptionalDouble.java
-@OPENJDK@/jdk/src/share/classes/java/util/OptionalInt.java
-@OPENJDK@/jdk/src/share/classes/java/util/OptionalLong.java
-@OPENJDK@/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java
-@OPENJDK@/jdk/src/share/classes/java/util/prefs/BackingStoreException.java
-@OPENJDK@/jdk/src/share/classes/java/util/prefs/Base64.java
-@OPENJDK@/jdk/src/share/classes/java/util/prefs/InvalidPreferencesFormatException.java
-@OPENJDK@/jdk/src/share/classes/java/util/prefs/NodeChangeEvent.java
-@OPENJDK@/jdk/src/share/classes/java/util/prefs/NodeChangeListener.java
-@OPENJDK@/jdk/src/share/classes/java/util/prefs/PreferenceChangeEvent.java
-@OPENJDK@/jdk/src/share/classes/java/util/prefs/PreferenceChangeListener.java
-@OPENJDK@/jdk/src/share/classes/java/util/prefs/Preferences.java
-@OPENJDK@/jdk/src/share/classes/java/util/prefs/PreferencesFactory.java
-@OPENJDK@/jdk/src/share/classes/java/util/prefs/XmlSupport.java
-@OPENJDK@/jdk/src/share/classes/java/util/PrimitiveIterator.java
-@OPENJDK@/jdk/src/share/classes/java/util/PriorityQueue.java
-@OPENJDK@/jdk/src/share/classes/java/util/Properties.java
-@OPENJDK@/jdk/src/share/classes/java/util/PropertyPermission.java
-@OPENJDK@/jdk/src/share/classes/java/util/PropertyResourceBundle.java
-@OPENJDK@/jdk/src/share/classes/java/util/Queue.java
-@OPENJDK@/jdk/src/share/classes/java/util/Random.java
-@OPENJDK@/jdk/src/share/classes/java/util/RandomAccess.java
-@OPENJDK@/jdk/src/share/classes/java/util/regex/ASCII.java
-@OPENJDK@/jdk/src/share/classes/java/util/regex/Matcher.java
-@OPENJDK@/jdk/src/share/classes/java/util/regex/MatchResult.java
-@OPENJDK@/jdk/src/share/classes/java/util/regex/Pattern.java
-@OPENJDK@/jdk/src/share/classes/java/util/regex/PatternSyntaxException.java
-@OPENJDK@/jdk/src/share/classes/java/util/regex/UnicodeProp.java
-@OPENJDK@/jdk/src/share/classes/java/util/RegularEnumSet.java
-@OPENJDK@/jdk/src/share/classes/java/util/ResourceBundle.java
-@OPENJDK@/jdk/src/share/classes/java/util/Scanner.java
-@OPENJDK@/jdk/src/share/classes/java/util/ServiceConfigurationError.java
-@OPENJDK@/jdk/src/share/classes/java/util/ServiceLoader.java
-@OPENJDK@/jdk/src/share/classes/java/util/Set.java
-@OPENJDK@/jdk/src/share/classes/java/util/SimpleTimeZone.java
-@OPENJDK@/jdk/src/share/classes/java/util/SortedMap.java
-@OPENJDK@/jdk/src/share/classes/java/util/SortedSet.java
-@OPENJDK@/jdk/src/share/classes/java/util/spi/CalendarDataProvider.java
-@OPENJDK@/jdk/src/share/classes/java/util/spi/CalendarNameProvider.java
-@OPENJDK@/jdk/src/share/classes/java/util/spi/CurrencyNameProvider.java
-@OPENJDK@/jdk/src/share/classes/java/util/spi/LocaleNameProvider.java
-@OPENJDK@/jdk/src/share/classes/java/util/spi/LocaleServiceProvider.java
-@OPENJDK@/jdk/src/share/classes/java/util/spi/ResourceBundleControlProvider.java
-@OPENJDK@/jdk/src/share/classes/java/util/spi/TimeZoneNameProvider.java
-@OPENJDK@/jdk/src/share/classes/java/util/Spliterator.java
-@OPENJDK@/jdk/src/share/classes/java/util/Spliterators.java
-@OPENJDK@/jdk/src/share/classes/java/util/SplittableRandom.java
-@OPENJDK@/jdk/src/share/classes/java/util/Stack.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/AbstractPipeline.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/AbstractShortCircuitTask.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/AbstractSpinedBuffer.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/AbstractTask.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/BaseStream.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/Collector.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/Collectors.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/DistinctOps.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/DoublePipeline.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/DoubleStream.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/FindOps.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/ForEachOps.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/IntPipeline.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/IntStream.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/LongPipeline.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/LongStream.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/MatchOps.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/Node.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/Nodes.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/PipelineHelper.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/ReduceOps.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/ReferencePipeline.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/Sink.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/SliceOps.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/SortedOps.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/SpinedBuffer.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/Stream.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/StreamOpFlag.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/Streams.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/StreamShape.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/StreamSpliterators.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/StreamSupport.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/TerminalOp.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/TerminalSink.java
-@OPENJDK@/jdk/src/share/classes/java/util/stream/Tripwire.java
-@OPENJDK@/jdk/src/share/classes/java/util/StringJoiner.java
-@OPENJDK@/jdk/src/share/classes/java/util/StringTokenizer.java
-@OPENJDK@/jdk/src/share/classes/java/util/Timer.java
-@OPENJDK@/jdk/src/share/classes/java/util/TimerTask.java
-@OPENJDK@/jdk/src/share/classes/java/util/TimeZone.java
-@OPENJDK@/jdk/src/share/classes/java/util/TimSort.java
-@OPENJDK@/jdk/src/share/classes/java/util/TooManyListenersException.java
-@OPENJDK@/jdk/src/share/classes/java/util/TreeMap.java
-@OPENJDK@/jdk/src/share/classes/java/util/TreeSet.java
-@OPENJDK@/jdk/src/share/classes/java/util/Tripwire.java
-@OPENJDK@/jdk/src/share/classes/java/util/UnknownFormatConversionException.java
-@OPENJDK@/jdk/src/share/classes/java/util/UnknownFormatFlagsException.java
-@OPENJDK@/jdk/src/share/classes/java/util/UUID.java
-@OPENJDK@/jdk/src/share/classes/java/util/Vector.java
-@OPENJDK@/jdk/src/share/classes/java/util/WeakHashMap.java
-@OPENJDK@/jdk/src/share/classes/java/util/zip/CheckedInputStream.java
-@OPENJDK@/jdk/src/share/classes/java/util/zip/CheckedOutputStream.java
-@OPENJDK@/jdk/src/share/classes/java/util/zip/Checksum.java
-@OPENJDK@/jdk/src/share/classes/java/util/zip/DataFormatException.java
-@OPENJDK@/jdk/src/share/classes/java/util/zip/DeflaterInputStream.java
-@OPENJDK@/jdk/src/share/classes/java/util/zip/DeflaterOutputStream.java
-@OPENJDK@/jdk/src/share/classes/java/util/zip/GZIPInputStream.java
-@OPENJDK@/jdk/src/share/classes/java/util/zip/GZIPOutputStream.java
-@OPENJDK@/jdk/src/share/classes/java/util/zip/InflaterInputStream.java
-@OPENJDK@/jdk/src/share/classes/java/util/zip/InflaterOutputStream.java
-@OPENJDK@/jdk/src/share/classes/java/util/zip/ZipCoder.java
-@OPENJDK@/jdk/src/share/classes/java/util/zip/ZipConstants.java
-@OPENJDK@/jdk/src/share/classes/java/util/zip/ZipConstants64.java
-@OPENJDK@/jdk/src/share/classes/java/util/zip/ZipError.java
-@OPENJDK@/jdk/src/share/classes/java/util/zip/ZipException.java
-@OPENJDK@/jdk/src/share/classes/java/util/zip/ZipInputStream.java
-@OPENJDK@/jdk/src/share/classes/java/util/zip/ZipOutputStream.java
-@OPENJDK@/jdk/src/share/classes/java/util/zip/ZipUtils.java
-@OPENJDK@/jdk/src/share/classes/javax/accessibility/Accessible.java
-@OPENJDK@/jdk/src/share/classes/javax/accessibility/AccessibleAction.java
-@OPENJDK@/jdk/src/share/classes/javax/accessibility/AccessibleAttributeSequence.java
-@OPENJDK@/jdk/src/share/classes/javax/accessibility/AccessibleBundle.java
-@OPENJDK@/jdk/src/share/classes/javax/accessibility/AccessibleComponent.java
-@OPENJDK@/jdk/src/share/classes/javax/accessibility/AccessibleContext.java
-@OPENJDK@/jdk/src/share/classes/javax/accessibility/AccessibleEditableText.java
-@OPENJDK@/jdk/src/share/classes/javax/accessibility/AccessibleExtendedComponent.java
-@OPENJDK@/jdk/src/share/classes/javax/accessibility/AccessibleExtendedTable.java
-@OPENJDK@/jdk/src/share/classes/javax/accessibility/AccessibleExtendedText.java
-@OPENJDK@/jdk/src/share/classes/javax/accessibility/AccessibleHyperlink.java
-@OPENJDK@/jdk/src/share/classes/javax/accessibility/AccessibleHypertext.java
-@OPENJDK@/jdk/src/share/classes/javax/accessibility/AccessibleIcon.java
-@OPENJDK@/jdk/src/share/classes/javax/accessibility/AccessibleKeyBinding.java
-@OPENJDK@/jdk/src/share/classes/javax/accessibility/AccessibleRelation.java
-@OPENJDK@/jdk/src/share/classes/javax/accessibility/AccessibleRelationSet.java
-@OPENJDK@/jdk/src/share/classes/javax/accessibility/AccessibleResourceBundle.java
-@OPENJDK@/jdk/src/share/classes/javax/accessibility/AccessibleRole.java
-@OPENJDK@/jdk/src/share/classes/javax/accessibility/AccessibleSelection.java
-@OPENJDK@/jdk/src/share/classes/javax/accessibility/AccessibleState.java
-@OPENJDK@/jdk/src/share/classes/javax/accessibility/AccessibleStateSet.java
-@OPENJDK@/jdk/src/share/classes/javax/accessibility/AccessibleStreamable.java
-@OPENJDK@/jdk/src/share/classes/javax/accessibility/AccessibleTable.java
-@OPENJDK@/jdk/src/share/classes/javax/accessibility/AccessibleTableModelChange.java
-@OPENJDK@/jdk/src/share/classes/javax/accessibility/AccessibleText.java
-@OPENJDK@/jdk/src/share/classes/javax/accessibility/AccessibleTextSequence.java
-@OPENJDK@/jdk/src/share/classes/javax/accessibility/AccessibleValue.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/AEADBadTagException.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/BadPaddingException.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/Cipher.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/CipherInputStream.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/CipherOutputStream.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/CipherSpi.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/CryptoAllPermission.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/CryptoPermission.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/CryptoPermissions.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/CryptoPolicyParser.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/ExemptionMechanism.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/ExemptionMechanismException.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/ExemptionMechanismSpi.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/IllegalBlockSizeException.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/interfaces/DHKey.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/interfaces/DHPrivateKey.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/interfaces/DHPublicKey.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/interfaces/PBEKey.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/JarVerifier.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/JceSecurity.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/JceSecurityManager.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/KeyAgreement.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/KeyAgreementSpi.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/KeyGenerator.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/KeyGeneratorSpi.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/Mac.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/MacSpi.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/NoSuchPaddingException.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/NullCipher.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/NullCipherSpi.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/SealedObject.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/SecretKey.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/SecretKeyFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/SecretKeyFactorySpi.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/ShortBufferException.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/spec/DESedeKeySpec.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/spec/DESKeySpec.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/spec/DHGenParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/spec/DHParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/spec/DHPrivateKeySpec.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/spec/DHPublicKeySpec.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/spec/GCMParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/spec/IvParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/spec/OAEPParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/spec/PBEKeySpec.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/spec/PBEParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/spec/PSource.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/spec/RC2ParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/spec/RC5ParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/javax/crypto/spec/SecretKeySpec.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/event/IIOReadProgressListener.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/event/IIOReadUpdateListener.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/event/IIOReadWarningListener.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/event/IIOWriteProgressListener.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/event/IIOWriteWarningListener.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/IIOException.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/IIOImage.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/IIOParam.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/IIOParamController.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/ImageIO.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/ImageReader.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/ImageReadParam.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/ImageTranscoder.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/ImageTypeSpecifier.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/ImageWriteParam.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/ImageWriter.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/metadata/IIOInvalidTreeException.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/metadata/IIOMetadata.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/metadata/IIOMetadataController.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/metadata/IIOMetadataFormat.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/metadata/IIOMetadataFormatImpl.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/metadata/IIOMetadataNode.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/plugins/bmp/BMPImageWriteParam.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/plugins/jpeg/JPEGHuffmanTable.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/plugins/jpeg/JPEGImageReadParam.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/plugins/jpeg/JPEGImageWriteParam.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/plugins/jpeg/JPEGQTable.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/spi/DigraphNode.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/spi/IIORegistry.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/spi/IIOServiceProvider.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/spi/ImageInputStreamSpi.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/spi/ImageOutputStreamSpi.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/spi/ImageReaderSpi.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/spi/ImageTranscoderSpi.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/spi/ImageWriterSpi.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/spi/PartiallyOrderedSet.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/spi/RegisterableService.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/spi/ServiceRegistry.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/stream/FileCacheImageInputStream.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/stream/FileImageInputStream.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/stream/FileImageOutputStream.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/stream/IIOByteBuffer.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/stream/ImageInputStream.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/stream/ImageInputStreamImpl.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/stream/ImageOutputStream.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/stream/ImageOutputStreamImpl.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/stream/MemoryCache.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/stream/MemoryCacheImageInputStream.java
-@OPENJDK@/jdk/src/share/classes/javax/imageio/stream/MemoryCacheImageOutputStream.java
-@OPENJDK@/jdk/src/share/classes/javax/management/AndQueryExp.java
-@OPENJDK@/jdk/src/share/classes/javax/management/Attribute.java
-@OPENJDK@/jdk/src/share/classes/javax/management/AttributeChangeNotification.java
-@OPENJDK@/jdk/src/share/classes/javax/management/AttributeChangeNotificationFilter.java
-@OPENJDK@/jdk/src/share/classes/javax/management/AttributeList.java
-@OPENJDK@/jdk/src/share/classes/javax/management/AttributeNotFoundException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/AttributeValueExp.java
-@OPENJDK@/jdk/src/share/classes/javax/management/BadAttributeValueExpException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/BadBinaryOpValueExpException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/BadStringOperationException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/BetweenQueryExp.java
-@OPENJDK@/jdk/src/share/classes/javax/management/BinaryOpValueExp.java
-@OPENJDK@/jdk/src/share/classes/javax/management/BinaryRelQueryExp.java
-@OPENJDK@/jdk/src/share/classes/javax/management/BooleanValueExp.java
-@OPENJDK@/jdk/src/share/classes/javax/management/ClassAttributeValueExp.java
-@OPENJDK@/jdk/src/share/classes/javax/management/DefaultLoaderRepository.java
-@OPENJDK@/jdk/src/share/classes/javax/management/Descriptor.java
-@OPENJDK@/jdk/src/share/classes/javax/management/DescriptorAccess.java
-@OPENJDK@/jdk/src/share/classes/javax/management/DescriptorKey.java
-@OPENJDK@/jdk/src/share/classes/javax/management/DescriptorRead.java
-@OPENJDK@/jdk/src/share/classes/javax/management/DynamicMBean.java
-@OPENJDK@/jdk/src/share/classes/javax/management/ImmutableDescriptor.java
-@OPENJDK@/jdk/src/share/classes/javax/management/InQueryExp.java
-@OPENJDK@/jdk/src/share/classes/javax/management/InstanceAlreadyExistsException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/InstanceNotFoundException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/InstanceOfQueryExp.java
-@OPENJDK@/jdk/src/share/classes/javax/management/IntrospectionException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/InvalidApplicationException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/InvalidAttributeValueException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/JMException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/JMRuntimeException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/JMX.java
-@OPENJDK@/jdk/src/share/classes/javax/management/ListenerNotFoundException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/loading/ClassLoaderRepository.java
-@OPENJDK@/jdk/src/share/classes/javax/management/loading/DefaultLoaderRepository.java
-@OPENJDK@/jdk/src/share/classes/javax/management/loading/MLet.java
-@OPENJDK@/jdk/src/share/classes/javax/management/loading/MLetContent.java
-@OPENJDK@/jdk/src/share/classes/javax/management/loading/MLetMBean.java
-@OPENJDK@/jdk/src/share/classes/javax/management/loading/MLetObjectInputStream.java
-@OPENJDK@/jdk/src/share/classes/javax/management/loading/MLetParser.java
-@OPENJDK@/jdk/src/share/classes/javax/management/loading/PrivateClassLoader.java
-@OPENJDK@/jdk/src/share/classes/javax/management/loading/PrivateMLet.java
-@OPENJDK@/jdk/src/share/classes/javax/management/MalformedObjectNameException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/MatchQueryExp.java
-@OPENJDK@/jdk/src/share/classes/javax/management/MBeanAttributeInfo.java
-@OPENJDK@/jdk/src/share/classes/javax/management/MBeanConstructorInfo.java
-@OPENJDK@/jdk/src/share/classes/javax/management/MBeanException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/MBeanFeatureInfo.java
-@OPENJDK@/jdk/src/share/classes/javax/management/MBeanInfo.java
-@OPENJDK@/jdk/src/share/classes/javax/management/MBeanNotificationInfo.java
-@OPENJDK@/jdk/src/share/classes/javax/management/MBeanOperationInfo.java
-@OPENJDK@/jdk/src/share/classes/javax/management/MBeanParameterInfo.java
-@OPENJDK@/jdk/src/share/classes/javax/management/MBeanPermission.java
-@OPENJDK@/jdk/src/share/classes/javax/management/MBeanRegistration.java
-@OPENJDK@/jdk/src/share/classes/javax/management/MBeanRegistrationException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/MBeanServer.java
-@OPENJDK@/jdk/src/share/classes/javax/management/MBeanServerBuilder.java
-@OPENJDK@/jdk/src/share/classes/javax/management/MBeanServerConnection.java
-@OPENJDK@/jdk/src/share/classes/javax/management/MBeanServerDelegate.java
-@OPENJDK@/jdk/src/share/classes/javax/management/MBeanServerDelegateMBean.java
-@OPENJDK@/jdk/src/share/classes/javax/management/MBeanServerFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/management/MBeanServerInvocationHandler.java
-@OPENJDK@/jdk/src/share/classes/javax/management/MBeanServerNotification.java
-@OPENJDK@/jdk/src/share/classes/javax/management/MBeanServerPermission.java
-@OPENJDK@/jdk/src/share/classes/javax/management/MBeanTrustPermission.java
-@OPENJDK@/jdk/src/share/classes/javax/management/modelmbean/DescriptorSupport.java
-@OPENJDK@/jdk/src/share/classes/javax/management/modelmbean/InvalidTargetObjectTypeException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/modelmbean/ModelMBean.java
-@OPENJDK@/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanAttributeInfo.java
-@OPENJDK@/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanConstructorInfo.java
-@OPENJDK@/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanInfo.java
-@OPENJDK@/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanInfoSupport.java
-@OPENJDK@/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationBroadcaster.java
-@OPENJDK@/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationInfo.java
-@OPENJDK@/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanOperationInfo.java
-@OPENJDK@/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java
-@OPENJDK@/jdk/src/share/classes/javax/management/modelmbean/XMLParseException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/monitor/CounterMonitor.java
-@OPENJDK@/jdk/src/share/classes/javax/management/monitor/CounterMonitorMBean.java
-@OPENJDK@/jdk/src/share/classes/javax/management/monitor/GaugeMonitor.java
-@OPENJDK@/jdk/src/share/classes/javax/management/monitor/GaugeMonitorMBean.java
-@OPENJDK@/jdk/src/share/classes/javax/management/monitor/Monitor.java
-@OPENJDK@/jdk/src/share/classes/javax/management/monitor/MonitorMBean.java
-@OPENJDK@/jdk/src/share/classes/javax/management/monitor/MonitorNotification.java
-@OPENJDK@/jdk/src/share/classes/javax/management/monitor/MonitorSettingException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/monitor/StringMonitor.java
-@OPENJDK@/jdk/src/share/classes/javax/management/monitor/StringMonitorMBean.java
-@OPENJDK@/jdk/src/share/classes/javax/management/MXBean.java
-@OPENJDK@/jdk/src/share/classes/javax/management/NotCompliantMBeanException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/Notification.java
-@OPENJDK@/jdk/src/share/classes/javax/management/NotificationBroadcaster.java
-@OPENJDK@/jdk/src/share/classes/javax/management/NotificationBroadcasterSupport.java
-@OPENJDK@/jdk/src/share/classes/javax/management/NotificationEmitter.java
-@OPENJDK@/jdk/src/share/classes/javax/management/NotificationFilter.java
-@OPENJDK@/jdk/src/share/classes/javax/management/NotificationFilterSupport.java
-@OPENJDK@/jdk/src/share/classes/javax/management/NotificationListener.java
-@OPENJDK@/jdk/src/share/classes/javax/management/NotQueryExp.java
-@OPENJDK@/jdk/src/share/classes/javax/management/NumericValueExp.java
-@OPENJDK@/jdk/src/share/classes/javax/management/ObjectInstance.java
-@OPENJDK@/jdk/src/share/classes/javax/management/ObjectName.java
-@OPENJDK@/jdk/src/share/classes/javax/management/openmbean/ArrayType.java
-@OPENJDK@/jdk/src/share/classes/javax/management/openmbean/CompositeData.java
-@OPENJDK@/jdk/src/share/classes/javax/management/openmbean/CompositeDataInvocationHandler.java
-@OPENJDK@/jdk/src/share/classes/javax/management/openmbean/CompositeDataSupport.java
-@OPENJDK@/jdk/src/share/classes/javax/management/openmbean/CompositeDataView.java
-@OPENJDK@/jdk/src/share/classes/javax/management/openmbean/CompositeType.java
-@OPENJDK@/jdk/src/share/classes/javax/management/openmbean/InvalidKeyException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/openmbean/InvalidOpenTypeException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/openmbean/KeyAlreadyExistsException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/openmbean/OpenDataException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfo.java
-@OPENJDK@/jdk/src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java
-@OPENJDK@/jdk/src/share/classes/javax/management/openmbean/OpenMBeanConstructorInfo.java
-@OPENJDK@/jdk/src/share/classes/javax/management/openmbean/OpenMBeanConstructorInfoSupport.java
-@OPENJDK@/jdk/src/share/classes/javax/management/openmbean/OpenMBeanInfo.java
-@OPENJDK@/jdk/src/share/classes/javax/management/openmbean/OpenMBeanInfoSupport.java
-@OPENJDK@/jdk/src/share/classes/javax/management/openmbean/OpenMBeanOperationInfo.java
-@OPENJDK@/jdk/src/share/classes/javax/management/openmbean/OpenMBeanOperationInfoSupport.java
-@OPENJDK@/jdk/src/share/classes/javax/management/openmbean/OpenMBeanParameterInfo.java
-@OPENJDK@/jdk/src/share/classes/javax/management/openmbean/OpenMBeanParameterInfoSupport.java
-@OPENJDK@/jdk/src/share/classes/javax/management/openmbean/OpenType.java
-@OPENJDK@/jdk/src/share/classes/javax/management/openmbean/SimpleType.java
-@OPENJDK@/jdk/src/share/classes/javax/management/openmbean/TabularData.java
-@OPENJDK@/jdk/src/share/classes/javax/management/openmbean/TabularDataSupport.java
-@OPENJDK@/jdk/src/share/classes/javax/management/openmbean/TabularType.java
-@OPENJDK@/jdk/src/share/classes/javax/management/OperationsException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/OrQueryExp.java
-@OPENJDK@/jdk/src/share/classes/javax/management/PersistentMBean.java
-@OPENJDK@/jdk/src/share/classes/javax/management/QualifiedAttributeValueExp.java
-@OPENJDK@/jdk/src/share/classes/javax/management/Query.java
-@OPENJDK@/jdk/src/share/classes/javax/management/QueryEval.java
-@OPENJDK@/jdk/src/share/classes/javax/management/QueryExp.java
-@OPENJDK@/jdk/src/share/classes/javax/management/ReflectionException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/relation/InvalidRelationIdException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/relation/InvalidRelationServiceException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/relation/InvalidRelationTypeException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/relation/InvalidRoleInfoException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/relation/InvalidRoleValueException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/relation/MBeanServerNotificationFilter.java
-@OPENJDK@/jdk/src/share/classes/javax/management/relation/Relation.java
-@OPENJDK@/jdk/src/share/classes/javax/management/relation/RelationException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/relation/RelationNotFoundException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/relation/RelationNotification.java
-@OPENJDK@/jdk/src/share/classes/javax/management/relation/RelationService.java
-@OPENJDK@/jdk/src/share/classes/javax/management/relation/RelationServiceMBean.java
-@OPENJDK@/jdk/src/share/classes/javax/management/relation/RelationServiceNotRegisteredException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/relation/RelationSupport.java
-@OPENJDK@/jdk/src/share/classes/javax/management/relation/RelationSupportMBean.java
-@OPENJDK@/jdk/src/share/classes/javax/management/relation/RelationType.java
-@OPENJDK@/jdk/src/share/classes/javax/management/relation/RelationTypeNotFoundException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/relation/RelationTypeSupport.java
-@OPENJDK@/jdk/src/share/classes/javax/management/relation/Role.java
-@OPENJDK@/jdk/src/share/classes/javax/management/relation/RoleInfo.java
-@OPENJDK@/jdk/src/share/classes/javax/management/relation/RoleInfoNotFoundException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/relation/RoleList.java
-@OPENJDK@/jdk/src/share/classes/javax/management/relation/RoleNotFoundException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/relation/RoleResult.java
-@OPENJDK@/jdk/src/share/classes/javax/management/relation/RoleStatus.java
-@OPENJDK@/jdk/src/share/classes/javax/management/relation/RoleUnresolved.java
-@OPENJDK@/jdk/src/share/classes/javax/management/relation/RoleUnresolvedList.java
-@OPENJDK@/jdk/src/share/classes/javax/management/remote/JMXAddressable.java
-@OPENJDK@/jdk/src/share/classes/javax/management/remote/JMXAuthenticator.java
-@OPENJDK@/jdk/src/share/classes/javax/management/remote/JMXConnectionNotification.java
-@OPENJDK@/jdk/src/share/classes/javax/management/remote/JMXConnector.java
-@OPENJDK@/jdk/src/share/classes/javax/management/remote/JMXConnectorFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/management/remote/JMXConnectorProvider.java
-@OPENJDK@/jdk/src/share/classes/javax/management/remote/JMXConnectorServer.java
-@OPENJDK@/jdk/src/share/classes/javax/management/remote/JMXConnectorServerFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/management/remote/JMXConnectorServerMBean.java
-@OPENJDK@/jdk/src/share/classes/javax/management/remote/JMXConnectorServerProvider.java
-@OPENJDK@/jdk/src/share/classes/javax/management/remote/JMXPrincipal.java
-@OPENJDK@/jdk/src/share/classes/javax/management/remote/JMXProviderException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/remote/JMXServerErrorException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/remote/JMXServiceURL.java
-@OPENJDK@/jdk/src/share/classes/javax/management/remote/MBeanServerForwarder.java
-@OPENJDK@/jdk/src/share/classes/javax/management/remote/NotificationResult.java
-@OPENJDK@/jdk/src/share/classes/javax/management/remote/rmi/NoCallStackClassLoader.java
-@OPENJDK@/jdk/src/share/classes/javax/management/remote/rmi/RMIConnection.java
-@OPENJDK@/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java
-@OPENJDK@/jdk/src/share/classes/javax/management/remote/rmi/RMIConnector.java
-@OPENJDK@/jdk/src/share/classes/javax/management/remote/rmi/RMIConnectorServer.java
-@OPENJDK@/jdk/src/share/classes/javax/management/remote/rmi/RMIIIOPServerImpl.java
-@OPENJDK@/jdk/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java
-@OPENJDK@/jdk/src/share/classes/javax/management/remote/rmi/RMIServer.java
-@OPENJDK@/jdk/src/share/classes/javax/management/remote/rmi/RMIServerImpl.java
-@OPENJDK@/jdk/src/share/classes/javax/management/remote/SubjectDelegationPermission.java
-@OPENJDK@/jdk/src/share/classes/javax/management/remote/TargetedNotification.java
-@OPENJDK@/jdk/src/share/classes/javax/management/RuntimeErrorException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/RuntimeMBeanException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/RuntimeOperationsException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/ServiceNotFoundException.java
-@OPENJDK@/jdk/src/share/classes/javax/management/StandardEmitterMBean.java
-@OPENJDK@/jdk/src/share/classes/javax/management/StandardMBean.java
-@OPENJDK@/jdk/src/share/classes/javax/management/StringValueExp.java
-@OPENJDK@/jdk/src/share/classes/javax/management/timer/Timer.java
-@OPENJDK@/jdk/src/share/classes/javax/management/timer/TimerAlarmClock.java
-@OPENJDK@/jdk/src/share/classes/javax/management/timer/TimerAlarmClockNotification.java
-@OPENJDK@/jdk/src/share/classes/javax/management/timer/TimerMBean.java
-@OPENJDK@/jdk/src/share/classes/javax/management/timer/TimerNotification.java
-@OPENJDK@/jdk/src/share/classes/javax/management/ValueExp.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/AuthenticationException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/AuthenticationNotSupportedException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/BinaryRefAddr.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/Binding.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/CannotProceedException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/CommunicationException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/CompositeName.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/CompoundName.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/ConfigurationException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/Context.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/ContextNotEmptyException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/directory/Attribute.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/directory/AttributeInUseException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/directory/AttributeModificationException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/directory/Attributes.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/directory/BasicAttribute.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/directory/BasicAttributes.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/directory/DirContext.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/directory/InitialDirContext.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/directory/InvalidAttributeIdentifierException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/directory/InvalidAttributesException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/directory/InvalidAttributeValueException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/directory/InvalidSearchControlsException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/directory/InvalidSearchFilterException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/directory/ModificationItem.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/directory/NoSuchAttributeException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/directory/SchemaViolationException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/directory/SearchControls.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/directory/SearchResult.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/event/EventContext.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/event/EventDirContext.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/event/NamespaceChangeListener.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/event/NamingEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/event/NamingExceptionEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/event/NamingListener.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/event/ObjectChangeListener.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/InitialContext.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/InsufficientResourcesException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/InterruptedNamingException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/InvalidNameException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/ldap/BasicControl.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/ldap/Control.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/ldap/ControlFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/ldap/ExtendedRequest.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/ldap/ExtendedResponse.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/ldap/HasControls.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/ldap/InitialLdapContext.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/ldap/LdapContext.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/ldap/LdapName.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/ldap/LdapReferralException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/ldap/ManageReferralControl.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/ldap/PagedResultsControl.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/ldap/PagedResultsResponseControl.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/ldap/Rdn.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/ldap/Rfc2253Parser.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/ldap/SortControl.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/ldap/SortKey.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/ldap/SortResponseControl.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/ldap/StartTlsRequest.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/ldap/StartTlsResponse.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/ldap/UnsolicitedNotification.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/ldap/UnsolicitedNotificationEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/ldap/UnsolicitedNotificationListener.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/LimitExceededException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/LinkException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/LinkLoopException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/LinkRef.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/MalformedLinkException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/Name.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/NameAlreadyBoundException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/NameClassPair.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/NameImpl.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/NameNotFoundException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/NameParser.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/NamingEnumeration.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/NamingException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/NamingSecurityException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/NoInitialContextException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/NoPermissionException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/NotContextException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/OperationNotSupportedException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/PartialResultException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/RefAddr.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/Reference.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/Referenceable.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/ReferralException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/ServiceUnavailableException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/SizeLimitExceededException.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/spi/ContinuationContext.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/spi/ContinuationDirContext.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/spi/DirectoryManager.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/spi/DirObjectFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/spi/DirStateFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/spi/InitialContextFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/spi/InitialContextFactoryBuilder.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/spi/NamingManager.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/spi/ObjectFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/spi/ObjectFactoryBuilder.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/spi/Resolver.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/spi/ResolveResult.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/spi/StateFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/StringRefAddr.java
-@OPENJDK@/jdk/src/share/classes/javax/naming/TimeLimitExceededException.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ServerSocketFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/net/SocketFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/CertPathTrustManagerParameters.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/ExtendedSSLSession.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/HandshakeCompletedEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/HandshakeCompletedListener.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/HostnameVerifier.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/HttpsURLConnection.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/KeyManager.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/KeyManagerFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/KeyManagerFactorySpi.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/KeyStoreBuilderParameters.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/ManagerFactoryParameters.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/SNIHostName.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/SNIMatcher.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/SNIServerName.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/SSLContext.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/SSLContextSpi.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/SSLEngine.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/SSLEngineResult.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/SSLException.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/SSLHandshakeException.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/SSLKeyException.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/SSLParameters.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/SSLPeerUnverifiedException.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/SSLPermission.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/SSLProtocolException.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/SSLServerSocket.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/SSLServerSocketFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/SSLSession.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/SSLSessionBindingEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/SSLSessionBindingListener.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/SSLSessionContext.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/SSLSocket.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/SSLSocketFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/StandardConstants.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/TrustManager.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/TrustManagerFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/TrustManagerFactorySpi.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/X509ExtendedKeyManager.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/X509ExtendedTrustManager.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/X509KeyManager.java
-@OPENJDK@/jdk/src/share/classes/javax/net/ssl/X509TrustManager.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/Attribute.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/AttributeSet.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/AttributeSetUtilities.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/DateTimeSyntax.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/DocAttribute.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/DocAttributeSet.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/EnumSyntax.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/HashAttributeSet.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/HashDocAttributeSet.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/HashPrintJobAttributeSet.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/HashPrintRequestAttributeSet.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/HashPrintServiceAttributeSet.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/IntegerSyntax.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/PrintJobAttribute.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/PrintJobAttributeSet.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/PrintRequestAttribute.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/PrintRequestAttributeSet.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/PrintServiceAttribute.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/PrintServiceAttributeSet.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/ResolutionSyntax.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/SetOfIntegerSyntax.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/Size2DSyntax.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/Chromaticity.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/ColorSupported.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/Compression.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/Copies.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/CopiesSupported.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/DateTimeAtCompleted.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/DateTimeAtCreation.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/DateTimeAtProcessing.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/Destination.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/DialogTypeSelection.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/DocumentName.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/Fidelity.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/Finishings.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/JobHoldUntil.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/JobImpressions.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/JobImpressionsCompleted.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/JobImpressionsSupported.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/JobKOctets.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/JobKOctetsProcessed.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/JobKOctetsSupported.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/JobMediaSheets.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/JobMediaSheetsCompleted.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/JobMediaSheetsSupported.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/JobMessageFromOperator.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/JobName.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/JobOriginatingUserName.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/JobPriority.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/JobPrioritySupported.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/JobSheets.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/JobState.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/JobStateReason.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/JobStateReasons.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/Media.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/MediaName.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/MediaPrintableArea.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/MediaSize.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/MediaSizeName.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/MediaTray.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/MultipleDocumentHandling.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/NumberOfDocuments.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/NumberOfInterveningJobs.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/NumberUp.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/NumberUpSupported.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/OrientationRequested.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/OutputDeviceAssigned.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/PageRanges.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/PagesPerMinute.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/PagesPerMinuteColor.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/PDLOverrideSupported.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/PresentationDirection.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/PrinterInfo.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/PrinterIsAcceptingJobs.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/PrinterLocation.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/PrinterMakeAndModel.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/PrinterMessageFromOperator.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/PrinterMoreInfo.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/PrinterName.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/PrinterResolution.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/PrinterState.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/PrinterStateReason.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/PrinterStateReasons.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/PrinterURI.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/PrintQuality.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/QueuedJobCount.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/RequestingUserName.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/Severity.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/SheetCollate.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/Sides.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/SupportedValuesAttribute.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/TextSyntax.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/UnmodifiableSetException.java
-@OPENJDK@/jdk/src/share/classes/javax/print/attribute/URISyntax.java
-@OPENJDK@/jdk/src/share/classes/javax/print/AttributeException.java
-@OPENJDK@/jdk/src/share/classes/javax/print/CancelablePrintJob.java
-@OPENJDK@/jdk/src/share/classes/javax/print/Doc.java
-@OPENJDK@/jdk/src/share/classes/javax/print/DocFlavor.java
-@OPENJDK@/jdk/src/share/classes/javax/print/DocPrintJob.java
-@OPENJDK@/jdk/src/share/classes/javax/print/event/PrintEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/print/event/PrintJobAdapter.java
-@OPENJDK@/jdk/src/share/classes/javax/print/event/PrintJobAttributeEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/print/event/PrintJobAttributeListener.java
-@OPENJDK@/jdk/src/share/classes/javax/print/event/PrintJobEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/print/event/PrintJobListener.java
-@OPENJDK@/jdk/src/share/classes/javax/print/event/PrintServiceAttributeEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/print/event/PrintServiceAttributeListener.java
-@OPENJDK@/jdk/src/share/classes/javax/print/FlavorException.java
-@OPENJDK@/jdk/src/share/classes/javax/print/MimeType.java
-@OPENJDK@/jdk/src/share/classes/javax/print/MultiDoc.java
-@OPENJDK@/jdk/src/share/classes/javax/print/MultiDocPrintJob.java
-@OPENJDK@/jdk/src/share/classes/javax/print/MultiDocPrintService.java
-@OPENJDK@/jdk/src/share/classes/javax/print/PrintException.java
-@OPENJDK@/jdk/src/share/classes/javax/print/PrintService.java
-@OPENJDK@/jdk/src/share/classes/javax/print/PrintServiceLookup.java
-@OPENJDK@/jdk/src/share/classes/javax/print/ServiceUI.java
-@OPENJDK@/jdk/src/share/classes/javax/print/ServiceUIFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/print/SimpleDoc.java
-@OPENJDK@/jdk/src/share/classes/javax/print/StreamPrintService.java
-@OPENJDK@/jdk/src/share/classes/javax/print/StreamPrintServiceFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/print/URIException.java
-@OPENJDK@/jdk/src/share/classes/javax/rmi/ssl/SslRMIClientSocketFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/rmi/ssl/SslRMIServerSocketFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/script/AbstractScriptEngine.java
-@OPENJDK@/jdk/src/share/classes/javax/script/Bindings.java
-@OPENJDK@/jdk/src/share/classes/javax/script/Compilable.java
-@OPENJDK@/jdk/src/share/classes/javax/script/CompiledScript.java
-@OPENJDK@/jdk/src/share/classes/javax/script/Invocable.java
-@OPENJDK@/jdk/src/share/classes/javax/script/ScriptContext.java
-@OPENJDK@/jdk/src/share/classes/javax/script/ScriptEngine.java
-@OPENJDK@/jdk/src/share/classes/javax/script/ScriptEngineFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/script/ScriptEngineManager.java
-@OPENJDK@/jdk/src/share/classes/javax/script/ScriptException.java
-@OPENJDK@/jdk/src/share/classes/javax/script/SimpleBindings.java
-@OPENJDK@/jdk/src/share/classes/javax/script/SimpleScriptContext.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/AuthPermission.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/callback/Callback.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/callback/CallbackHandler.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/callback/ChoiceCallback.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/callback/ConfirmationCallback.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/callback/LanguageCallback.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/callback/NameCallback.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/callback/PasswordCallback.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/callback/TextInputCallback.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/callback/TextOutputCallback.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/callback/UnsupportedCallbackException.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/Destroyable.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/DestroyFailedException.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/kerberos/JavaxSecurityAuthKerberosAccessImpl.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/kerberos/KerberosKey.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/kerberos/KerberosTicket.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/kerberos/KeyImpl.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/kerberos/KeyTab.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/login/AccountException.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/login/AccountExpiredException.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/login/AccountLockedException.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/login/AccountNotFoundException.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/login/AppConfigurationEntry.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/login/Configuration.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/login/ConfigurationSpi.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/login/CredentialException.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/login/CredentialExpiredException.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/login/CredentialNotFoundException.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/login/FailedLoginException.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/login/LoginContext.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/login/LoginException.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/Policy.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/Refreshable.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/RefreshFailedException.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/spi/LoginModule.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/Subject.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/x500/X500Principal.java
-@OPENJDK@/jdk/src/share/classes/javax/security/auth/x500/X500PrivateCredential.java
-@OPENJDK@/jdk/src/share/classes/javax/security/cert/Certificate.java
-@OPENJDK@/jdk/src/share/classes/javax/security/cert/CertificateEncodingException.java
-@OPENJDK@/jdk/src/share/classes/javax/security/cert/CertificateException.java
-@OPENJDK@/jdk/src/share/classes/javax/security/cert/CertificateExpiredException.java
-@OPENJDK@/jdk/src/share/classes/javax/security/cert/CertificateNotYetValidException.java
-@OPENJDK@/jdk/src/share/classes/javax/security/cert/CertificateParsingException.java
-@OPENJDK@/jdk/src/share/classes/javax/security/cert/X509Certificate.java
-@OPENJDK@/jdk/src/share/classes/javax/security/sasl/AuthenticationException.java
-@OPENJDK@/jdk/src/share/classes/javax/security/sasl/AuthorizeCallback.java
-@OPENJDK@/jdk/src/share/classes/javax/security/sasl/RealmCallback.java
-@OPENJDK@/jdk/src/share/classes/javax/security/sasl/RealmChoiceCallback.java
-@OPENJDK@/jdk/src/share/classes/javax/security/sasl/Sasl.java
-@OPENJDK@/jdk/src/share/classes/javax/security/sasl/SaslClient.java
-@OPENJDK@/jdk/src/share/classes/javax/security/sasl/SaslClientFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/security/sasl/SaslException.java
-@OPENJDK@/jdk/src/share/classes/javax/security/sasl/SaslServer.java
-@OPENJDK@/jdk/src/share/classes/javax/security/sasl/SaslServerFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/smartcardio/ATR.java
-@OPENJDK@/jdk/src/share/classes/javax/smartcardio/Card.java
-@OPENJDK@/jdk/src/share/classes/javax/smartcardio/CardChannel.java
-@OPENJDK@/jdk/src/share/classes/javax/smartcardio/CardException.java
-@OPENJDK@/jdk/src/share/classes/javax/smartcardio/CardNotPresentException.java
-@OPENJDK@/jdk/src/share/classes/javax/smartcardio/CardPermission.java
-@OPENJDK@/jdk/src/share/classes/javax/smartcardio/CardTerminal.java
-@OPENJDK@/jdk/src/share/classes/javax/smartcardio/CardTerminals.java
-@OPENJDK@/jdk/src/share/classes/javax/smartcardio/CommandAPDU.java
-@OPENJDK@/jdk/src/share/classes/javax/smartcardio/ResponseAPDU.java
-@OPENJDK@/jdk/src/share/classes/javax/smartcardio/TerminalFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/smartcardio/TerminalFactorySpi.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/ControllerEventListener.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/Instrument.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/InvalidMidiDataException.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/MetaEventListener.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/MetaMessage.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/MidiChannel.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/MidiDevice.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/MidiDeviceReceiver.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/MidiDeviceTransmitter.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/MidiEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/MidiFileFormat.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/MidiMessage.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/MidiSystem.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/MidiUnavailableException.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/Patch.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/Receiver.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/Sequence.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/Sequencer.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/ShortMessage.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/Soundbank.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/SoundbankResource.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/spi/MidiDeviceProvider.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/spi/MidiFileReader.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/spi/MidiFileWriter.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/spi/SoundbankReader.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/Synthesizer.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/SysexMessage.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/Track.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/Transmitter.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/midi/VoiceStatus.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/sampled/AudioFileFormat.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/sampled/AudioFormat.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/sampled/AudioInputStream.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/sampled/AudioPermission.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/sampled/AudioSystem.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/sampled/BooleanControl.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/sampled/Clip.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/sampled/CompoundControl.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/sampled/Control.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/sampled/DataLine.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/sampled/EnumControl.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/sampled/FloatControl.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/sampled/Line.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/sampled/LineEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/sampled/LineListener.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/sampled/LineUnavailableException.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/sampled/Mixer.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/sampled/Port.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/sampled/ReverbType.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/sampled/SourceDataLine.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/sampled/spi/AudioFileReader.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/sampled/spi/AudioFileWriter.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/sampled/spi/FormatConversionProvider.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/sampled/spi/MixerProvider.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/sampled/TargetDataLine.java
-@OPENJDK@/jdk/src/share/classes/javax/sound/sampled/UnsupportedAudioFileException.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/CommonDataSource.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/ConnectionEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/ConnectionEventListener.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/ConnectionPoolDataSource.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/DataSource.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/PooledConnection.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/RowSet.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/BaseRowSet.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/CachedRowSet.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/FilteredRowSet.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/JdbcRowSet.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/Joinable.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/JoinRowSet.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/Predicate.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/RowSetFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/RowSetProvider.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/RowSetWarning.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/serial/SerialArray.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/serial/SerialBlob.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/serial/SerialDatalink.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/serial/SerialException.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/serial/SerialJavaObject.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/serial/SerialRef.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/serial/SerialStruct.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/serial/SQLInputImpl.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/spi/SyncFactoryException.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/spi/SyncProvider.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/spi/SyncProviderException.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/spi/SyncResolver.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/spi/TransactionalWriter.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/spi/XmlReader.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/spi/XmlWriter.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/rowset/WebRowSet.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/RowSetEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/RowSetInternal.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/RowSetListener.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/RowSetMetaData.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/RowSetReader.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/RowSetWriter.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/StatementEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/StatementEventListener.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/XAConnection.java
-@OPENJDK@/jdk/src/share/classes/javax/sql/XADataSource.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/AbstractAction.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/AbstractButton.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/AbstractCellEditor.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/AbstractListModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/AbstractSpinnerModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/Action.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/ActionMap.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/ActionPropertyChangeListener.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/AncestorNotifier.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/ArrayTable.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/Autoscroller.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/border/AbstractBorder.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/border/BevelBorder.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/border/Border.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/border/CompoundBorder.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/border/EmptyBorder.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/border/EtchedBorder.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/border/LineBorder.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/border/MatteBorder.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/border/SoftBevelBorder.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/border/StrokeBorder.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/border/TitledBorder.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/BorderFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/BoundedRangeModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/Box.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/BoxLayout.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/BufferStrategyPaintManager.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/ButtonGroup.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/ButtonModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/CellEditor.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/CellRendererPane.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/ClientPropertyKey.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/colorchooser/CenterLayout.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/colorchooser/ColorChooserPanel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/colorchooser/ColorModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/colorchooser/ColorModelCMYK.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/colorchooser/ColorModelHSL.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/colorchooser/ColorModelHSV.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/colorchooser/ColorPanel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/colorchooser/ColorSelectionModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/colorchooser/DefaultColorSelectionModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/colorchooser/DefaultPreviewPanel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/colorchooser/DiagramComponent.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/colorchooser/SlidingSpinner.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/colorchooser/SmartGridLayout.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/colorchooser/ValueFormatter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/ComboBoxEditor.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/ComboBoxModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/ComponentInputMap.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/DebugGraphics.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/DebugGraphicsFilter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/DebugGraphicsInfo.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/DebugGraphicsObserver.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/DefaultBoundedRangeModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/DefaultButtonModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/DefaultCellEditor.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/DefaultComboBoxModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/DefaultDesktopManager.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/DefaultFocusManager.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/DefaultListCellRenderer.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/DefaultListModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/DefaultListSelectionModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/DefaultRowSorter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/DefaultSingleSelectionModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/DelegatingDefaultFocusManager.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/DesktopManager.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/DropMode.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/AncestorEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/AncestorListener.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/CaretEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/CaretListener.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/CellEditorListener.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/ChangeEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/ChangeListener.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/DocumentEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/DocumentListener.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/EventListenerList.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/HyperlinkEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/HyperlinkListener.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/InternalFrameAdapter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/InternalFrameEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/InternalFrameListener.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/ListDataEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/ListDataListener.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/ListSelectionEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/ListSelectionListener.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/MenuDragMouseEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/MenuDragMouseListener.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/MenuEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/MenuKeyEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/MenuKeyListener.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/MenuListener.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/MouseInputAdapter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/MouseInputListener.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/PopupMenuEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/PopupMenuListener.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/RowSorterEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/RowSorterListener.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/SwingPropertyChangeSupport.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/TableColumnModelEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/TableColumnModelListener.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/TableModelEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/TableModelListener.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/TreeExpansionEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/TreeExpansionListener.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/TreeModelEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/TreeModelListener.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/TreeSelectionEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/TreeSelectionListener.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/TreeWillExpandListener.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/UndoableEditEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/event/UndoableEditListener.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/filechooser/FileFilter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/filechooser/FileNameExtensionFilter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/filechooser/FileSystemView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/filechooser/FileView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/FocusManager.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/GraphicsWrapper.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/GrayFilter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/GroupLayout.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/Icon.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/ImageIcon.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/InputMap.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/InputVerifier.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/InternalFrameFocusTraversalPolicy.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JApplet.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JButton.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JCheckBox.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JCheckBoxMenuItem.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JColorChooser.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JComboBox.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JComponent.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JDesktopPane.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JDialog.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JEditorPane.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JFileChooser.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JFormattedTextField.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JFrame.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JInternalFrame.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JLabel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JLayer.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JLayeredPane.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JList.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JMenu.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JMenuBar.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JMenuItem.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JOptionPane.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JPanel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JPasswordField.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JPopupMenu.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JProgressBar.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JRadioButton.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JRadioButtonMenuItem.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JRootPane.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JScrollBar.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JScrollPane.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JSeparator.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JSlider.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JSpinner.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JSplitPane.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JTabbedPane.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JTable.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JTextArea.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JTextField.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JTextPane.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JToggleButton.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JToolBar.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JToolTip.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JTree.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JViewport.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/JWindow.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/KeyboardManager.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/KeyStroke.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/LayoutComparator.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/LayoutFocusTraversalPolicy.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/LayoutStyle.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/LegacyGlueFocusTraversalPolicy.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/ListCellRenderer.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/ListModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/ListSelectionModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/LookAndFeel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/MenuElement.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/MenuSelectionManager.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/MultiUIDefaults.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/MutableComboBoxModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/OverlayLayout.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/Painter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/ActionMapUIResource.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicArrowButton.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicBorders.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicButtonListener.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicButtonUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicColorChooserUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicComboPopup.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicDesktopPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicEditorPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicFormattedTextFieldUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicGraphicsUtils.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicHTML.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicIconFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicLabelUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicListUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicMenuBarUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicMenuUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicPanelUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicPasswordFieldUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicRootPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicSeparatorUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicSpinnerUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicTableHeaderUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicTableUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextAreaUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicToolBarSeparatorUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicTransferable.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/BasicViewportUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/CenterLayout.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/ComboPopup.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/DefaultMenuLayout.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/DragRecognitionSupport.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/LazyActionMap.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/BorderUIResource.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/ButtonUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/ColorChooserUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/ColorUIResource.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/ComboBoxUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/ComponentInputMapUIResource.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/ComponentUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/DesktopIconUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/DesktopPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/DimensionUIResource.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/FileChooserUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/FontUIResource.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/IconUIResource.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/InputMapUIResource.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/InsetsUIResource.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/InternalFrameUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/LabelUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/LayerUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/ListUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/MenuBarUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/MenuItemUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalBorders.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalBumps.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalButtonUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalCheckBoxIcon.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalComboBoxEditor.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalComboBoxIcon.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalDesktopIconUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalFontDesktopProperty.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalHighContrastTheme.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalIconFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalInternalFrameUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalLabelUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalMenuBarUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalProgressBarUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalRootPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalScrollBarUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalScrollButton.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalSeparatorUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalSliderUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalTextFieldUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalTheme.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalTitlePane.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalToolBarUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalTreeUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/MetalUtils.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/OceanTheme.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiButtonUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiColorChooserUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiComboBoxUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiDesktopIconUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiDesktopPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiFileChooserUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiInternalFrameUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiLabelUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiListUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiLookAndFeel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiMenuBarUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiMenuItemUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiOptionPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiPanelUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiPopupMenuUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiProgressBarUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiRootPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiScrollBarUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiScrollPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiSeparatorUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiSliderUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiSpinnerUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiSplitPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiTabbedPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiTableHeaderUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiTableUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiTextUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiToolBarUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiToolTipUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiTreeUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/MultiViewportUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/nimbus/DerivedColor.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/nimbus/DropShadowEffect.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/nimbus/Effect.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/nimbus/EffectUtils.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/nimbus/ImageCache.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/nimbus/ImageScalingHelper.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/nimbus/InnerGlowEffect.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/nimbus/InnerShadowEffect.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/nimbus/LoweredBorder.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusIcon.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/nimbus/OuterGlowEffect.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/nimbus/ShadowEffect.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/nimbus/State.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/nimbus/SynthPainterImpl.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/nimbus/TableScrollPaneCorner.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/nimbus/ToolBarSeparatorPainter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/OptionPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/PanelUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/PopupMenuUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/ProgressBarUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/RootPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/ScrollBarUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/ScrollPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/SeparatorUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/SliderUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/SpinnerUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/SplitPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/ColorType.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/DefaultSynthStyleFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/ImagePainter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/ParsedSynthStyle.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/Region.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthArrowButton.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthBorder.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthButtonUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthCheckBoxMenuItemUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthCheckBoxUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthColorChooserUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboPopup.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthConstants.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthContext.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthDefaultLookup.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthDesktopIconUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthDesktopPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthEditorPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthFormattedTextFieldUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthGraphicsUtils.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthInternalFrameTitlePane.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthInternalFrameUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthLabelUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthListUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuBarUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuItemLayoutHelper.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuItemUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuLayout.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthOptionPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthPainter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthPanelUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthParser.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthPasswordFieldUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthPopupMenuUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthRadioButtonMenuItemUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthRadioButtonUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthRootPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthScrollBarUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthScrollPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthSeparatorUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthSliderUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthSpinnerUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthSplitPaneDivider.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthSplitPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthStyle.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthStyleFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthTableHeaderUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthTableUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthToggleButtonUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthToolBarUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthToolTipUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/SynthViewportUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/TabbedPaneUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/TableHeaderUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/TableUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/TextUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/ToolBarUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/ToolTipUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/TreeUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/UIResource.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/plaf/ViewportUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/Popup.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/PopupFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/ProgressMonitor.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/ProgressMonitorInputStream.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/Renderer.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/RepaintManager.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/RootPaneContainer.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/RowFilter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/RowSorter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/Scrollable.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/ScrollPaneConstants.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/ScrollPaneLayout.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/SingleSelectionModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/SizeRequirements.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/SizeSequence.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/SortingFocusTraversalPolicy.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/SortOrder.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/SpinnerDateModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/SpinnerListModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/SpinnerModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/SpinnerNumberModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/Spring.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/SpringLayout.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/SwingConstants.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/SwingHeavyWeight.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/SwingPaintEventDispatcher.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/SwingUtilities.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/SwingWorker.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/table/AbstractTableModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/table/DefaultTableCellRenderer.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/table/DefaultTableColumnModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/table/DefaultTableModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/table/JTableHeader.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/table/TableCellEditor.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/table/TableCellRenderer.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/table/TableColumn.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/table/TableColumnModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/table/TableModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/table/TableRowSorter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/table/TableStringConverter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/TablePrintable.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/AbstractDocument.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/AbstractWriter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/AsyncBoxView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/AttributeSet.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/BadLocationException.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/BoxView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/Caret.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/ChangedCharSetException.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/ComponentView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/CompositeView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/DateFormatter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/DefaultCaret.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/DefaultEditorKit.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/DefaultFormatter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/DefaultFormatterFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/DefaultHighlighter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/DefaultStyledDocument.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/DefaultTextUI.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/Document.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/DocumentFilter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/EditorKit.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/Element.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/ElementIterator.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/FieldView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/FlowView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/GapContent.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/GapVector.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/GlyphPainter1.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/GlyphPainter2.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/GlyphView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/Highlighter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/AccessibleHTML.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/BlockView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/BRView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/CommentView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/CSS.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/CSSBorder.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/CSSParser.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/EditableView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/FormSubmitEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/FormView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/FrameSetView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/FrameView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/HiddenTagView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/HRuleView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/HTML.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/HTMLEditorKit.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/HTMLFrameHyperlinkEvent.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/HTMLWriter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/ImageView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/InlineView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/IsindexView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/LineView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/ListView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/Map.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/MinimalHTMLWriter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/MuxingAttributeSet.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/NoFramesView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/ObjectView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/Option.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/OptionComboBoxModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/OptionListModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/ParagraphView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/parser/AttributeList.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/parser/ContentModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/parser/ContentModelState.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/parser/DocumentParser.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/parser/DTD.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/parser/DTDConstants.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/parser/Element.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/parser/Entity.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/parser/Parser.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/parser/ParserDelegator.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/parser/ResourceLoader.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/parser/TagElement.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/parser/TagStack.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/ResourceLoader.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/StyleSheet.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/TableView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/html/TextAreaDocument.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/IconView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/InternationalFormatter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/JTextComponent.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/Keymap.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/LabelView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/LayeredHighlighter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/LayoutQueue.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/MaskFormatter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/MutableAttributeSet.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/NavigationFilter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/NumberFormatter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/ParagraphView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/PasswordView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/PlainDocument.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/PlainView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/Position.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/rtf/AbstractFilter.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/rtf/Constants.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/rtf/MockAttributeSet.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/rtf/RTFAttribute.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/rtf/RTFAttributes.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/rtf/RTFEditorKit.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/rtf/RTFGenerator.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/rtf/RTFParser.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/rtf/RTFReader.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/Segment.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/SegmentCache.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/SimpleAttributeSet.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/StateInvariantError.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/StringContent.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/Style.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/StyleConstants.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/StyleContext.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/StyledDocument.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/StyledEditorKit.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/TabableView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/TabExpander.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/TableView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/TabSet.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/TabStop.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/TextAction.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/TextLayoutStrategy.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/Utilities.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/View.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/ViewFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/WhitespaceBasedBreakIterator.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/WrappedPlainView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/text/ZoneView.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/Timer.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/TimerQueue.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/ToolTipManager.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/TransferHandler.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/tree/AbstractLayoutCache.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/tree/DefaultMutableTreeNode.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/tree/DefaultTreeCellEditor.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/tree/DefaultTreeModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/tree/ExpandVetoException.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/tree/FixedHeightLayoutCache.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/tree/MutableTreeNode.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/tree/RowMapper.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/tree/TreeCellEditor.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/tree/TreeCellRenderer.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/tree/TreeModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/tree/TreeNode.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/tree/TreePath.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/tree/TreeSelectionModel.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/tree/VariableHeightLayoutCache.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/UIDefaults.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/UIManager.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/undo/AbstractUndoableEdit.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/undo/CannotRedoException.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/undo/CannotUndoException.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/undo/CompoundEdit.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/undo/StateEdit.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/undo/StateEditable.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/undo/UndoableEdit.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/undo/UndoableEditSupport.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/undo/UndoManager.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/UnsupportedLookAndFeelException.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/ViewportLayout.java
-@OPENJDK@/jdk/src/share/classes/javax/swing/WindowConstants.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/AlgorithmMethod.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/Data.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dom/DOMCryptoContext.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dom/DOMStructure.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dom/DOMURIReference.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/CanonicalizationMethod.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/DigestMethod.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/dom/DOMSignContext.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/dom/DOMValidateContext.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfo.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyName.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyValue.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/PGPData.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/RetrievalMethod.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/X509Data.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/X509IssuerSerial.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/Manifest.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/Reference.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/SignatureMethod.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/SignatureProperties.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/SignatureProperty.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/SignedInfo.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/spec/C14NMethodParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/spec/DigestMethodParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/spec/ExcC14NParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/spec/HMACParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/spec/SignatureMethodParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/spec/TransformParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/spec/XPathFilter2ParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/spec/XPathFilterParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/spec/XPathType.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/spec/XSLTTransformParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/Transform.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/TransformException.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/TransformService.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/XMLObject.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/XMLSignature.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/XMLSignatureException.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/XMLSignatureFactory.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/XMLSignContext.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/XMLValidateContext.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/KeySelector.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/KeySelectorException.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/KeySelectorResult.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/MarshalException.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/NodeSetData.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/NoSuchMechanismException.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/OctetStreamData.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/URIDereferencer.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/URIReference.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/URIReferenceException.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/XMLCryptoContext.java
-@OPENJDK@/jdk/src/share/classes/javax/xml/crypto/XMLStructure.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/AnnotationVisitor.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/AnnotationWriter.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Attribute.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/ByteVector.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/ClassVisitor.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/AdviceAdapter.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/AnalyzerAdapter.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/CodeSizeEvaluator.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/GeneratorAdapter.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/JSRInlinerAdapter.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/LocalVariablesSorter.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/Method.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/Remapper.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingAnnotationAdapter.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingClassAdapter.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingFieldAdapter.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingMethodAdapter.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingSignatureAdapter.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/SimpleRemapper.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/StaticInitMerger.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/TableSwitchGenerator.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/TryCatchBlockSorter.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Context.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Edge.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/FieldVisitor.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/FieldWriter.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Frame.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Handle.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Handler.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Item.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Label.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/MethodVisitor.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/MethodWriter.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureReader.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureWriter.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/AbstractInsnNode.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Analyzer.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/AnalyzerException.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicInterpreter.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicValue.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/BasicVerifier.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Frame.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Interpreter.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SimpleVerifier.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SmallSet.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceInterpreter.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/SourceValue.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Subroutine.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/Value.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/AnnotationNode.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/ClassNode.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/FieldInsnNode.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/FieldNode.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/FrameNode.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/IincInsnNode.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/InnerClassNode.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/InsnList.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/InsnNode.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/IntInsnNode.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/InvokeDynamicInsnNode.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/JumpInsnNode.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LabelNode.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LdcInsnNode.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LineNumberNode.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableAnnotationNode.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LocalVariableNode.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/LookupSwitchInsnNode.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/MethodInsnNode.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/MethodNode.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/MultiANewArrayInsnNode.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/ParameterNode.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/TableSwitchInsnNode.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/TryCatchBlockNode.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/TypeAnnotationNode.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/TypeInsnNode.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/VarInsnNode.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/Type.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/TypePath.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/TypeReference.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/ASMifiable.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/ASMifier.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckAnnotationAdapter.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckClassAdapter.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckFieldAdapter.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckMethodAdapter.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/CheckSignatureAdapter.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/Printer.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/Textifiable.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/Textifier.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceAnnotationVisitor.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceClassVisitor.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceFieldVisitor.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceMethodVisitor.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/TraceSignatureVisitor.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/xml/sax/Attributes.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/xml/sax/ContentHandler.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/xml/sax/DTDHandler.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/xml/sax/EntityResolver.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/xml/sax/ErrorHandler.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/xml/sax/helpers/DefaultHandler.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/xml/sax/InputSource.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/xml/sax/Locator.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/xml/sax/SAXException.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/xml/sax/SAXNotRecognizedException.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/xml/sax/SAXNotSupportedException.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/xml/sax/SAXParseException.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/org/xml/sax/XMLReader.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/util/xml/BasicXmlPropertiesProvider.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/util/xml/impl/Attrs.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/util/xml/impl/Input.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/util/xml/impl/Pair.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/util/xml/impl/Parser.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/util/xml/impl/ParserSAX.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/util/xml/impl/ReaderUTF16.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/util/xml/impl/ReaderUTF8.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/util/xml/impl/SAXParserImpl.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/util/xml/impl/XMLStreamWriterImpl.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/util/xml/impl/XMLWriter.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/util/xml/PropertiesDefaultHandler.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/util/xml/SAXParser.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/util/xml/XMLStreamException.java
-@OPENJDK@/jdk/src/share/classes/jdk/internal/util/xml/XMLStreamWriter.java
-@OPENJDK@/jdk/src/share/classes/org/ietf/jgss/ChannelBinding.java
-@OPENJDK@/jdk/src/share/classes/org/ietf/jgss/GSSContext.java
-@OPENJDK@/jdk/src/share/classes/org/ietf/jgss/GSSCredential.java
-@OPENJDK@/jdk/src/share/classes/org/ietf/jgss/GSSException.java
-@OPENJDK@/jdk/src/share/classes/org/ietf/jgss/GSSManager.java
-@OPENJDK@/jdk/src/share/classes/org/ietf/jgss/GSSName.java
-@OPENJDK@/jdk/src/share/classes/org/ietf/jgss/MessageProp.java
-@OPENJDK@/jdk/src/share/classes/org/ietf/jgss/Oid.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/DigesterOutputStream.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheData.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheTransform.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMBase64Transform.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMDigestMethod.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMEnvelopedTransform.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyName.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyValue.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMManifest.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMPGPData.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMStructure.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSubTreeData.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMTransform.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMUtils.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509Data.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLObject.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathTransform.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/Utils.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/MacOutputStream.java
-@OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/SignerOutputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/applet/AppletAudioClip.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/AppContext.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/AWTAccessor.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/AWTAutoShutdown.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/AWTCharset.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/AWTPermissionFactory.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/AWTSecurityManager.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/CausedFocusEvent.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/CharsetString.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/ComponentFactory.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/ConstrainableGraphics.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/CustomCursor.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/datatransfer/ClipboardTransferable.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/datatransfer/SunClipboard.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/datatransfer/ToolkitThreadBlockedHandler.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/datatransfer/TransferableProxy.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/DefaultMouseInfoPeer.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/DesktopBrowse.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/DisplayChangedListener.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/dnd/SunDropTargetEvent.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/event/IgnorePaintEvent.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/EventListenerAggregate.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/EventQueueDelegate.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/EventQueueItem.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/ExtendedKeyCodes.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/FontConfiguration.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/FontDescriptor.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/FwDispatcher.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/geom/AreaOp.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/geom/ChainEnd.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/geom/Crossings.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/geom/Curve.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/geom/CurveLink.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/geom/Edge.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/geom/Order0.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/geom/Order1.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/geom/Order2.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/geom/Order3.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/geom/PathConsumer2D.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/GlobalCursorManager.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/Graphics2Delegate.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/HeadlessToolkit.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/HKSCS.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/IconInfo.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/im/CompositionArea.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/im/CompositionAreaHandler.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/im/ExecutableInputMethodManager.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/im/InputContext.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/im/InputMethodAdapter.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/im/InputMethodContext.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/im/InputMethodJFrame.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/im/InputMethodLocator.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/im/InputMethodManager.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/im/InputMethodPopupMenu.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/im/InputMethodWindow.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/im/SimpleInputMethodWindow.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/image/BufferedImageDevice.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/image/BufferedImageGraphicsConfig.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/image/ByteArrayImageSource.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/image/ByteBandedRaster.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/image/ByteComponentRaster.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/image/BytePackedRaster.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/image/FileImageSource.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/image/ImageConsumerQueue.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/image/ImageDecoder.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/image/ImageFetchable.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/image/ImageFetcher.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/image/ImageFormatException.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/image/ImageWatched.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/image/InputStreamImageSource.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/image/IntegerComponentRaster.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/image/NativeLibLoader.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/image/OffScreenImageSource.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/image/PixelConverter.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/image/PNGImageDecoder.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/image/ShortBandedRaster.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/image/ShortComponentRaster.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/image/ShortInterleavedRaster.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/image/URLImageSource.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/image/VSyncedBSManager.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/image/XbmImageDecoder.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/InputMethodSupport.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/KeyboardFocusManagerPeerImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/KeyboardFocusManagerPeerProvider.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/LightweightFrame.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/ModalExclude.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/ModalityEvent.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/ModalityListener.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/Mutex.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/NativeLibLoader.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/NullComponentPeer.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/OSInfo.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/PaintEventDispatcher.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/PeerEvent.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/RepaintArea.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/RequestFocusController.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/ScrollPaneWheelScroller.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/shell/DefaultShellFolder.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/shell/ShellFolder.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/shell/ShellFolderColumnInfo.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/shell/ShellFolderManager.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/SubRegionShowable.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/SunDisplayChanger.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/SunGraphicsCallback.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/SunHints.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/Symbol.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/TimedWindowEvent.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/TracedEventQueue.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/UngrabEvent.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/util/IdentityArrayList.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/util/IdentityLinkedList.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/WindowClosingListener.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/WindowClosingSupport.java
-@OPENJDK@/jdk/src/share/classes/sun/awt/WindowIDProvider.java
-@OPENJDK@/jdk/src/share/classes/sun/font/AttributeMap.java
-@OPENJDK@/jdk/src/share/classes/sun/font/AttributeValues.java
-@OPENJDK@/jdk/src/share/classes/sun/font/BidiUtils.java
-@OPENJDK@/jdk/src/share/classes/sun/font/CharToGlyphMapper.java
-@OPENJDK@/jdk/src/share/classes/sun/font/CompositeFontDescriptor.java
-@OPENJDK@/jdk/src/share/classes/sun/font/CoreMetrics.java
-@OPENJDK@/jdk/src/share/classes/sun/font/CreatedFontTracker.java
-@OPENJDK@/jdk/src/share/classes/sun/font/Decoration.java
-@OPENJDK@/jdk/src/share/classes/sun/font/EAttribute.java
-@OPENJDK@/jdk/src/share/classes/sun/font/ExtendedTextLabel.java
-@OPENJDK@/jdk/src/share/classes/sun/font/ExtendedTextSourceLabel.java
-@OPENJDK@/jdk/src/share/classes/sun/font/Font2DHandle.java
-@OPENJDK@/jdk/src/share/classes/sun/font/FontAccess.java
-@OPENJDK@/jdk/src/share/classes/sun/font/FontDesignMetrics.java
-@OPENJDK@/jdk/src/share/classes/sun/font/FontLineMetrics.java
-@OPENJDK@/jdk/src/share/classes/sun/font/FontManager.java
-@OPENJDK@/jdk/src/share/classes/sun/font/FontManagerFactory.java
-@OPENJDK@/jdk/src/share/classes/sun/font/FontManagerForSGE.java
-@OPENJDK@/jdk/src/share/classes/sun/font/FontResolver.java
-@OPENJDK@/jdk/src/share/classes/sun/font/FontStrike.java
-@OPENJDK@/jdk/src/share/classes/sun/font/FontStrikeDesc.java
-@OPENJDK@/jdk/src/share/classes/sun/font/FontStrikeDisposer.java
-@OPENJDK@/jdk/src/share/classes/sun/font/FontUtilities.java
-@OPENJDK@/jdk/src/share/classes/sun/font/GraphicComponent.java
-@OPENJDK@/jdk/src/share/classes/sun/font/LayoutPathImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/font/StandardTextSource.java
-@OPENJDK@/jdk/src/share/classes/sun/font/StrikeMetrics.java
-@OPENJDK@/jdk/src/share/classes/sun/font/TextLabel.java
-@OPENJDK@/jdk/src/share/classes/sun/font/TextLabelFactory.java
-@OPENJDK@/jdk/src/share/classes/sun/font/TextLineComponent.java
-@OPENJDK@/jdk/src/share/classes/sun/font/TextSource.java
-@OPENJDK@/jdk/src/share/classes/sun/font/TextSourceLabel.java
-@OPENJDK@/jdk/src/share/classes/sun/font/Underline.java
-@OPENJDK@/jdk/src/share/classes/sun/invoke/anon/AnonymousClassLoader.java
-@OPENJDK@/jdk/src/share/classes/sun/invoke/anon/ConstantPoolParser.java
-@OPENJDK@/jdk/src/share/classes/sun/invoke/anon/ConstantPoolPatch.java
-@OPENJDK@/jdk/src/share/classes/sun/invoke/anon/ConstantPoolVisitor.java
-@OPENJDK@/jdk/src/share/classes/sun/invoke/anon/InvalidConstantPoolFormatException.java
-@OPENJDK@/jdk/src/share/classes/sun/invoke/empty/Empty.java
-@OPENJDK@/jdk/src/share/classes/sun/invoke/package-info.java
-@OPENJDK@/jdk/src/share/classes/sun/invoke/util/BytecodeDescriptor.java
-@OPENJDK@/jdk/src/share/classes/sun/invoke/util/BytecodeName.java
-@OPENJDK@/jdk/src/share/classes/sun/invoke/util/package-info.java
-@OPENJDK@/jdk/src/share/classes/sun/invoke/util/ValueConversions.java
-@OPENJDK@/jdk/src/share/classes/sun/invoke/util/VerifyAccess.java
-@OPENJDK@/jdk/src/share/classes/sun/invoke/util/VerifyType.java
-@OPENJDK@/jdk/src/share/classes/sun/invoke/util/Wrapper.java
-@OPENJDK@/jdk/src/share/classes/sun/invoke/WrapperInstance.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/cmm/CMMServiceProvider.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/cmm/CMSManager.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/cmm/ColorTransform.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/cmm/lcms/LcmsServiceProvider.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/cmm/PCMM.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/cmm/Profile.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/cmm/ProfileActivator.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/cmm/ProfileDataVerifier.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/cmm/ProfileDeferralInfo.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/cmm/ProfileDeferralMgr.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/DefaultDisposerRecord.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/Disposer.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/DisposerRecord.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/DisposerTarget.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/FontSupport.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/InvalidPipeException.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/pipe/AATileGenerator.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/pipe/BufferedOpCodes.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/pipe/CompositePipe.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/pipe/DrawImagePipe.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/pipe/hw/ExtendedBufferCapabilities.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/pipe/NullPipe.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/pipe/PixelDrawPipe.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/pipe/PixelFillPipe.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/pipe/PixelToShapeConverter.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/pipe/Region.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/pipe/RegionClipSpanIterator.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/pipe/RegionIterator.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/pipe/RegionSpanIterator.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/pipe/RenderingEngine.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/pipe/ShapeDrawPipe.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/pipe/SpanIterator.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/pipe/TextPipe.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/pisces/Curve.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/pisces/Dasher.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/pisces/Helpers.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/pisces/PiscesCache.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/pisces/PiscesRenderingEngine.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/pisces/PiscesTileGenerator.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/pisces/Renderer.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/pisces/Stroker.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/pisces/TransformingPathConsumer2D.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/Spans.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/StateTrackable.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/StateTrackableDelegate.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/StateTracker.java
-@OPENJDK@/jdk/src/share/classes/sun/java2d/Surface.java
-@OPENJDK@/jdk/src/share/classes/sun/launcher/LauncherHelper.java
-@OPENJDK@/jdk/src/share/classes/sun/management/Agent.java
-@OPENJDK@/jdk/src/share/classes/sun/management/AgentConfigurationError.java
-@OPENJDK@/jdk/src/share/classes/sun/management/BaseOperatingSystemImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/management/ClassLoadingImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/management/CompilationImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/management/CompilerThreadStat.java
-@OPENJDK@/jdk/src/share/classes/sun/management/ConnectorAddressLink.java
-@OPENJDK@/jdk/src/share/classes/sun/management/counter/AbstractCounter.java
-@OPENJDK@/jdk/src/share/classes/sun/management/counter/ByteArrayCounter.java
-@OPENJDK@/jdk/src/share/classes/sun/management/counter/Counter.java
-@OPENJDK@/jdk/src/share/classes/sun/management/counter/LongArrayCounter.java
-@OPENJDK@/jdk/src/share/classes/sun/management/counter/LongCounter.java
-@OPENJDK@/jdk/src/share/classes/sun/management/counter/perf/ByteArrayCounterSnapshot.java
-@OPENJDK@/jdk/src/share/classes/sun/management/counter/perf/InstrumentationException.java
-@OPENJDK@/jdk/src/share/classes/sun/management/counter/perf/LongArrayCounterSnapshot.java
-@OPENJDK@/jdk/src/share/classes/sun/management/counter/perf/LongCounterSnapshot.java
-@OPENJDK@/jdk/src/share/classes/sun/management/counter/perf/PerfByteArrayCounter.java
-@OPENJDK@/jdk/src/share/classes/sun/management/counter/perf/PerfDataEntry.java
-@OPENJDK@/jdk/src/share/classes/sun/management/counter/perf/PerfDataType.java
-@OPENJDK@/jdk/src/share/classes/sun/management/counter/perf/PerfInstrumentation.java
-@OPENJDK@/jdk/src/share/classes/sun/management/counter/perf/PerfLongArrayCounter.java
-@OPENJDK@/jdk/src/share/classes/sun/management/counter/perf/PerfLongCounter.java
-@OPENJDK@/jdk/src/share/classes/sun/management/counter/perf/PerfStringCounter.java
-@OPENJDK@/jdk/src/share/classes/sun/management/counter/perf/Prologue.java
-@OPENJDK@/jdk/src/share/classes/sun/management/counter/perf/StringCounterSnapshot.java
-@OPENJDK@/jdk/src/share/classes/sun/management/counter/StringCounter.java
-@OPENJDK@/jdk/src/share/classes/sun/management/counter/Units.java
-@OPENJDK@/jdk/src/share/classes/sun/management/counter/Variability.java
-@OPENJDK@/jdk/src/share/classes/sun/management/FileSystem.java
-@OPENJDK@/jdk/src/share/classes/sun/management/GarbageCollectionNotifInfoCompositeData.java
-@OPENJDK@/jdk/src/share/classes/sun/management/GcInfoBuilder.java
-@OPENJDK@/jdk/src/share/classes/sun/management/GcInfoCompositeData.java
-@OPENJDK@/jdk/src/share/classes/sun/management/HotspotClassLoading.java
-@OPENJDK@/jdk/src/share/classes/sun/management/HotspotClassLoadingMBean.java
-@OPENJDK@/jdk/src/share/classes/sun/management/HotspotCompilation.java
-@OPENJDK@/jdk/src/share/classes/sun/management/HotspotCompilationMBean.java
-@OPENJDK@/jdk/src/share/classes/sun/management/HotspotInternal.java
-@OPENJDK@/jdk/src/share/classes/sun/management/HotspotInternalMBean.java
-@OPENJDK@/jdk/src/share/classes/sun/management/HotspotMemory.java
-@OPENJDK@/jdk/src/share/classes/sun/management/HotspotMemoryMBean.java
-@OPENJDK@/jdk/src/share/classes/sun/management/HotspotRuntime.java
-@OPENJDK@/jdk/src/share/classes/sun/management/HotspotRuntimeMBean.java
-@OPENJDK@/jdk/src/share/classes/sun/management/HotspotThreadMBean.java
-@OPENJDK@/jdk/src/share/classes/sun/management/jdp/JdpBroadcaster.java
-@OPENJDK@/jdk/src/share/classes/sun/management/jdp/JdpController.java
-@OPENJDK@/jdk/src/share/classes/sun/management/jdp/JdpException.java
-@OPENJDK@/jdk/src/share/classes/sun/management/jdp/JdpGenericPacket.java
-@OPENJDK@/jdk/src/share/classes/sun/management/jdp/JdpJmxPacket.java
-@OPENJDK@/jdk/src/share/classes/sun/management/jdp/JdpPacket.java
-@OPENJDK@/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java
-@OPENJDK@/jdk/src/share/classes/sun/management/jdp/JdpPacketWriter.java
-@OPENJDK@/jdk/src/share/classes/sun/management/jdp/package-info.java
-@OPENJDK@/jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java
-@OPENJDK@/jdk/src/share/classes/sun/management/jmxremote/LocalRMIServerSocketFactory.java
-@OPENJDK@/jdk/src/share/classes/sun/management/jmxremote/SingleEntryRegistry.java
-@OPENJDK@/jdk/src/share/classes/sun/management/LazyCompositeData.java
-@OPENJDK@/jdk/src/share/classes/sun/management/LockInfoCompositeData.java
-@OPENJDK@/jdk/src/share/classes/sun/management/MappedMXBeanType.java
-@OPENJDK@/jdk/src/share/classes/sun/management/MemoryImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/management/MemoryNotifInfoCompositeData.java
-@OPENJDK@/jdk/src/share/classes/sun/management/MemoryUsageCompositeData.java
-@OPENJDK@/jdk/src/share/classes/sun/management/MethodInfo.java
-@OPENJDK@/jdk/src/share/classes/sun/management/MonitorInfoCompositeData.java
-@OPENJDK@/jdk/src/share/classes/sun/management/NotificationEmitterSupport.java
-@OPENJDK@/jdk/src/share/classes/sun/management/RuntimeImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/management/Sensor.java
-@OPENJDK@/jdk/src/share/classes/sun/management/StackTraceElementCompositeData.java
-@OPENJDK@/jdk/src/share/classes/sun/management/ThreadImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/management/ThreadInfoCompositeData.java
-@OPENJDK@/jdk/src/share/classes/sun/management/Util.java
-@OPENJDK@/jdk/src/share/classes/sun/management/VMManagement.java
-@OPENJDK@/jdk/src/share/classes/sun/management/VMOptionCompositeData.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/ASCIICaseInsensitiveComparator.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/BASE64Decoder.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/BASE64Encoder.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/Cache.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/CEFormatException.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/CEStreamExhausted.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/CharacterDecoder.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/CharacterEncoder.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/ClassFileTransformer.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/ClassLoaderUtil.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/Cleaner.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/CompoundEnumeration.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/ConditionLock.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/Contended.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/CRC16.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/DoubleConsts.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/ExtensionDependency.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/ExtensionInfo.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/ExtensionInstallationException.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/ExtensionInstallationProvider.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/FDBigInteger.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/FloatConsts.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/FloatingDecimal.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/FormattedFloatingDecimal.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/FpUtils.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/GC.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/HexDumpEncoder.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/InvalidJarIndexException.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/IOUtils.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/JarFilter.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/JarIndex.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/JavaAWTAccess.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/JavaIOAccess.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/JavaIOFileDescriptorAccess.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/JavaLangAccess.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/JavaNetAccess.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/JavaNetHttpCookieAccess.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/JavaNioAccess.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/JavaSecurityAccess.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/JavaSecurityProtectionDomainAccess.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/JavaUtilJarAccess.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/JavaUtilZipFileAccess.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/Launcher.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/Lock.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/LRUCache.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/MessageUtils.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/MetaIndex.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/NativeSignalHandler.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/Perf.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/PerfCounter.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/PerformanceLogger.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/ProxyGenerator.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/Queue.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/REException.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/Regexp.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/RegexpPool.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/RegexpTarget.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/Request.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/RequestProcessor.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/Resource.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/resources/Messages.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/resources/Messages_de.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/resources/Messages_es.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/resources/Messages_fr.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/resources/Messages_it.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/resources/Messages_ja.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/resources/Messages_ko.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/resources/Messages_pt_BR.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/resources/Messages_sv.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/resources/Messages_zh_CN.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/resources/Messages_zh_TW.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/Service.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/ServiceConfigurationError.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/Signal.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/SignalHandler.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/SoftCache.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/Timeable.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/Timer.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/UCDecoder.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/UCEncoder.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/URLClassPath.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/UUDecoder.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/UUEncoder.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/VMNotification.java
-@OPENJDK@/jdk/src/share/classes/sun/misc/VMSupport.java
-@OPENJDK@/jdk/src/share/classes/sun/net/ApplicationProxy.java
-@OPENJDK@/jdk/src/share/classes/sun/net/ConnectionResetException.java
-@OPENJDK@/jdk/src/share/classes/sun/net/dns/ResolverConfiguration.java
-@OPENJDK@/jdk/src/share/classes/sun/net/ftp/FtpClient.java
-@OPENJDK@/jdk/src/share/classes/sun/net/ftp/FtpClientProvider.java
-@OPENJDK@/jdk/src/share/classes/sun/net/ftp/FtpDirEntry.java
-@OPENJDK@/jdk/src/share/classes/sun/net/ftp/FtpDirParser.java
-@OPENJDK@/jdk/src/share/classes/sun/net/ftp/FtpLoginException.java
-@OPENJDK@/jdk/src/share/classes/sun/net/ftp/FtpProtocolException.java
-@OPENJDK@/jdk/src/share/classes/sun/net/ftp/FtpReplyCode.java
-@OPENJDK@/jdk/src/share/classes/sun/net/ftp/impl/DefaultFtpClientProvider.java
-@OPENJDK@/jdk/src/share/classes/sun/net/ftp/impl/FtpClient.java
-@OPENJDK@/jdk/src/share/classes/sun/net/httpserver/AuthFilter.java
-@OPENJDK@/jdk/src/share/classes/sun/net/httpserver/ChunkedInputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/net/httpserver/ChunkedOutputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/net/httpserver/Code.java
-@OPENJDK@/jdk/src/share/classes/sun/net/httpserver/ContextList.java
-@OPENJDK@/jdk/src/share/classes/sun/net/httpserver/DefaultHttpServerProvider.java
-@OPENJDK@/jdk/src/share/classes/sun/net/httpserver/Event.java
-@OPENJDK@/jdk/src/share/classes/sun/net/httpserver/ExchangeImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/net/httpserver/FixedLengthInputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/net/httpserver/FixedLengthOutputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/net/httpserver/HttpConnection.java
-@OPENJDK@/jdk/src/share/classes/sun/net/httpserver/HttpContextImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/net/httpserver/HttpError.java
-@OPENJDK@/jdk/src/share/classes/sun/net/httpserver/HttpExchangeImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/net/httpserver/HttpServerImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/net/httpserver/HttpsExchangeImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/net/httpserver/HttpsServerImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/net/httpserver/LeftOverInputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/net/httpserver/Request.java
-@OPENJDK@/jdk/src/share/classes/sun/net/httpserver/ServerConfig.java
-@OPENJDK@/jdk/src/share/classes/sun/net/httpserver/ServerImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/net/httpserver/SSLStreams.java
-@OPENJDK@/jdk/src/share/classes/sun/net/httpserver/StreamClosedException.java
-@OPENJDK@/jdk/src/share/classes/sun/net/httpserver/TimeSource.java
-@OPENJDK@/jdk/src/share/classes/sun/net/httpserver/UndefLengthOutputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/net/httpserver/UnmodifiableHeaders.java
-@OPENJDK@/jdk/src/share/classes/sun/net/httpserver/WriteFinishedEvent.java
-@OPENJDK@/jdk/src/share/classes/sun/net/idn/Punycode.java
-@OPENJDK@/jdk/src/share/classes/sun/net/idn/StringPrep.java
-@OPENJDK@/jdk/src/share/classes/sun/net/idn/StringPrepDataReader.java
-@OPENJDK@/jdk/src/share/classes/sun/net/idn/UCharacterDirection.java
-@OPENJDK@/jdk/src/share/classes/sun/net/idn/UCharacterEnums.java
-@OPENJDK@/jdk/src/share/classes/sun/net/InetAddressCachePolicy.java
-@OPENJDK@/jdk/src/share/classes/sun/net/NetProperties.java
-@OPENJDK@/jdk/src/share/classes/sun/net/NetworkClient.java
-@OPENJDK@/jdk/src/share/classes/sun/net/NetworkServer.java
-@OPENJDK@/jdk/src/share/classes/sun/net/ProgressEvent.java
-@OPENJDK@/jdk/src/share/classes/sun/net/ProgressListener.java
-@OPENJDK@/jdk/src/share/classes/sun/net/ProgressMeteringPolicy.java
-@OPENJDK@/jdk/src/share/classes/sun/net/ProgressMonitor.java
-@OPENJDK@/jdk/src/share/classes/sun/net/ProgressSource.java
-@OPENJDK@/jdk/src/share/classes/sun/net/RegisteredDomain.java
-@OPENJDK@/jdk/src/share/classes/sun/net/ResourceManager.java
-@OPENJDK@/jdk/src/share/classes/sun/net/smtp/SmtpClient.java
-@OPENJDK@/jdk/src/share/classes/sun/net/smtp/SmtpProtocolException.java
-@OPENJDK@/jdk/src/share/classes/sun/net/SocksProxy.java
-@OPENJDK@/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
-@OPENJDK@/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java
-@OPENJDK@/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameServiceDescriptor.java
-@OPENJDK@/jdk/src/share/classes/sun/net/spi/nameservice/NameService.java
-@OPENJDK@/jdk/src/share/classes/sun/net/spi/nameservice/NameServiceDescriptor.java
-@OPENJDK@/jdk/src/share/classes/sun/net/TelnetInputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/net/TelnetOutputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/net/TelnetProtocolException.java
-@OPENJDK@/jdk/src/share/classes/sun/net/TransferProtocolClient.java
-@OPENJDK@/jdk/src/share/classes/sun/net/URLCanonicalizer.java
-@OPENJDK@/jdk/src/share/classes/sun/net/util/IPAddressUtil.java
-@OPENJDK@/jdk/src/share/classes/sun/net/util/URLUtil.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/ApplicationLaunchException.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/content/image/gif.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/content/image/jpeg.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/content/image/png.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/content/image/x_xbitmap.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/content/image/x_xpixmap.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/content/text/Generic.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/content/text/plain.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/content/text/PlainTextInputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/HeaderParser.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/http/ChunkedInputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/http/ChunkedOutputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/http/HttpCapture.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/http/HttpCaptureInputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/http/HttpCaptureOutputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/http/HttpClient.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/http/Hurryable.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/http/KeepAliveCache.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/http/KeepAliveCleanerEntry.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/http/KeepAliveStream.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/http/KeepAliveStreamCleaner.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/http/PosterOutputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/MessageHeader.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/MeteredStream.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/MimeEntry.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/MimeLauncher.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/MimeTable.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/ParseUtil.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/ftp/Handler.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/http/AuthCache.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/http/AuthCacheImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/http/AuthCacheValue.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationHeader.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/http/AuthScheme.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/http/BasicAuthentication.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/http/DigestAuthentication.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/http/Handler.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/http/HttpAuthenticator.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/http/HttpCallerInfo.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/http/logging/HttpLogFormatter.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/http/Negotiator.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/http/ntlm/NTLMAuthenticationCallback.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/http/NTLMAuthenticationProxy.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/http/spnego/NegotiateCallbackHandler.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/http/spnego/NegotiatorImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/https/DefaultHostnameVerifier.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/https/DelegateHttpsURLConnection.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/https/Handler.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/https/HttpsClient.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/jar/Handler.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/jar/JarURLConnection.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/jar/URLJarFileCallBack.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/mailto/Handler.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/mailto/MailToURLConnection.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/netdoc/Handler.java
-@OPENJDK@/jdk/src/share/classes/sun/net/www/URLConnection.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ByteBuffered.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/Cancellable.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/ChannelInputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/CompletedFuture.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/DatagramSocketAdaptor.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/DirectBuffer.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/ExtendedSocketOption.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/FileDispatcher.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/FileLockImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/FileLockTable.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/Groupable.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/Interruptible.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/Invoker.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/IOStatus.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/MembershipKeyImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/MembershipRegistry.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/NativeThreadSet.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/OptionKey.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/PendingFuture.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/Reflect.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/sctp/MessageInfoImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/sctp/SctpStdSocketOption.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/SelChImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/SelectorImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/SelectorProviderImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/ServerSocketAdaptor.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/SocketAdaptor.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/SocketChannelImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/ch/ThreadPool.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ArrayDecoder.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ArrayEncoder.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/CESU_8.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/CharsetMapping.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/Big5_HKSCS.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/Big5_HKSCS_2001.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/Big5_Solaris.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/DelegatableDecoder.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/DoubleByte.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/DoubleByteEncoder.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_LINUX.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_Open.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/EUC_TW.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/GB18030.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/HKSCS.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/IBM33722.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/IBM834.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/IBM942C.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/IBM943C.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/IBM949C.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/IBM964.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/ISCII91.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/ISO2022.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/ISO2022_CN.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/ISO2022_CN_CNS.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/ISO2022_CN_GB.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/ISO2022_JP.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/ISO2022_JP_2.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/ISO2022_KR.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/JISAutoDetect.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/MS50220.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/MS50221.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/MS932_0213.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/MS950_HKSCS.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/MS950_HKSCS_XP.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/MSISO2022JP.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/SimpleEUCEncoder.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/SJIS_0213.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/FastCharsetProvider.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/HistoricallyNamedCharset.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ISO_8859_1.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/SingleByte.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/StreamDecoder.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/StreamEncoder.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/Surrogate.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/ThreadLocalCoders.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/Unicode.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/UnicodeDecoder.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/UnicodeEncoder.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/US_ASCII.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/UTF_16.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/UTF_16BE.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/UTF_16LE.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/UTF_16LE_BOM.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/UTF_32.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/UTF_32BE.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/UTF_32BE_BOM.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/UTF_32Coder.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/UTF_32LE.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/UTF_32LE_BOM.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/cs/UTF_8.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/fs/AbstractFileSystemProvider.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/fs/AbstractFileTypeDetector.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/fs/AbstractPath.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/fs/AbstractWatchKey.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/fs/AbstractWatchService.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/fs/BasicFileAttributesHolder.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/fs/DynamicFileAttributeView.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/fs/Globs.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/fs/PollingWatchService.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/fs/Reflect.java
-@OPENJDK@/jdk/src/share/classes/sun/nio/fs/Util.java
-@OPENJDK@/jdk/src/share/classes/sun/print/AttributeUpdater.java
-@OPENJDK@/jdk/src/share/classes/sun/print/BackgroundLookupListener.java
-@OPENJDK@/jdk/src/share/classes/sun/print/BackgroundServiceLookup.java
-@OPENJDK@/jdk/src/share/classes/sun/print/CustomMediaSizeName.java
-@OPENJDK@/jdk/src/share/classes/sun/print/CustomMediaTray.java
-@OPENJDK@/jdk/src/share/classes/sun/print/DialogOwner.java
-@OPENJDK@/jdk/src/share/classes/sun/print/DocumentPropertiesUI.java
-@OPENJDK@/jdk/src/share/classes/sun/print/ImagePrinter.java
-@OPENJDK@/jdk/src/share/classes/sun/print/OpenBook.java
-@OPENJDK@/jdk/src/share/classes/sun/print/PageableDoc.java
-@OPENJDK@/jdk/src/share/classes/sun/print/PathGraphics.java
-@OPENJDK@/jdk/src/share/classes/sun/print/PeekGraphics.java
-@OPENJDK@/jdk/src/share/classes/sun/print/PeekMetrics.java
-@OPENJDK@/jdk/src/share/classes/sun/print/PrinterGraphicsConfig.java
-@OPENJDK@/jdk/src/share/classes/sun/print/PrinterGraphicsDevice.java
-@OPENJDK@/jdk/src/share/classes/sun/print/PrinterJobWrapper.java
-@OPENJDK@/jdk/src/share/classes/sun/print/PrintJob2D.java
-@OPENJDK@/jdk/src/share/classes/sun/print/PrintJobAttributeException.java
-@OPENJDK@/jdk/src/share/classes/sun/print/PrintJobFlavorException.java
-@OPENJDK@/jdk/src/share/classes/sun/print/ProxyGraphics.java
-@OPENJDK@/jdk/src/share/classes/sun/print/ProxyGraphics2D.java
-@OPENJDK@/jdk/src/share/classes/sun/print/ProxyPrintGraphics.java
-@OPENJDK@/jdk/src/share/classes/sun/print/RasterPrinterJob.java
-@OPENJDK@/jdk/src/share/classes/sun/print/ServiceDialog.java
-@OPENJDK@/jdk/src/share/classes/sun/print/ServiceNotifier.java
-@OPENJDK@/jdk/src/share/classes/sun/print/SunAlternateMedia.java
-@OPENJDK@/jdk/src/share/classes/sun/print/SunMinMaxPage.java
-@OPENJDK@/jdk/src/share/classes/sun/print/SunPageSelection.java
-@OPENJDK@/jdk/src/share/classes/sun/print/SunPrinterJobService.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/annotation/AnnotatedTypeFactory.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/annotation/AnnotationParser.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/annotation/AnnotationSupport.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/annotation/ExceptionProxy.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/annotation/TypeAnnotation.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/annotation/TypeAnnotationParser.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/annotation/TypeNotPresentExceptionProxy.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/CallerSensitive.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/ConstantPool.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/ConstructorAccessor.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/ConstructorAccessorImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/FieldAccessor.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/factory/CoreReflectionFactory.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/factory/GenericsFactory.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/GenericArrayTypeImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/LazyReflectiveObjectGenerator.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/NotImplementedException.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/ParameterizedTypeImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/WildcardTypeImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/repository/AbstractRepository.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/repository/ClassRepository.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/repository/ConstructorRepository.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/repository/FieldRepository.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/repository/GenericDeclRepository.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/repository/MethodRepository.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/scope/AbstractScope.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/scope/ClassScope.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/scope/ConstructorScope.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/scope/DummyScope.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/scope/MethodScope.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/scope/Scope.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/tree/ArrayTypeSignature.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/tree/BaseType.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/tree/BooleanSignature.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/tree/BottomSignature.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/tree/ByteSignature.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/tree/CharSignature.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/tree/ClassSignature.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/tree/ClassTypeSignature.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/tree/DoubleSignature.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/tree/FieldTypeSignature.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/tree/FloatSignature.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/tree/FormalTypeParameter.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/tree/IntSignature.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/tree/LongSignature.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/tree/MethodTypeSignature.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/tree/ReturnType.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/tree/ShortSignature.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/tree/Signature.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/tree/SimpleClassTypeSignature.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/tree/Tree.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/tree/TypeArgument.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/tree/TypeSignature.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/tree/TypeTree.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/tree/TypeVariableSignature.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/tree/VoidDescriptor.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/tree/Wildcard.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/visitor/Reifier.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/visitor/TypeTreeVisitor.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/generics/visitor/Visitor.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/InstantiationExceptionConstructorAccessorImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/LangReflectAccess.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/MagicAccessorImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/misc/ConstructorUtil.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/misc/FieldUtil.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/misc/MethodUtil.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java
-@OPENJDK@/jdk/src/share/classes/sun/reflect/SignatureIterator.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/log/LogHandler.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/log/LogInputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/log/LogOutputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/log/ReliableLog.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/rmic/Constants.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/rmic/Generator.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/rmic/IndentingWriter.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/rmic/Main.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/rmic/Names.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/rmic/newrmic/BatchEnvironment.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/rmic/newrmic/Constants.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/rmic/newrmic/Generator.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/rmic/newrmic/IndentingWriter.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/rmic/newrmic/jrmp/Constants.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/rmic/newrmic/jrmp/JrmpGenerator.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/rmic/newrmic/jrmp/RemoteClass.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/rmic/newrmic/jrmp/StubSkeletonWriter.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/rmic/newrmic/jrmp/Util.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/rmic/newrmic/Main.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/rmic/newrmic/Resources.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/rmic/RemoteClass.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/rmic/RMIConstants.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/rmic/Util.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/runtime/Log.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/runtime/NewThreadAction.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/runtime/RuntimeUtil.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/server/ActivatableRef.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/server/ActivatableServerRef.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/server/Activation.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/server/ActivationGroupInit.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/server/Dispatcher.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/server/InactiveGroupException.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/server/MarshalOutputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/server/UnicastRef.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/server/UnicastRef2.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/server/UnicastServerRef2.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/server/Util.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/Channel.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/Connection.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/ConnectionOutputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/DGCClient.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/Endpoint.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/LiveRef.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/ObjectEndpoint.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/proxy/HttpAwareServerSocket.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/proxy/HttpInputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/proxy/HttpOutputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/proxy/HttpReceiveSocket.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/proxy/HttpSendInputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/proxy/HttpSendOutputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/proxy/HttpSendSocket.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/proxy/RMIDirectSocketFactory.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/proxy/RMIHttpToCGISocketFactory.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/proxy/RMIHttpToPortSocketFactory.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/proxy/RMISocketInfo.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/proxy/WrappedSocket.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/StreamRemoteCall.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/Target.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/tcp/MultiplexConnectionInfo.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/tcp/MultiplexInputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/tcp/MultiplexOutputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/tcp/TCPConnection.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/Transport.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/TransportConstants.java
-@OPENJDK@/jdk/src/share/classes/sun/rmi/transport/WeakRef.java
-@OPENJDK@/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/acl/AclImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/acl/AllPermissionsImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/acl/GroupImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/acl/OwnerImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/acl/PermissionImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/acl/PrincipalImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/acl/WorldGroupImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/action/GetBooleanAction.java
-@OPENJDK@/jdk/src/share/classes/sun/security/action/GetBooleanSecurityPropertyAction.java
-@OPENJDK@/jdk/src/share/classes/sun/security/action/GetIntegerAction.java
-@OPENJDK@/jdk/src/share/classes/sun/security/action/GetLongAction.java
-@OPENJDK@/jdk/src/share/classes/sun/security/action/GetPropertyAction.java
-@OPENJDK@/jdk/src/share/classes/sun/security/action/OpenFileInputStreamAction.java
-@OPENJDK@/jdk/src/share/classes/sun/security/action/PutAllAction.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ec/CurveDB.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ec/ECKeyFactory.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ec/ECParameters.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ec/ECPrivateKeyImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ec/ECPublicKeyImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ec/NamedCurve.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ec/SunEC.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ec/SunECEntries.java
-@OPENJDK@/jdk/src/share/classes/sun/security/internal/interfaces/TlsMasterSecret.java
-@OPENJDK@/jdk/src/share/classes/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/sun/security/internal/spec/TlsKeyMaterialSpec.java
-@OPENJDK@/jdk/src/share/classes/sun/security/internal/spec/TlsMasterSecretParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/sun/security/internal/spec/TlsPrfParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jca/GetInstance.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jca/JCAUtil.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jca/ProviderConfig.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jca/ProviderList.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jca/Providers.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jca/ServiceId.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/GSSCaller.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/GSSContextImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/GSSCredentialImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/GSSExceptionImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/GSSHeader.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/GSSNameImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/GSSToken.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/GSSUtil.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/HttpCaller.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/krb5/AcceptSecContextToken.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/krb5/CipherHelper.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/krb5/InitialToken.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/krb5/InitSecContextToken.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Context.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/krb5/Krb5CredElement.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/krb5/Krb5MechFactory.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/krb5/Krb5NameElement.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/krb5/Krb5ProxyCredential.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Token.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/krb5/MessageToken.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/krb5/MessageToken_v2.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/krb5/MicToken.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/krb5/MicToken_v2.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/krb5/ServiceCreds.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/krb5/SubjectComber.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/krb5/WrapToken.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/krb5/WrapToken_v2.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/LoginConfigImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/ProviderList.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/spi/GSSContextSpi.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/spi/GSSCredentialSpi.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/spi/GSSNameSpi.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/spi/MechanismFactory.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/spnego/NegTokenInit.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/spnego/NegTokenTarg.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoContext.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoCredElement.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoMechFactory.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoToken.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/SunProvider.java
-@OPENJDK@/jdk/src/share/classes/sun/security/jgss/TokenTracker.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/Asn1Exception.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/Checksum.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/Config.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/Confounder.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/Credentials.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/EncryptedData.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/EncryptionKey.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/APOptions.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/APRep.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/APReq.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/ASRep.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/ASReq.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/AuthContext.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationDataEntry.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/ccache/CCacheOutputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/ccache/Credentials.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/ccache/CredentialsCache.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCCacheConstants.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/ccache/MemoryCredentialsCache.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/ccache/Tag.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/CredentialsUtil.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/Aes128.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/Aes128CtsHmacSha1EType.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/Aes256.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/Aes256CtsHmacSha1EType.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/ArcFourHmac.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/ArcFourHmacEType.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/CksumType.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/crc32.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/Crc32CksumType.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/Des.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/Des3.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/Des3CbcHmacSha1KdEType.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/DesCbcCrcEType.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/DesCbcEType.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/DesCbcMd5EType.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/DesMacCksumType.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/DesMacKCksumType.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/dk/AesDkCrypto.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/dk/ArcFourCrypto.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/dk/Des3DkCrypto.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/HmacMd5ArcFourCksumType.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes128CksumType.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes256CksumType.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Des3KdCksumType.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/KeyUsage.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/Nonce.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/NullEType.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/RsaMd5CksumType.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/RsaMd5DesCksumType.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/EncASRepPart.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/EncKDCRepPart.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/EncKrbCredPart.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/EncKrbPrivPart.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/EncTGSRepPart.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/EncTicketPart.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/ETypeInfo.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/ETypeInfo2.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/HostAddress.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/KdcErrException.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/KDCOptions.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/KDCRep.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/KerberosTime.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/Krb5.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/KrbApErrException.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/KrbErrException.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/KRBPriv.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/KRBSafe.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/KRBSafeBody.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTabConstants.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTabEntry.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTabInputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTabOutputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/LastReqEntry.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/LocalSeqNumber.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/LoginOptions.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/MethodData.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/NetClient.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/PAData.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/PAEncTSEnc.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/PAForUserEnc.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/rcache/AuthList.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/rcache/AuthTime.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/rcache/AuthTimeWithHash.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/rcache/DflCache.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/rcache/MemoryCache.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/ReplayCache.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/SeqNumber.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/TGSRep.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/TGSReq.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/Ticket.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/TicketFlags.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/TransitedEncoding.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/util/KerberosFlags.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/util/KerberosString.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/util/KrbDataInputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/util/KrbDataOutputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/JavaxSecurityAuthKerberosAccess.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/KdcComm.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/KerberosSecrets.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/KrbAppMessage.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/KrbApRep.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/KrbApReq.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/KrbAsRep.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/KrbAsReq.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/KrbAsReqBuilder.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/KrbCred.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/KrbCryptoException.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/KrbException.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/KrbKdcRep.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/KrbPriv.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/KrbSafe.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/KrbServiceLocator.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/KrbTgsRep.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/KrbTgsReq.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/PrincipalName.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/Realm.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/RealmException.java
-@OPENJDK@/jdk/src/share/classes/sun/security/krb5/SCDynamicStoreConfig.java
-@OPENJDK@/jdk/src/share/classes/sun/security/pkcs/ContentInfo.java
-@OPENJDK@/jdk/src/share/classes/sun/security/pkcs/EncryptedPrivateKeyInfo.java
-@OPENJDK@/jdk/src/share/classes/sun/security/pkcs/ParsingException.java
-@OPENJDK@/jdk/src/share/classes/sun/security/pkcs/PKCS7.java
-@OPENJDK@/jdk/src/share/classes/sun/security/pkcs/PKCS8Key.java
-@OPENJDK@/jdk/src/share/classes/sun/security/pkcs/PKCS9Attribute.java
-@OPENJDK@/jdk/src/share/classes/sun/security/pkcs/PKCS9Attributes.java
-@OPENJDK@/jdk/src/share/classes/sun/security/pkcs/SignerInfo.java
-@OPENJDK@/jdk/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java
-@OPENJDK@/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java
-@OPENJDK@/jdk/src/share/classes/sun/security/pkcs10/PKCS10Attribute.java
-@OPENJDK@/jdk/src/share/classes/sun/security/pkcs10/PKCS10Attributes.java
-@OPENJDK@/jdk/src/share/classes/sun/security/pkcs12/MacData.java
-@OPENJDK@/jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/AuthPolicyFile.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/ByteArrayAccess.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/AdaptableX509CertSelector.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/AdjacencyList.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/AlgorithmChecker.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/BasicChecker.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/Builder.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/BuildStep.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/CertId.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/CertPathHelper.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/CertStoreHelper.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/CollectionCertStore.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/ConstraintsChecker.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/ForwardBuilder.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/ForwardState.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/IndexedCollectionCertStore.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/KeyChecker.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreHelper.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/OCSPRequest.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/PKIX.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/PKIXMasterCertPathValidator.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/PolicyChecker.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/PolicyNodeImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/ReverseBuilder.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/ReverseState.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/RevocationChecker.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStoreHelper.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/State.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderException.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderResult.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/UntrustedChecker.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/URICertStore.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/Vertex.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/X509CertificatePair.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/X509CertPath.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/ConfigFile.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/DigestBase.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/DomainKeyStore.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/DSA.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/DSAKeyFactory.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/DSAKeyPairGenerator.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/DSAParameterGenerator.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/DSAParameters.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/DSAPrivateKey.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/DSAPublicKey.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/DSAPublicKeyImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/KeyProtector.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/MD2.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/MD4.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/MD5.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/ParameterCache.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/PolicyFile.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/PolicyParser.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/PolicySpiFile.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/SecureRandom.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/SeedGenerator.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/SHA.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/SHA2.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/SHA5.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/SubjectCodeSource.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/Sun.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/SunEntries.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/VerificationProvider.java
-@OPENJDK@/jdk/src/share/classes/sun/security/provider/X509Factory.java
-@OPENJDK@/jdk/src/share/classes/sun/security/rsa/RSACore.java
-@OPENJDK@/jdk/src/share/classes/sun/security/rsa/RSAKeyFactory.java
-@OPENJDK@/jdk/src/share/classes/sun/security/rsa/RSAKeyPairGenerator.java
-@OPENJDK@/jdk/src/share/classes/sun/security/rsa/RSAPadding.java
-@OPENJDK@/jdk/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/rsa/RSAPublicKeyImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/rsa/RSASignature.java
-@OPENJDK@/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java
-@OPENJDK@/jdk/src/share/classes/sun/security/rsa/SunRsaSignEntries.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/Alerts.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/AppInputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/AppOutputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/Authenticator.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/BaseSSLSocketImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/ByteBufferInputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/CipherBox.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/CipherSuite.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/CipherSuiteList.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/Debug.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/DHClientKeyExchange.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/DHCrypt.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/ECDHClientKeyExchange.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/ECDHCrypt.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/EngineArgs.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/EngineInputRecord.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/EngineWriter.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/EphemeralKeyManager.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/ExtensionType.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/HandshakeHash.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/HandshakeInStream.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/HandshakeOutStream.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/Handshaker.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/HelloExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/InputRecord.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/JsseJce.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/KerberosClientKeyExchange.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/KeyManagerFactoryImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/krb5/KerberosClientKeyExchangeImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/krb5/KerberosPreMasterSecret.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/krb5/Krb5ProxyImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/Krb5Helper.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/Krb5Proxy.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/MAC.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/OutputRecord.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/ProtocolList.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/ProtocolVersion.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/RandomCookie.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/Record.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/RenegotiationInfoExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/RSASignature.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/ServerNameExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/SessionId.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/SSLServerSocketFactoryImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/SSLServerSocketImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/SSLSessionContextImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/SunJSSE.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/SupportedEllipticPointFormatsExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/UnknownExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/Utilities.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/ssl/X509TrustManagerImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/timestamp/HttpTimestamper.java
-@OPENJDK@/jdk/src/share/classes/sun/security/timestamp/Timestamper.java
-@OPENJDK@/jdk/src/share/classes/sun/security/timestamp/TimestampToken.java
-@OPENJDK@/jdk/src/share/classes/sun/security/timestamp/TSRequest.java
-@OPENJDK@/jdk/src/share/classes/sun/security/timestamp/TSResponse.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/jarsigner/Resources.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/jarsigner/Resources_ja.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/jarsigner/TimestampedSigner.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/keytool/CertAndKeyGen.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/keytool/Main.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/keytool/Resources.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/keytool/Resources_de.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/keytool/Resources_es.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/keytool/Resources_fr.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/keytool/Resources_it.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/keytool/Resources_ja.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/keytool/Resources_ko.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/keytool/Resources_pt_BR.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/keytool/Resources_sv.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/keytool/Resources_zh_CN.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/keytool/Resources_zh_HK.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/keytool/Resources_zh_TW.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/PathList.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/policytool/Resources.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/policytool/Resources_de.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/policytool/Resources_es.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/policytool/Resources_fr.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/policytool/Resources_it.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/policytool/Resources_ja.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/policytool/Resources_ko.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/policytool/Resources_pt_BR.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/policytool/Resources_sv.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/policytool/Resources_zh_CN.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/policytool/Resources_zh_HK.java
-@OPENJDK@/jdk/src/share/classes/sun/security/tools/policytool/Resources_zh_TW.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/AuthResources.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/AuthResources_de.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/AuthResources_es.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/AuthResources_fr.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/AuthResources_it.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/AuthResources_ja.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/AuthResources_ko.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/AuthResources_pt_BR.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/AuthResources_sv.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/AuthResources_zh_CN.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/AuthResources_zh_TW.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/BitArray.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/ByteArrayLexOrder.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/ByteArrayTagOrder.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/Cache.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/Debug.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/DerEncoder.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/DerIndefLenConverter.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/DerInputBuffer.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/DerInputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/DerOutputStream.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/DerValue.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/ECKeySizeParameterSpec.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/ECUtil.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/HostnameChecker.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/KeyUtil.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/Length.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/ManifestDigester.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/ManifestEntryVerifier.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/ObjectIdentifier.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/Password.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/PendingException.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/PermissionFactory.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/PolicyUtil.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/PropertyExpander.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/Resources.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/Resources_de.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/Resources_es.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/Resources_fr.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/Resources_it.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/Resources_ja.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/Resources_ko.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/Resources_pt_BR.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/Resources_sv.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/Resources_zh_CN.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/Resources_zh_TW.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/ResourcesMgr.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/SecurityConstants.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java
-@OPENJDK@/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java
-@OPENJDK@/jdk/src/share/classes/sun/security/validator/EndEntityChecker.java
-@OPENJDK@/jdk/src/share/classes/sun/security/validator/KeyStores.java
-@OPENJDK@/jdk/src/share/classes/sun/security/validator/PKIXValidator.java
-@OPENJDK@/jdk/src/share/classes/sun/security/validator/SimpleValidator.java
-@OPENJDK@/jdk/src/share/classes/sun/security/validator/Validator.java
-@OPENJDK@/jdk/src/share/classes/sun/security/validator/ValidatorException.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/AccessDescription.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/AlgIdDSA.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/AlgorithmId.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/AttributeNameEnumeration.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/AuthorityInfoAccessExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/AuthorityKeyIdentifierExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/AVA.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/BasicConstraintsExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/CertAttrSet.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/CertException.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/CertificateAlgorithmId.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/CertificateExtensions.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/CertificateIssuerExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/CertificateIssuerName.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/CertificatePoliciesExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/CertificatePolicyId.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/CertificatePolicyMap.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/CertificatePolicySet.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/CertificateSerialNumber.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/CertificateSubjectName.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/CertificateValidity.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/CertificateVersion.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/CertificateX509Key.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/CertParseError.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/CRLDistributionPointsExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/CRLExtensions.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/CRLNumberExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/CRLReasonCodeExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/DeltaCRLIndicatorExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/DistributionPoint.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/DistributionPointName.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/DNSName.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/EDIPartyName.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/ExtendedKeyUsageExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/Extension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/FreshestCRLExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/GeneralName.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/GeneralNameInterface.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/GeneralNames.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/GeneralSubtree.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/GeneralSubtrees.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/InhibitAnyPolicyExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/InvalidityDateExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/IPAddressName.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/IssuerAlternativeNameExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/IssuingDistributionPointExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/KeyIdentifier.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/KeyUsageExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/NameConstraintsExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/NetscapeCertTypeExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/OCSPNoCheckExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/OIDMap.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/OIDName.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/OtherName.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/PKIXExtensions.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/PolicyConstraintsExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/PolicyInformation.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/PolicyMappingsExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/PrivateKeyUsageExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/RDN.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/ReasonFlags.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/RFC822Name.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/SerialNumber.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/SubjectAlternativeNameExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/SubjectInfoAccessExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/SubjectKeyIdentifierExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/UniqueIdentity.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/URIName.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/X400Address.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/X500Name.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/X509AttributeName.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/X509CertImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/X509CertInfo.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/security/x509/X509Key.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/AccumulativeRunnable.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/BakedArrayList.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/CachedPainter.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/DefaultLayoutStyle.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/DefaultLookup.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/FilePane.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/icon/SortArrowIcon.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/ImageCache.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/ImageIconUIResource.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/JLightweightFrame.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/LightweightContent.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/MenuItemCheckIconFactory.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/MenuItemLayoutHelper.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/plaf/GTKKeybindings.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/plaf/synth/DefaultSynthStyle.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/plaf/synth/Paint9Painter.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/plaf/synth/StyleAssociation.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUI.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/plaf/synth/SynthIcon.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/plaf/windows/ClassicSortArrowIcon.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/plaf/WindowsKeybindings.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/PrintColorUIResource.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/PrintingStatus.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/StringUIClientPropertyKey.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/SwingAccessor.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/SwingLazyValue.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/SwingUtilities2.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/table/DefaultTableCellHeaderRenderer.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/text/CompoundPrintable.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/text/CountingPrintable.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/text/html/FrameEditorPaneTag.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/text/TextComponentPrintable.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/UIAction.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/UIClientPropertyKey.java
-@OPENJDK@/jdk/src/share/classes/sun/swing/WindowsPlacesBar.java
-@OPENJDK@/jdk/src/share/classes/sun/text/bidi/BidiBase.java
-@OPENJDK@/jdk/src/share/classes/sun/text/bidi/BidiLine.java
-@OPENJDK@/jdk/src/share/classes/sun/text/bidi/BidiRun.java
-@OPENJDK@/jdk/src/share/classes/sun/text/CodePointIterator.java
-@OPENJDK@/jdk/src/share/classes/sun/text/CollatorUtilities.java
-@OPENJDK@/jdk/src/share/classes/sun/text/CompactByteArray.java
-@OPENJDK@/jdk/src/share/classes/sun/text/ComposedCharIter.java
-@OPENJDK@/jdk/src/share/classes/sun/text/IntHashtable.java
-@OPENJDK@/jdk/src/share/classes/sun/text/Normalizer.java
-@OPENJDK@/jdk/src/share/classes/sun/text/normalizer/CharacterIteratorWrapper.java
-@OPENJDK@/jdk/src/share/classes/sun/text/normalizer/CharTrie.java
-@OPENJDK@/jdk/src/share/classes/sun/text/normalizer/ICUBinary.java
-@OPENJDK@/jdk/src/share/classes/sun/text/normalizer/ICUData.java
-@OPENJDK@/jdk/src/share/classes/sun/text/normalizer/IntTrie.java
-@OPENJDK@/jdk/src/share/classes/sun/text/normalizer/NormalizerBase.java
-@OPENJDK@/jdk/src/share/classes/sun/text/normalizer/NormalizerDataReader.java
-@OPENJDK@/jdk/src/share/classes/sun/text/normalizer/NormalizerImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/text/normalizer/RangeValueIterator.java
-@OPENJDK@/jdk/src/share/classes/sun/text/normalizer/Replaceable.java
-@OPENJDK@/jdk/src/share/classes/sun/text/normalizer/ReplaceableString.java
-@OPENJDK@/jdk/src/share/classes/sun/text/normalizer/ReplaceableUCharacterIterator.java
-@OPENJDK@/jdk/src/share/classes/sun/text/normalizer/RuleCharacterIterator.java
-@OPENJDK@/jdk/src/share/classes/sun/text/normalizer/SymbolTable.java
-@OPENJDK@/jdk/src/share/classes/sun/text/normalizer/Trie.java
-@OPENJDK@/jdk/src/share/classes/sun/text/normalizer/TrieIterator.java
-@OPENJDK@/jdk/src/share/classes/sun/text/normalizer/UBiDiProps.java
-@OPENJDK@/jdk/src/share/classes/sun/text/normalizer/UCharacter.java
-@OPENJDK@/jdk/src/share/classes/sun/text/normalizer/UCharacterIterator.java
-@OPENJDK@/jdk/src/share/classes/sun/text/normalizer/UCharacterProperty.java
-@OPENJDK@/jdk/src/share/classes/sun/text/normalizer/UCharacterPropertyReader.java
-@OPENJDK@/jdk/src/share/classes/sun/text/normalizer/UnicodeMatcher.java
-@OPENJDK@/jdk/src/share/classes/sun/text/normalizer/UnicodeSet.java
-@OPENJDK@/jdk/src/share/classes/sun/text/normalizer/UnicodeSetIterator.java
-@OPENJDK@/jdk/src/share/classes/sun/text/normalizer/UTF16.java
-@OPENJDK@/jdk/src/share/classes/sun/text/normalizer/Utility.java
-@OPENJDK@/jdk/src/share/classes/sun/text/normalizer/VersionInfo.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ar/CollationData_ar.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ar/FormatData_ar.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ar/FormatData_ar_JO.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ar/FormatData_ar_LB.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ar/FormatData_ar_SY.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ar/JavaTimeSupplementary_ar.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/be/CollationData_be.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/be/FormatData_be.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/be/FormatData_be_BY.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/be/JavaTimeSupplementary_be.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/bg/CollationData_bg.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/bg/FormatData_bg.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/bg/FormatData_bg_BG.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/bg/JavaTimeSupplementary_bg.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/BreakIteratorInfo.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ca/CollationData_ca.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ca/FormatData_ca.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ca/FormatData_ca_ES.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ca/JavaTimeSupplementary_ca.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/CollationData.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/cs/CollationData_cs.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/cs/FormatData_cs.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/cs/FormatData_cs_CZ.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/cs/JavaTimeSupplementary_cs.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/da/CollationData_da.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/da/FormatData_da.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/da/FormatData_da_DK.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/da/JavaTimeSupplementary_da.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/de/FormatData_de.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/de/FormatData_de_AT.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/de/FormatData_de_CH.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/de/FormatData_de_DE.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/de/FormatData_de_LU.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/de/JavaTimeSupplementary_de.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/el/CollationData_el.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/el/FormatData_el.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/el/FormatData_el_CY.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/el/FormatData_el_GR.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/el/JavaTimeSupplementary_el.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/en/FormatData_en.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/en/FormatData_en_AU.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/en/FormatData_en_CA.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/en/FormatData_en_GB.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/en/FormatData_en_IE.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/en/FormatData_en_IN.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/en/FormatData_en_MT.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/en/FormatData_en_NZ.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/en/FormatData_en_PH.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/en/FormatData_en_SG.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/en/FormatData_en_US.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/en/FormatData_en_ZA.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/en/JavaTimeSupplementary_en.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/en/JavaTimeSupplementary_en_GB.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/en/JavaTimeSupplementary_en_SG.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/es/CollationData_es.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/es/FormatData_es.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/es/FormatData_es_AR.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/es/FormatData_es_BO.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/es/FormatData_es_CL.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/es/FormatData_es_CO.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/es/FormatData_es_CR.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/es/FormatData_es_DO.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/es/FormatData_es_EC.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/es/FormatData_es_ES.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/es/FormatData_es_GT.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/es/FormatData_es_HN.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/es/FormatData_es_MX.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/es/FormatData_es_NI.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/es/FormatData_es_PA.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/es/FormatData_es_PE.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/es/FormatData_es_PR.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/es/FormatData_es_PY.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/es/FormatData_es_SV.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/es/FormatData_es_US.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/es/FormatData_es_UY.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/es/FormatData_es_VE.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/es/JavaTimeSupplementary_es.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/et/CollationData_et.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/et/FormatData_et.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/et/FormatData_et_EE.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/et/JavaTimeSupplementary_et.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/fi/CollationData_fi.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/fi/FormatData_fi.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/fi/FormatData_fi_FI.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/fi/JavaTimeSupplementary_fi.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/FormatData.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/fr/CollationData_fr.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/fr/FormatData_fr.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/fr/FormatData_fr_BE.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/fr/FormatData_fr_CA.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/fr/FormatData_fr_CH.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/fr/FormatData_fr_FR.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/fr/JavaTimeSupplementary_fr.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ga/FormatData_ga.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ga/FormatData_ga_IE.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ga/JavaTimeSupplementary_ga.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/hi/CollationData_hi.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/hi/FormatData_hi_IN.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/hi/JavaTimeSupplementary_hi_IN.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/hr/CollationData_hr.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/hr/FormatData_hr.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/hr/FormatData_hr_HR.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/hr/JavaTimeSupplementary_hr.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/hu/CollationData_hu.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/hu/FormatData_hu.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/hu/FormatData_hu_HU.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/hu/JavaTimeSupplementary_hu.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/in/FormatData_in.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/in/FormatData_in_ID.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/is/CollationData_is.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/is/FormatData_is.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/is/FormatData_is_IS.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/is/JavaTimeSupplementary_is.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/it/FormatData_it.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/it/FormatData_it_CH.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/it/FormatData_it_IT.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/it/JavaTimeSupplementary_it.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/iw/CollationData_iw.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/iw/FormatData_iw.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/iw/FormatData_iw_IL.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/iw/JavaTimeSupplementary_iw.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/iw/JavaTimeSupplementary_iw_IL.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ja/CollationData_ja.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ja/FormatData_ja.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ja/FormatData_ja_JP.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ja/JavaTimeSupplementary_ja.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/JavaTimeSupplementary.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ko/CollationData_ko.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ko/FormatData_ko.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ko/FormatData_ko_KR.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ko/JavaTimeSupplementary_ko.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/lt/CollationData_lt.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/lt/FormatData_lt.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/lt/FormatData_lt_LT.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/lt/JavaTimeSupplementary_lt.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/lv/CollationData_lv.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/lv/FormatData_lv.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/lv/FormatData_lv_LV.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/lv/JavaTimeSupplementary_lv.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/mk/CollationData_mk.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/mk/FormatData_mk.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/mk/FormatData_mk_MK.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/mk/JavaTimeSupplementary_mk.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ms/FormatData_ms.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ms/FormatData_ms_MY.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ms/JavaTimeSupplementary_ms.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/mt/FormatData_mt.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/mt/FormatData_mt_MT.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/mt/JavaTimeSupplementary_mt.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/nl/FormatData_nl.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/nl/FormatData_nl_BE.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/nl/FormatData_nl_NL.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/nl/JavaTimeSupplementary_nl.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/no/CollationData_no.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/no/FormatData_no.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/no/FormatData_no_NO.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/no/FormatData_no_NO_NY.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/no/JavaTimeSupplementary_no.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/pl/CollationData_pl.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/pl/FormatData_pl.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/pl/FormatData_pl_PL.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/pl/JavaTimeSupplementary_pl.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/pt/FormatData_pt.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/pt/FormatData_pt_BR.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/pt/FormatData_pt_PT.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/pt/JavaTimeSupplementary_pt.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/pt/JavaTimeSupplementary_pt_PT.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ro/CollationData_ro.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ro/FormatData_ro.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ro/FormatData_ro_RO.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ro/JavaTimeSupplementary_ro.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ru/CollationData_ru.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ru/FormatData_ru.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ru/FormatData_ru_RU.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/ru/JavaTimeSupplementary_ru.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/sk/CollationData_sk.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/sk/FormatData_sk.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/sk/FormatData_sk_SK.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/sk/JavaTimeSupplementary_sk.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/sl/CollationData_sl.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/sl/FormatData_sl.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/sl/FormatData_sl_SI.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/sl/JavaTimeSupplementary_sl.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/sq/CollationData_sq.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/sq/FormatData_sq.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/sq/FormatData_sq_AL.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/sq/JavaTimeSupplementary_sq.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/sr/CollationData_sr.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/sr/CollationData_sr_Latn.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/sr/FormatData_sr.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/sr/FormatData_sr_BA.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/sr/FormatData_sr_CS.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/sr/FormatData_sr_Latn.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/sr/FormatData_sr_Latn_ME.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/sr/FormatData_sr_ME.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/sr/FormatData_sr_RS.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/sr/JavaTimeSupplementary_sr.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/sr/JavaTimeSupplementary_sr_Latn.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/sv/CollationData_sv.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/sv/FormatData_sv.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/sv/FormatData_sv_SE.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/sv/JavaTimeSupplementary_sv.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/th/BreakIteratorInfo_th.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/th/BreakIteratorRules_th.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/th/CollationData_th.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/th/FormatData_th.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/th/FormatData_th_TH.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/th/JavaTimeSupplementary_th.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/tr/CollationData_tr.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/tr/FormatData_tr.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/tr/FormatData_tr_TR.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/tr/JavaTimeSupplementary_tr.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/uk/CollationData_uk.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/uk/FormatData_uk.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/uk/FormatData_uk_UA.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/uk/JavaTimeSupplementary_uk.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/vi/CollationData_vi.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/vi/FormatData_vi.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/vi/FormatData_vi_VN.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/vi/JavaTimeSupplementary_vi.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/zh/CollationData_zh.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/zh/CollationData_zh_HK.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/zh/CollationData_zh_TW.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/zh/FormatData_zh.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/zh/FormatData_zh_CN.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/zh/FormatData_zh_HK.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/zh/FormatData_zh_SG.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/zh/FormatData_zh_TW.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/zh/JavaTimeSupplementary_zh.java
-@OPENJDK@/jdk/src/share/classes/sun/text/resources/zh/JavaTimeSupplementary_zh_TW.java
-@OPENJDK@/jdk/src/share/classes/sun/text/SupplementaryCharacterData.java
-@OPENJDK@/jdk/src/share/classes/sun/text/UCompactIntArray.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/asm/ArrayData.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/asm/Assembler.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/asm/CatchData.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/asm/ClassConstantData.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/asm/ConstantPool.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/asm/ConstantPoolData.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/asm/Cover.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/asm/FieldConstantData.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/asm/Instruction.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/asm/Label.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/asm/LocalVariable.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/asm/LocalVariableTable.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/asm/NameAndTypeConstantData.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/asm/NameAndTypeData.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/asm/NumberConstantData.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/asm/StringConstantData.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/asm/StringExpressionConstantData.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/asm/SwitchData.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/asm/TryData.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/jar/CommandLine.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/jar/JarException.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/jar/Main.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/jar/Manifest.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/jar/SignatureFile.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/AmbiguousClass.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/AmbiguousMember.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/ArrayType.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/BinaryAttribute.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/BinaryClass.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/BinaryCode.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/BinaryConstantPool.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/BinaryExceptionHandler.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/BinaryMember.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/ClassDeclaration.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/ClassDefinition.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/ClassFile.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/ClassNotFound.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/ClassPath.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/ClassType.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/CompilerError.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/Constants.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/Environment.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/Identifier.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/IdentifierToken.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/Imports.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/MemberDefinition.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/MethodSet.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/MethodType.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/Package.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/Parser.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/ParserActions.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/RuntimeConstants.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/Scanner.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/ScannerInputReader.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/SyntaxError.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/java/Type.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/javac/BatchEnvironment.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/javac/BatchParser.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/javac/CompilerMember.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/javac/ErrorConsumer.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/javac/ErrorMessage.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/javac/Main.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/javac/SourceClass.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/javac/SourceMember.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/native2ascii/A2NFilter.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/native2ascii/Main.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/native2ascii/N2AFilter.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_ja.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_zh_CN.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/serialver/SerialVer.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/AddExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/AndExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/ArrayAccessExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/ArrayExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/AssignAddExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/AssignBitAndExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/AssignBitOrExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/AssignBitXorExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/AssignDivideExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/AssignExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/AssignMultiplyExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/AssignOpExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/AssignRemainderExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/AssignShiftLeftExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/AssignShiftRightExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/AssignSubtractExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/AssignUnsignedShiftRightExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/BinaryArithmeticExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/BinaryAssignExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/BinaryBitExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/BinaryCompareExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/BinaryEqualityExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/BinaryExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/BinaryLogicalExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/BinaryShiftExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/BitAndExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/BitNotExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/BitOrExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/BitXorExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/BooleanExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/BreakStatement.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/ByteExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/CaseStatement.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/CastExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/CatchStatement.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/CharExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/CheckContext.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/CodeContext.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/CommaExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/CompoundStatement.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/ConditionalExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/ConditionVars.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/ConstantExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/Context.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/ContinueStatement.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/ConvertExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/DeclarationStatement.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/DivideExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/DivRemExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/DoStatement.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/DoubleExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/EqualExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/Expression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/ExpressionStatement.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/ExprExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/FieldExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/FieldUpdater.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/FinallyStatement.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/FloatExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/ForStatement.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/GreaterExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/GreaterOrEqualExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/IdentifierExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/IfStatement.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/IncDecExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/InlineMethodExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/InlineNewInstanceExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/InlineReturnStatement.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/InstanceOfExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/IntegerExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/IntExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/LengthExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/LessExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/LessOrEqualExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/LocalMember.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/LongExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/MethodExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/MultiplyExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/NaryExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/NegativeExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/NewArrayExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/NewInstanceExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/Node.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/NotEqualExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/NotExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/NullExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/OrExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/PositiveExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/PostDecExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/PostIncExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/PreDecExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/PreIncExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/RemainderExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/ReturnStatement.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/ShiftLeftExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/ShiftRightExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/ShortExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/Statement.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/StringExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/SubtractExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/SuperExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/SwitchStatement.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/SynchronizedStatement.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/ThisExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/ThrowStatement.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/TryStatement.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/TypeExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/UnaryExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/UnsignedShiftRightExpression.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/UplevelReference.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/VarDeclarationStatement.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/Vset.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/tree/WhileStatement.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/util/CommandLine.java
-@OPENJDK@/jdk/src/share/classes/sun/tools/util/ModifierFilter.java
-@OPENJDK@/jdk/src/share/classes/sun/util/BuddhistCalendar.java
-@OPENJDK@/jdk/src/share/classes/sun/util/calendar/AbstractCalendar.java
-@OPENJDK@/jdk/src/share/classes/sun/util/calendar/BaseCalendar.java
-@OPENJDK@/jdk/src/share/classes/sun/util/calendar/CalendarDate.java
-@OPENJDK@/jdk/src/share/classes/sun/util/calendar/CalendarSystem.java
-@OPENJDK@/jdk/src/share/classes/sun/util/calendar/CalendarUtils.java
-@OPENJDK@/jdk/src/share/classes/sun/util/calendar/Era.java
-@OPENJDK@/jdk/src/share/classes/sun/util/calendar/Gregorian.java
-@OPENJDK@/jdk/src/share/classes/sun/util/calendar/ImmutableGregorianDate.java
-@OPENJDK@/jdk/src/share/classes/sun/util/calendar/JulianCalendar.java
-@OPENJDK@/jdk/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java
-@OPENJDK@/jdk/src/share/classes/sun/util/calendar/ZoneInfo.java
-@OPENJDK@/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java
-@OPENJDK@/jdk/src/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/AsciiUtil.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/BaseLocale.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/Extension.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/LanguageTag.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/LocaleEquivalentMaps.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/LocaleMatcher.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/LocaleSyntaxException.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/LocaleUtils.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/ParseStatus.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/AuxLocaleProviderAdapter.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/AvailableLanguageTags.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/BreakDictionary.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/BreakIteratorProviderImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/CalendarDataProviderImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/CalendarDataUtility.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/CalendarProviderImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/CollationRules.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/CollatorProviderImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/CurrencyNameProviderImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/DateFormatProviderImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/DateFormatSymbolsProviderImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/DecimalFormatSymbolsProviderImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/DictionaryBasedBreakIterator.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/FallbackLocaleProviderAdapter.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/HostLocaleProviderAdapter.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/JRELocaleConstants.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/LocaleNameProviderImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/LocaleResources.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/LocaleServiceProviderPool.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/NumberFormatProviderImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/ResourceBundleBasedAdapter.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/RuleBasedBreakIterator.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/SPILocaleProviderAdapter.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/TimeZoneNameProviderImpl.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/TimeZoneNameUtility.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/StringTokenIterator.java
-@OPENJDK@/jdk/src/share/classes/sun/util/locale/UnicodeLocaleExtension.java
-@OPENJDK@/jdk/src/share/classes/sun/util/logging/LoggingProxy.java
-@OPENJDK@/jdk/src/share/classes/sun/util/logging/LoggingSupport.java
-@OPENJDK@/jdk/src/share/classes/sun/util/logging/PlatformLogger.java
-@OPENJDK@/jdk/src/share/classes/sun/util/PreHashedMap.java
-@OPENJDK@/jdk/src/share/classes/sun/util/ResourceBundleEnumeration.java
-@OPENJDK@/jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java
-@OPENJDK@/jdk/src/share/classes/sun/util/resources/en/TimeZoneNames_en.java
-@OPENJDK@/jdk/src/share/classes/sun/util/resources/en/TimeZoneNames_en_CA.java
-@OPENJDK@/jdk/src/share/classes/sun/util/resources/en/TimeZoneNames_en_GB.java
-@OPENJDK@/jdk/src/share/classes/sun/util/resources/en/TimeZoneNames_en_IE.java
-@OPENJDK@/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java
-@OPENJDK@/jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java
-@OPENJDK@/jdk/src/share/classes/sun/util/resources/hi/TimeZoneNames_hi.java
-@OPENJDK@/jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java
-@OPENJDK@/jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java
-@OPENJDK@/jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java
-@OPENJDK@/jdk/src/share/classes/sun/util/resources/LocaleData.java
-@OPENJDK@/jdk/src/share/classes/sun/util/resources/LocaleNamesBundle.java
-@OPENJDK@/jdk/src/share/classes/sun/util/resources/OpenListResourceBundle.java
-@OPENJDK@/jdk/src/share/classes/sun/util/resources/ParallelListResourceBundle.java
-@OPENJDK@/jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java
-@OPENJDK@/jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java
-@OPENJDK@/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java
-@OPENJDK@/jdk/src/share/classes/sun/util/resources/TimeZoneNamesBundle.java
-@OPENJDK@/jdk/src/share/classes/sun/util/resources/zh/CurrencyNames_zh_HK.java
-@OPENJDK@/jdk/src/share/classes/sun/util/resources/zh/CurrencyNames_zh_SG.java
-@OPENJDK@/jdk/src/share/classes/sun/util/resources/zh/LocaleNames_zh_HK.java
-@OPENJDK@/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java
-@OPENJDK@/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_HK.java
-@OPENJDK@/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java
-@OPENJDK@/jdk/src/share/classes/sun/util/spi/CalendarProvider.java
-@OPENJDK@/jdk/src/share/classes/sun/util/spi/XmlPropertiesProvider.java
-@OPENJDK@/jdk/src/share/classes/sun/util/xml/PlatformXmlPropertiesProvider.java
-@OPENJDK@/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/JarFileSystemProvider.java
-@OPENJDK@/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java
-@OPENJDK@/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipConstants.java
-@OPENJDK@/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipDirectoryStream.java
-@OPENJDK@/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributes.java
-@OPENJDK@/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java
-@OPENJDK@/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileStore.java
-@OPENJDK@/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java
-@OPENJDK@/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java
-@OPENJDK@/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipInfo.java
-@OPENJDK@/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipPath.java
-@OPENJDK@/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipUtils.java
-@OPENJDK@/jdk/src/solaris/classes/java/io/UnixFileSystem.java
-@OPENJDK@/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java
-@OPENJDK@/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferencesFactory.java
-@OPENJDK@/jdk/src/solaris/classes/sun/awt/windows/ThemeReader.java
-@OPENJDK@/jdk/src/solaris/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java
-@OPENJDK@/jdk/src/windows/classes/java/io/WinNTFileSystem.java
-@OPENJDK@/jdk/src/windows/classes/java/lang/ProcessEnvironment.java
-@OPENJDK@/jdk/src/windows/classes/java/lang/Terminator.java
-@OPENJDK@/jdk/src/windows/classes/java/net/DefaultInterface.java
-@OPENJDK@/jdk/src/windows/classes/java/util/prefs/WindowsPreferences.java
-@OPENJDK@/jdk/src/windows/classes/java/util/prefs/WindowsPreferencesFactory.java
-@OPENJDK@/jdk/src/windows/classes/sun/awt/Win32ColorModel24.java
-@OPENJDK@/jdk/src/windows/classes/sun/management/FileSystemImpl.java
-@OPENJDK@/jdk/src/windows/classes/sun/management/OperatingSystemImpl.java
-@OPENJDK@/jdk/src/windows/classes/sun/net/NetHooks.java
-@OPENJDK@/jdk/src/windows/classes/sun/net/PortConfig.java
-@OPENJDK@/jdk/src/windows/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java
-@OPENJDK@/jdk/src/windows/classes/sun/nio/ch/NativeThread.java
-@OPENJDK@/jdk/src/windows/classes/sun/nio/ch/PipeImpl.java
-@OPENJDK@/jdk/src/windows/classes/sun/nio/ch/sctp/SctpChannelImpl.java
-@OPENJDK@/jdk/src/windows/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java
-@OPENJDK@/jdk/src/windows/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java
-@OPENJDK@/jdk/src/windows/classes/sun/nio/ch/SinkChannelImpl.java
-@OPENJDK@/jdk/src/windows/classes/sun/nio/ch/SourceChannelImpl.java
-@OPENJDK@/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousChannelProvider.java
-@OPENJDK@/jdk/src/windows/classes/sun/nio/fs/WindowsPathParser.java
-@OPENJDK@/jdk/src/windows/classes/sun/nio/fs/WindowsPathType.java
-@OPENJDK@/jdk/src/windows/classes/sun/print/Win32MediaTray.java
-@OPENJDK@/jdk/src/windows/classes/sun/security/krb5/internal/tools/Kinit.java
-@OPENJDK@/jdk/src/windows/classes/sun/security/krb5/internal/tools/KinitOptions.java
-@OPENJDK@/jdk/src/windows/classes/sun/security/krb5/internal/tools/Klist.java
-@OPENJDK@/jdk/src/windows/classes/sun/security/krb5/internal/tools/Ktab.java
-@OPENJDK@/jdk/src/windows/classes/sun/security/provider/NativePRNG.java
-@OPENJDK@/jdk/src/windows/classes/sun/security/provider/NativeSeedGenerator.java
-@OPENJDK@/jdk/src/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/AnnotatedType.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/AnnotationDesc.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/AnnotationTypeDoc.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/AnnotationTypeElementDoc.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/AnnotationValue.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/ClassDoc.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/ConstructorDoc.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/Doc.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/DocErrorReporter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/Doclet.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/ExecutableMemberDoc.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/FieldDoc.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/LanguageVersion.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/MemberDoc.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/MethodDoc.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/PackageDoc.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/Parameter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/ParameterizedType.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/ParamTag.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/ProgramElementDoc.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/RootDoc.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/SeeTag.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/SerialFieldTag.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/SourcePosition.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/Tag.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/ThrowsTag.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/Type.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/TypeVariable.java
-@OPENJDK@/langtools/src/share/classes/com/sun/javadoc/WildcardType.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/AttributeTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/AuthorTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/BlockTagTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/CommentTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/DeprecatedTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/DocCommentTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/DocRootTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/DocTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/DocTreeVisitor.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/EndElementTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/EntityTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/ErroneousTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/IdentifierTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/InheritDocTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/InlineTagTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/LinkTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/LiteralTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/ParamTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/ReferenceTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/ReturnTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/SeeTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/SerialDataTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/SerialFieldTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/SerialTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/SinceTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/StartElementTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/TextTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/ThrowsTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/UnknownBlockTagTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/UnknownInlineTagTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/ValueTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/doctree/VersionTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/AnnotatedTypeTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/AnnotationTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/ArrayAccessTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/ArrayTypeTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/AssertTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/AssignmentTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/BinaryTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/BlockTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/BreakTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/CaseTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/CatchTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/ClassTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/CompilationUnitTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/CompoundAssignmentTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/ConditionalExpressionTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/ContinueTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/DoWhileLoopTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/EmptyStatementTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/EnhancedForLoopTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/ErroneousTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/ExpressionStatementTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/ExpressionTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/ForLoopTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/IdentifierTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/IfTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/ImportTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/InstanceOfTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/IntersectionTypeTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/LabeledStatementTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/LambdaExpressionTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/LineMap.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/LiteralTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/MemberReferenceTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/MemberSelectTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/MethodInvocationTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/MethodTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/ModifiersTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/NewArrayTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/NewClassTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/package-info.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/ParameterizedTypeTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/ParenthesizedTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/PrimitiveTypeTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/ReturnTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/Scope.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/StatementTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/SwitchTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/SynchronizedTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/ThrowTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/Tree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/TreeVisitor.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/TryTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/TypeCastTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/TypeParameterTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/UnaryTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/UnionTypeTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/VariableTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/WhileLoopTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/tree/WildcardTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/util/DocSourcePositions.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/util/DocTreePath.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/util/DocTreePathScanner.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/util/DocTrees.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/util/DocTreeScanner.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/util/JavacTask.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/util/package-info.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/util/Plugin.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/util/SimpleDocTreeVisitor.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/util/SimpleTreeVisitor.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/util/SourcePositions.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/util/TaskEvent.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/util/TaskListener.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/util/TreePath.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/util/TreePathScanner.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/util/Trees.java
-@OPENJDK@/langtools/src/share/classes/com/sun/source/util/TreeScanner.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/AccessFlags.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/Annotation.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/Attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/AttributeException.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/Attributes.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/ClassFile.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/ClassReader.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/ClassTranslator.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/ClassWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/Code_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/CompilationID_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/ConstantPool.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/ConstantPoolException.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/DefaultAttribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/Dependencies.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/Dependency.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/Deprecated_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/Descriptor.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/DescriptorException.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/Exceptions_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/Field.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/Instruction.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/Method.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/MethodParameters_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/Opcode.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/ReferenceFinder.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/RuntimeTypeAnnotations_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/Signature.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/Signature_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/SourceFile_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/SourceID_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/StackMap_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/Synthetic_attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/Type.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/classfile/TypeAnnotation.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractProfileIndexWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeFieldWriterImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkOutputImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/ContentBuilder.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlConstants.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfileIndexFrameWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageFrameWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageIndexFrameWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfilePackageWriterImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ProfileWriterImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PropertyWriterImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SectionName.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/WriterFactoryImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeFieldWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeOptionalMemberWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeRequiredMemberWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeFieldBuilder.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ProfilePackageSummaryBuilder.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ProfileSummaryBuilder.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PropertyBuilder.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/XMLNode.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstructorWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/EnumConstantWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/FieldWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/MemberSummaryWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/MethodWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/NestedClassWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ProfilePackageSummaryWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ProfileSummaryWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/PropertyWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseExecutableMemberTaglet.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseInlineTaglet.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BasePropertyTaglet.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseTaglet.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/CodeTaglet.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DocRootTaglet.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritableTaglet.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritDocTaglet.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LegacyTaglet.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/PropertyGetterTaglet.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/PropertySetterTaglet.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ReturnTaglet.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SeeTaglet.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SimpleTaglet.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/Taglet.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/CommentedMethodFinder.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPIListBuilder.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFile.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFileFactory.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstants.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocLink.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPath.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocPaths.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkFactory.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkInfo.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkOutput.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodFinder.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodTypes.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PathDocFileFactory.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SimpleDocFileFactory.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/StandardDocFileFactory.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/TaggedMethodFinder.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/TextTag.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/standard/Standard.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclets/Taglet.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclint/Checker.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclint/DocLint.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclint/Entity.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclint/Env.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclint/HtmlTag.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/doclint/Messages.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/api/BasicJavacTask.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/api/Formattable.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/api/JavacScope.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/api/JavacTool.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/api/Messages.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/api/MultiTaskListener.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/code/AnnoConstruct.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/code/Attribute.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/code/BoundKind.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/code/Flags.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/code/Kinds.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/code/Lint.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/code/Scope.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/code/Source.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/code/SymbolMetadata.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/code/TargetType.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/code/Type.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/code/Types.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/code/TypeTag.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/comp/AttrContext.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/comp/AttrContextEnv.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/comp/CompileStates.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/comp/ConstFold.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/comp/Enter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/comp/Env.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/comp/Todo.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/file/BaseFileObject.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/file/CacheFSInfo.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/file/FSInfo.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/file/Locations.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/file/RegularFileObject.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/file/RelativePath.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/file/SymbolArchive.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/file/ZipArchive.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndexCache.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/jvm/ByteCodes.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassFile.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/jvm/CRTable.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/jvm/CRTFlags.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/jvm/Items.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/jvm/JNIWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/jvm/LVTRanges.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/jvm/Pool.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/jvm/Profile.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/jvm/Target.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/jvm/UninitializedType.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/Main.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/main/CommandLine.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/main/Main.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/main/Option.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/main/OptionHelper.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/model/FilteredMemberList.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/model/JavacElements.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/model/JavacSourcePosition.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/model/JavacTypes.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/nio/PathFileManager.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/nio/PathFileObject.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/parser/DocCommentParser.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/parser/LazyDocCommentTable.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/parser/Lexer.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/parser/Parser.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/parser/ParserFactory.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/parser/ScannerFactory.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/parser/Tokens.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/parser/UnicodeReader.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/processing/AnnotationProcessingError.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/processing/JavacFiler.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/processing/JavacMessager.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/sym/Profiles.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/tree/DCTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/tree/DocCommentTable.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/tree/DocPretty.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/tree/EndPosTable.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/Abort.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/AbstractLog.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/ArrayUtils.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/Assert.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/BaseFileManager.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/Bits.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/ByteBuffer.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/ClientCodeException.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/Constants.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/Context.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/Convert.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/DiagnosticSource.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/FatalError.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/Filter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/ForwardingDiagnosticFormatter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/GraphUtils.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/JavacMessages.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/LayoutCharacters.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/List.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/ListBuffer.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/Log.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/Name.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/Names.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/Options.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/Pair.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/Position.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/PropagatedException.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/ServiceLoader.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/SharedNameTable.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/UnsharedNameTable.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javac/util/Warner.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/AbstractTypeImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/AnnotatedTypeImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationDescImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationTypeDocImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationTypeElementDocImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationValueImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/api/JavadocTaskImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/api/JavadocTool.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/Comment.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/ConstructorDocImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/DocImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/DocLocale.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/JavadocClassReader.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/JavadocEnter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/JavadocMemberEnter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTodo.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/JavadocTool.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/Main.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/MemberDocImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/Messager.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/ModifierFilter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/ParameterImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/ParameterizedTypeImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/ParamTagImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/PrimitiveType.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/RootDocImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/SeeTagImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/SerialFieldTagImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/SerializedForm.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/SourcePositionImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/Start.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/TagImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/ThrowsTagImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/ToolOption.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/TypeMaker.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/TypeVariableImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javadoc/WildcardTypeImpl.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javah/Gen.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javah/InternalError.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javah/JavahFileManager.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javah/JavahTask.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javah/JavahTool.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javah/JNI.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javah/LLNI.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javah/Main.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javah/Mangle.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javah/NativeHeaderTool.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javah/TypeSignature.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javah/Util.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javap/AnnotationWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javap/AttributeWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javap/BasicWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javap/ClassWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javap/CodeWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javap/ConstantWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javap/Context.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javap/DisassemblerTool.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javap/InstructionDetailWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javap/InternalError.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javap/JavapFileManager.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javap/JavapTask.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javap/LocalVariableTableWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javap/Main.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javap/Messages.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javap/Options.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javap/SourceWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javap/StackMapWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javap/TryBlockWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/jdeps/Analyzer.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/jdeps/Archive.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/jdeps/ClassFileReader.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/jdeps/JdepsTask.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/jdeps/Main.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/jdeps/PlatformClassPath.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/jdeps/Profile.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/sjavac/BuildState.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/sjavac/CleanProperties.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/sjavac/comp/Dependencies.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/sjavac/comp/JavaCompilerWithDeps.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/sjavac/comp/PubapiVisitor.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/sjavac/comp/ResolveWithDeps.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/sjavac/comp/SmartFileManager.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/sjavac/comp/SmartFileObject.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/sjavac/comp/SmartWriter.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/sjavac/CompileChunk.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/sjavac/CompileJavaPackages.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/sjavac/CompileProperties.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/sjavac/CopyFile.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/sjavac/JavacState.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/sjavac/Log.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/sjavac/Main.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/sjavac/Module.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/sjavac/Package.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/sjavac/ProblemException.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/sjavac/server/CompilerPool.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/sjavac/server/CompilerThread.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/sjavac/server/JavacServer.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/sjavac/server/PortFile.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/sjavac/server/SysInfo.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/sjavac/Source.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/sjavac/Transformer.java
-@OPENJDK@/langtools/src/share/classes/com/sun/tools/sjavac/Util.java
-@OPENJDK@/langtools/src/share/classes/javax/annotation/processing/AbstractProcessor.java
-@OPENJDK@/langtools/src/share/classes/javax/annotation/processing/Completion.java
-@OPENJDK@/langtools/src/share/classes/javax/annotation/processing/Completions.java
-@OPENJDK@/langtools/src/share/classes/javax/annotation/processing/Filer.java
-@OPENJDK@/langtools/src/share/classes/javax/annotation/processing/FilerException.java
-@OPENJDK@/langtools/src/share/classes/javax/annotation/processing/Messager.java
-@OPENJDK@/langtools/src/share/classes/javax/annotation/processing/ProcessingEnvironment.java
-@OPENJDK@/langtools/src/share/classes/javax/annotation/processing/Processor.java
-@OPENJDK@/langtools/src/share/classes/javax/annotation/processing/RoundEnvironment.java
-@OPENJDK@/langtools/src/share/classes/javax/annotation/processing/SupportedAnnotationTypes.java
-@OPENJDK@/langtools/src/share/classes/javax/annotation/processing/SupportedOptions.java
-@OPENJDK@/langtools/src/share/classes/javax/annotation/processing/SupportedSourceVersion.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/AnnotatedConstruct.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/element/AnnotationMirror.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/element/AnnotationValue.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/element/AnnotationValueVisitor.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/element/Element.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/element/ElementKind.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/element/ElementVisitor.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/element/ExecutableElement.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/element/Modifier.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/element/Name.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/element/NestingKind.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/element/PackageElement.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/element/Parameterizable.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/element/QualifiedNameable.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/element/TypeElement.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/element/TypeParameterElement.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/element/UnknownAnnotationValueException.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/element/UnknownElementException.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/element/VariableElement.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/SourceVersion.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/type/ArrayType.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/type/DeclaredType.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/type/ErrorType.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/type/ExecutableType.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/type/IntersectionType.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/type/MirroredTypeException.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/type/MirroredTypesException.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/type/NoType.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/type/NullType.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/type/PrimitiveType.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/type/ReferenceType.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/type/TypeKind.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/type/TypeMirror.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/type/TypeVariable.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/type/TypeVisitor.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/type/UnionType.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/type/UnknownTypeException.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/type/WildcardType.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/UnknownEntityException.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor6.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor7.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor8.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/AbstractTypeVisitor8.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/ElementFilter.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor6.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor8.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/Elements.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/ElementScanner6.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/ElementScanner7.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/ElementScanner8.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor8.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor7.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor8.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor6.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor7.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor8.java
-@OPENJDK@/langtools/src/share/classes/javax/lang/model/util/Types.java
-@OPENJDK@/langtools/src/share/classes/javax/tools/Diagnostic.java
-@OPENJDK@/langtools/src/share/classes/javax/tools/DiagnosticCollector.java
-@OPENJDK@/langtools/src/share/classes/javax/tools/DiagnosticListener.java
-@OPENJDK@/langtools/src/share/classes/javax/tools/DocumentationTool.java
-@OPENJDK@/langtools/src/share/classes/javax/tools/FileObject.java
-@OPENJDK@/langtools/src/share/classes/javax/tools/ForwardingFileObject.java
-@OPENJDK@/langtools/src/share/classes/javax/tools/ForwardingJavaFileManager.java
-@OPENJDK@/langtools/src/share/classes/javax/tools/ForwardingJavaFileObject.java
-@OPENJDK@/langtools/src/share/classes/javax/tools/JavaCompiler.java
-@OPENJDK@/langtools/src/share/classes/javax/tools/JavaFileManager.java
-@OPENJDK@/langtools/src/share/classes/javax/tools/JavaFileObject.java
-@OPENJDK@/langtools/src/share/classes/javax/tools/OptionChecker.java
-@OPENJDK@/langtools/src/share/classes/javax/tools/SimpleJavaFileObject.java
-@OPENJDK@/langtools/src/share/classes/javax/tools/StandardJavaFileManager.java
-@OPENJDK@/langtools/src/share/classes/javax/tools/StandardLocation.java
-@OPENJDK@/langtools/src/share/classes/javax/tools/Tool.java
-@OPENJDK@/langtools/src/share/classes/javax/tools/ToolProvider.java
-@OPENJDK@/langtools/src/share/classes/jdk/Exported.java
-@OPENJDK@/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ClassGenerator.java
-@OPENJDK@/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java
-@OPENJDK@/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Main.java
-@OPENJDK@/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MemberInfo.java
-@OPENJDK@/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MethodGenerator.java
-@OPENJDK@/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/NullVisitor.java
-@OPENJDK@/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java
-@OPENJDK@/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfo.java
-@OPENJDK@/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java
-@OPENJDK@/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java
-@OPENJDK@/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/CallSiteDescriptor.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/ChainedCallSite.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/DefaultBootstrapper.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/DynamicLinker.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/DynamicLinkerFactory.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/MonomorphicCallSite.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/NoSuchDynamicMethodException.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/RelinkableCallSite.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/beans/AccessibleMembersLookup.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/beans/ApplicableOverloadedMethods.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/beans/BeanIntrospector.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/beans/BeanLinker.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/beans/CallerSensitiveDetector.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/beans/CallerSensitiveDynamicMethod.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/beans/CheckRestrictedPackage.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/beans/ClassLinker.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/beans/ClassString.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/beans/DynamicMethod.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/beans/DynamicMethodLinker.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/beans/FacetIntrospector.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/beans/GuardedInvocationComponent.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/beans/MaximallySpecific.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/beans/OverloadedDynamicMethod.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/beans/OverloadedMethod.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/beans/SimpleDynamicMethod.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/beans/SingleDynamicMethod.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/beans/StaticClass.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/beans/StaticClassIntrospector.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/beans/StaticClassLinker.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/linker/ConversionComparator.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/linker/GuardedInvocation.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/linker/GuardedTypeConversion.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/linker/GuardingDynamicLinker.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/linker/GuardingTypeConverterFactory.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/linker/LinkerServices.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/linker/LinkRequest.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/linker/TypeBasedGuardingDynamicLinker.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/support/AbstractCallSiteDescriptor.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/support/AbstractRelinkableCallSite.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/support/AutoDiscovery.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/support/BottomGuardingDynamicLinker.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/support/CallSiteDescriptorFactory.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/support/ClassLoaderGetterContextProvider.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/support/ClassMap.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/support/CompositeGuardingDynamicLinker.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/support/CompositeTypeBasedGuardingDynamicLinker.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/support/DefaultCallSiteDescriptor.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/support/Guards.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/support/LinkerServicesImpl.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/support/LinkRequestImpl.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/support/Lookup.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/support/LookupCallSiteDescriptor.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/support/NameCodec.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/support/NamedDynCallSiteDescriptor.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/support/RuntimeContextLinkRequestImpl.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/support/TypeConverterFactory.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/support/TypeUtilities.java
-@OPENJDK@/nashorn/src/jdk/internal/dynalink/support/UnnamedDynCallSiteDescriptor.java
-@OPENJDK@/nashorn/src/jdk/nashorn/api/scripting/AbstractJSObject.java
-@OPENJDK@/nashorn/src/jdk/nashorn/api/scripting/Formatter.java
-@OPENJDK@/nashorn/src/jdk/nashorn/api/scripting/JSObject.java
-@OPENJDK@/nashorn/src/jdk/nashorn/api/scripting/NashornException.java
-@OPENJDK@/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
-@OPENJDK@/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java
-@OPENJDK@/nashorn/src/jdk/nashorn/api/scripting/package-info.java
-@OPENJDK@/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
-@OPENJDK@/nashorn/src/jdk/nashorn/api/scripting/ScriptUtils.java
-@OPENJDK@/nashorn/src/jdk/nashorn/api/scripting/URLReader.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/Attr.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/BranchOptimizer.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/CodeGeneratorLexicalContext.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/CompilationException.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/CompileUnit.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/Condition.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/ConstantData.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/Emitter.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/FieldObjectCreator.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/FinalizeTypes.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/FoldConstants.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/Label.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/MapCreator.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/Namespace.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/ObjectCreator.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/RangeAnalyzer.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/SpillObjectCreator.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/SplitMethodEmitter.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/types/ArrayType.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/types/BitwiseType.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/types/BooleanType.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeArrayOps.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeBitwiseOps.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeNumericOps.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeOps.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/types/IntType.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/types/LongType.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/types/NumberType.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/types/NumericType.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/types/ObjectType.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/types/Range.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/types/Type.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/AccessNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/Assignment.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/BaseNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/BinaryNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/Block.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/BlockLexicalContext.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/BlockStatement.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/BreakableNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/BreakableStatement.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/BreakNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/CallNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/CaseNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/CatchNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/ContinueNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/EmptyNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/Expression.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/ExpressionStatement.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/Flags.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/ForNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/FunctionCall.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/IdentNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/IfNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/IndexNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/LabelNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/LexicalContext.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/LexicalContextExpression.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/LexicalContextNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/LexicalContextStatement.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/LoopNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/Node.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/ObjectNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/PropertyKey.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/PropertyNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/ReturnNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/SplitNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/Statement.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/SwitchNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/TemporarySymbols.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/TernaryNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/ThrowNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/TryNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/VarNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/WhileNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/WithNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/annotations/Ignore.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/annotations/Immutable.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/annotations/Reference.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/debug/ASTWriter.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/debug/ClassHistogramElement.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/debug/ObjectSizeCalculator.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/debug/PrintVisitor.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeVisitor.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/lookup/Lookup.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/lookup/MethodHandleFactory.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/lookup/MethodHandleFunctionality.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/ArrayBufferView.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/BoundScriptFunctionImpl.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/DataPropertyDescriptor.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/Global.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeArrayBuffer.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeError.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeEvalError.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeFloat32Array.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeFloat64Array.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeInt16Array.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeInt32Array.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeInt8Array.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeJavaImporter.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeMath.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeRangeError.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeReferenceError.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeRegExpExecResult.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeStrictArguments.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeSyntaxError.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeTypeError.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeUint16Array.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeUint32Array.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeUint8Array.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/NativeURIError.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/package-info.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/PrototypeObject.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/annotations/Attribute.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/annotations/Constructor.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/annotations/Function.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/annotations/Getter.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/annotations/Property.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/annotations/ScriptClass.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/annotations/Setter.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/annotations/SpecializedConstructor.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/annotations/SpecializedFunction.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/annotations/Where.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/parser/DateParser.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/parser/JSONParser.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/parser/Lexer.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/parser/Parser.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/parser/Scanner.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/parser/Token.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/parser/TokenKind.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/parser/TokenLookup.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/parser/TokenStream.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/parser/TokenType.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/ArgumentSetter.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/BitVector.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/CompiledFunction.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/CompiledFunctions.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/ConsString.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/Context.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/Debug.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/DebuggerSupport.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/DefaultPropertyAccess.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/ErrorManager.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/FinalScriptFunctionData.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/FunctionScope.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/GlobalFunctions.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/JSErrorType.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/JSObjectListAdapter.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/JSONFunctions.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/JSType.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/ListAdapter.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/Logging.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/NashornLoader.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/NumberToString.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/ParserException.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/Property.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/PropertyAccess.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/PropertyDescriptor.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/PropertyHashMap.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/PropertyListener.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/PropertyListenerManager.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/RecompilableScriptFunctionData.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/Scope.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/ScriptEnvironment.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/ScriptLoader.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/Source.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/Timing.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/Undefined.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/URIUtils.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/Version.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayData.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/IntArrayData.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/InvalidArrayIndexException.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/JavaArrayIterator.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/JavaListIterator.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/JSObjectIterator.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/LongArrayData.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/NoTypeArrayData.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseJavaArrayIterator.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseJavaListIterator.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseJSObjectIterator.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseScriptArrayIterator.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseScriptObjectIterator.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/ScriptArrayIterator.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/ScriptObjectIterator.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/linker/AdaptationException.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/linker/AdaptationResult.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/linker/BoundDynamicMethod.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/linker/BoundDynamicMethodLinker.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/linker/ClassAndLoader.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/linker/InvokeByName.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterServices.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaSuperAdapter.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaSuperAdapterLinker.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBeansLinker.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuards.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/options/KeyValueOption.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/options/Option.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/options/OptionTemplate.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/JdkRegExp.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExp.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpMatcher.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpResult.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Analyser.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFold.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFoldArg.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/BitSet.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/BitStatus.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodePrinter.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Compiler.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Config.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Lexer.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Matcher.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/MatcherFactory.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/MinMaxLen.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/NodeOptInfo.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptAnchorInfo.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptEnvironment.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptExactInfo.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Option.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptMapInfo.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Parser.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Regex.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Region.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/StackEntry.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Syntax.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Token.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Warnings.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/AnchorNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/AnyCharNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/BackRefNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/CClassNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/Node.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StateNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/AnchorType.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/Arguments.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/AsmConstants.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/CCSTATE.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/CCVALTYPE.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/EncloseType.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/MetaChar.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeStatus.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeType.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/OPCode.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/OPSize.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/RegexState.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/StackPopLevel.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/StackType.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/StringType.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/SyntaxProperties.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/TargetInfo.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/TokenType.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/Traverse.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/CharacterType.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/IntHolder.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/ObjPtr.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/InternalException.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/JOniException.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/SyntaxException.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/ValueException.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/scripts/JO.java
-@OPENJDK@/nashorn/src/jdk/nashorn/internal/scripts/JS.java
-@OPENJDK@/nashorn/src/jdk/nashorn/tools/Shell.java
-icedtea/jce/gnu/java/security/action/GetPropertyAction.java
-icedtea/jce/gnu/java/security/action/GetSecurityPropertyAction.java
-icedtea/jce/gnu/java/security/action/SetAccessibleAction.java
-icedtea/rt/com/sun/media/sound/AbstractPlayer.java
-icedtea/rt/com/sun/media/sound/AutoConnectSequencer.java
-icedtea/rt/com/sun/media/sound/DataPusher.java
-icedtea/rt/com/sun/media/sound/DirectAudioDevice.java
-icedtea/rt/com/sun/media/sound/DirectAudioDeviceProvider.java
-icedtea/rt/com/sun/media/sound/HeadspaceMixer.java
-icedtea/rt/com/sun/media/sound/HeadspaceSoundbank.java
-icedtea/rt/com/sun/media/sound/JavaSoundAudioClip.java
-icedtea/rt/com/sun/media/sound/JDK13Services.java
-icedtea/rt/com/sun/media/sound/MidiInDevice.java
-icedtea/rt/com/sun/media/sound/MidiInDeviceProvider.java
-icedtea/rt/com/sun/media/sound/MidiOutDevice.java
-icedtea/rt/com/sun/media/sound/MidiOutDeviceProvider.java
-icedtea/rt/com/sun/media/sound/MidiUtils.java
-icedtea/rt/com/sun/media/sound/MixerClip.java
-icedtea/rt/com/sun/media/sound/MixerMidiChannel.java
-icedtea/rt/com/sun/media/sound/MixerSequencer.java
-icedtea/rt/com/sun/media/sound/MixerSourceLine.java
-icedtea/rt/com/sun/media/sound/MixerSynth.java
-icedtea/rt/com/sun/media/sound/MixerThread.java
-icedtea/rt/com/sun/media/sound/Platform.java
-icedtea/rt/com/sun/media/sound/PortMixer.java
-icedtea/rt/com/sun/media/sound/PortMixerProvider.java
-icedtea/rt/com/sun/media/sound/ReferenceCountingDevice.java
-icedtea/rt/com/sun/media/sound/SimpleInputDevice.java
-icedtea/rt/com/sun/media/sound/SimpleInputDeviceProvider.java
-icedtea/rt/com/sun/media/sound/Toolkit.java
diff --git a/openjdk/com/sun/imageio/plugins/jpeg/JPEGImageReader.java b/openjdk/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
deleted file mode 100644
index 86dbe396..00000000
--- a/openjdk/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-  Copyright (C) 2008, 2009 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-package com.sun.imageio.plugins.jpeg;
-
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.*;
-import java.util.Iterator;
-
-import javax.imageio.*;
-import javax.imageio.metadata.IIOMetadata;
-import javax.imageio.spi.ImageReaderSpi;
-import javax.imageio.stream.ImageInputStream;
-
-/**
- * A image reader implementation that is calling the .NET API for reading the JPEG image.
- */
-class JPEGImageReader extends ImageReader{
-    
-    private BufferedImage image;
-
-    /**
-     * Default constructor, Sun compatible.
-     */
-    protected JPEGImageReader(ImageReaderSpi originatingProvider){
-        super(originatingProvider);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int getHeight(int imageIndex) throws IOException{
-        return getBufferedImage().getHeight();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public IIOMetadata getImageMetadata(int imageIndex){
-        throw new Error("Not Implemented");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Iterator<ImageTypeSpecifier> getImageTypes(int imageIndex){
-        throw new Error("Not Implemented");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int getNumImages(boolean allowSearch){
-        return 1;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public IIOMetadata getStreamMetadata(){
-        throw new Error("Not Implemented");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int getWidth(int imageIndex) throws IOException{
-        return getBufferedImage().getWidth();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public BufferedImage read(int imageIndex, ImageReadParam param) throws IOException{
-        return getBufferedImage();
-    }
-    
-    /**
-     * Read the image with .NET API if not already read.
-     */
-    private BufferedImage getBufferedImage() throws IOException{
-        if(image == null){
-            ImageInputStream iis = (ImageInputStream)getInput();
-            byte[] buffer;
-            try {
-				if( iis.length() >0){
-				    //If length known then it it is simple
-				    buffer = new byte[(int)iis.length()];
-				    iis.readFully(buffer);
-				}else{
-				    // if the length not known then we need to read it in a loop
-				    ByteArrayOutputStream baos = new ByteArrayOutputStream(8192);
-				    buffer = new byte[8192];
-				    int count;
-				    while((count = iis.read(buffer)) > 0){
-				        baos.write(buffer, 0, count);
-				    }
-				    buffer = baos.toByteArray();
-				}
-			} catch (IOException ioex) {
-				processReadAborted();
-				throw ioex;
-			}
-            processImageStarted(0);
-            image = (BufferedImage)Toolkit.getDefaultToolkit().createImage(buffer);
-            processPassStarted(image, 0, 0, 1, 0, 0, 1, 1, new int[0]);
-            processImageProgress(100.0F);
-            processImageUpdate(image, 0, 0, 0, 0, 1, 1, new int[0]);
-            processPassComplete(image);
-            processImageComplete();
-        }
-        return image;
-    }
-
-}
\ No newline at end of file
diff --git a/openjdk/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java b/openjdk/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
deleted file mode 100644
index 0c7516f7..00000000
--- a/openjdk/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
-  Copyright (C) 2008, 2009 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-
-package com.sun.imageio.plugins.jpeg;
-
-import javax.imageio.ImageWriter;
-import javax.imageio.ImageWriteParam;
-import javax.imageio.IIOException;
-import javax.imageio.IIOImage;
-import javax.imageio.ImageTypeSpecifier;
-import javax.imageio.metadata.IIOMetadata;
-import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
-import javax.imageio.plugins.jpeg.JPEGQTable;
-import javax.imageio.spi.ImageWriterSpi;
-import javax.imageio.stream.ImageOutputStream;
-import java.awt.image.BufferedImage;
-
-import java.io.IOException;
-
-import cli.System.Drawing.Imaging.Encoder;
-import cli.System.Drawing.Imaging.EncoderParameter;
-import cli.System.Drawing.Imaging.EncoderParameters;
-import cli.System.Drawing.Imaging.ImageCodecFlags;
-import cli.System.Drawing.Imaging.ImageCodecInfo;
-import cli.System.Drawing.Imaging.ImageFormat;
-
-/**
- * JPEGImageWriter that use .NET features to write the the JPG file.
- */
-public class JPEGImageWriter extends ImageWriter {
-
-    /**
-     * Default constructor, Sun compatible.
-     */
-    protected JPEGImageWriter(ImageWriterSpi originatingProvider){
-        super(originatingProvider);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public IIOMetadata convertImageMetadata(IIOMetadata inData, ImageTypeSpecifier imageType, ImageWriteParam param){
-        return inData;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public IIOMetadata convertStreamMetadata(IIOMetadata inData, ImageWriteParam param){
-        return inData;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public IIOMetadata getDefaultImageMetadata(ImageTypeSpecifier imageType, ImageWriteParam param){
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public IIOMetadata getDefaultStreamMetadata(ImageWriteParam param){
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void write(IIOMetadata streamMetadata, IIOImage image, ImageWriteParam param) throws IOException{
-    
-        ImageCodecInfo codec = null;
-        for (ImageCodecInfo ici : ImageCodecInfo.GetImageEncoders()) {
-            if (ici.get_FormatID().equals(ImageFormat.get_Jpeg().get_Guid())
-                && (ici.get_Flags().Value & ImageCodecFlags.Builtin) != 0) {
-                codec = ici;
-                break;
-            }
-        }
-        if (codec == null) {
-            throw new IIOException("JPEG codec not found");
-        }
-    
-        BufferedImage img = (BufferedImage)image.getRenderedImage();
-        
-        ImageOutputStream imgOutput = (ImageOutputStream)getOutput();
-        
-        JPEGImageWriteParam jparam = null;
-        JPEGQTable[] qTables = null;
-        
-        if (param != null) {
-            switch (param.getCompressionMode()) {
-                case ImageWriteParam.MODE_DISABLED:
-                    throw new IIOException("JPEG compression cannot be disabled");
-                case ImageWriteParam.MODE_EXPLICIT:
-                    float quality = param.getCompressionQuality();
-                    quality = JPEG.convertToLinearQuality(quality);
-                    qTables = new JPEGQTable[2];
-                    qTables[0] = JPEGQTable.K1Luminance.getScaledInstance(quality, true);
-                    qTables[1] = JPEGQTable.K2Chrominance.getScaledInstance(quality, true);
-                    break;
-                case ImageWriteParam.MODE_DEFAULT:
-                    qTables = new JPEGQTable[2];
-                    qTables[0] = JPEGQTable.K1Div2Luminance;
-                    qTables[1] = JPEGQTable.K2Div2Chrominance;
-                    break;
-            }
-            if (param instanceof JPEGImageWriteParam) {
-                jparam = (JPEGImageWriteParam)param;
-            }
-        }
-        
-        if (qTables == null) {
-            if (jparam != null && jparam.areTablesSet()) {
-                qTables = jparam.getQTables();
-            } else {
-                qTables = JPEG.getDefaultQTables();
-            }
-        }
-        
-        // Create a MemoryStream with publicly visible buffer
-        cli.System.IO.MemoryStream stream = new cli.System.IO.MemoryStream(1024);
-        EncoderParameters params = new EncoderParameters(2);
-        try {
-            params.get_Param()[0] = new EncoderParameter(Encoder.LuminanceTable, qTableToShortArray(qTables[0]));
-            params.get_Param()[1] = new EncoderParameter(Encoder.ChrominanceTable, qTableToShortArray(qTables[1]));
-            cli.System.Drawing.Bitmap bitmap = img.getBitmap();
-            synchronized( bitmap ) {
-                bitmap.Save(stream, codec, params);
-            }
-        }
-        finally {
-            params.Dispose();
-        }
-        
-        imgOutput.write(stream.GetBuffer(), 0, (int)stream.get_Length());
-    }
-    
-    private static short[] qTableToShortArray(JPEGQTable table) {
-        int[] array = table.getTable();
-        short[] s = new short[64];
-        for (int i = 0; i < 64; i++)
-            s[i] = (short)array[i];
-        return s;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public ImageWriteParam getDefaultWriteParam() {
-        return new JPEGImageWriteParam(null);
-    }
-}
diff --git a/openjdk/com/sun/java/util/jar/pack/PackageReader.java b/openjdk/com/sun/java/util/jar/pack/PackageReader.java
deleted file mode 100644
index 27cdcd13..00000000
--- a/openjdk/com/sun/java/util/jar/pack/PackageReader.java
+++ /dev/null
@@ -1,2383 +0,0 @@
-/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.java.util.jar.pack;
-
-import com.sun.java.util.jar.pack.ConstantPool.*;
-import com.sun.java.util.jar.pack.Package.Class;
-import com.sun.java.util.jar.pack.Package.File;
-import com.sun.java.util.jar.pack.Package.InnerClass;
-import java.io.ByteArrayOutputStream;
-import java.io.EOFException;
-import java.io.PrintStream;
-import java.io.FilterInputStream;
-import java.io.BufferedInputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Set;
-import static com.sun.java.util.jar.pack.Constants.*;
-
-/**
- * Reader for a package file.
- *
- * @see PackageWriter
- * @author John Rose
- */
-class PackageReader extends BandStructure {
-    Package pkg;
-    byte[] bytes;
-    LimitedBuffer in;
-    Package.Version packageVersion;
-
-    PackageReader(Package pkg, InputStream in) throws IOException {
-        this.pkg = pkg;
-        this.in = new LimitedBuffer(in);
-    }
-
-    /** A buffered input stream which is careful not to
-     *  read its underlying stream ahead of a given mark,
-     *  called the 'readLimit'.  This property declares
-     *  the maximum number of characters that future reads
-     *  can consume from the underlying stream.
-     */
-    static
-    class LimitedBuffer extends BufferedInputStream {
-        long served;     // total number of charburgers served
-        int  servedPos;  // ...as of this value of super.pos
-        long limit;      // current declared limit
-        long buffered;
-        public boolean atLimit() {
-            boolean z = (getBytesServed() == limit);
-            assert(!z || limit == buffered);
-            return z;
-        }
-        public long getBytesServed() {
-            return served + (pos - servedPos);
-        }
-        public void setReadLimit(long newLimit) {
-            if (newLimit == -1)
-                limit = -1;
-            else
-                limit = getBytesServed() + newLimit;
-        }
-        public long getReadLimit() {
-            if (limit == -1)
-                return limit;
-            else
-                return limit - getBytesServed();
-        }
-        public int read() throws IOException {
-            if (pos < count) {
-                // fast path
-                return buf[pos++] & 0xFF;
-            }
-            served += (pos - servedPos);
-            int ch = super.read();
-            servedPos = pos;
-            if (ch >= 0)  served += 1;
-            assert(served <= limit || limit == -1);
-            return ch;
-        }
-        public int read(byte b[], int off, int len) throws IOException {
-            served += (pos - servedPos);
-            int nr = super.read(b, off, len);
-            servedPos = pos;
-            if (nr >= 0)  served += nr;
-            //assert(served <= limit || limit == -1);
-            return nr;
-        }
-        public long skip(long n) throws IOException {
-            throw new RuntimeException("no skipping");
-        }
-        LimitedBuffer(InputStream originalIn) {
-            super(null, 1<<14);
-            servedPos = pos;
-            super.in = new FilterInputStream(originalIn) {
-                public int read() throws IOException {
-                    if (buffered == limit)
-                        return -1;
-                    ++buffered;
-                    return super.read();
-                }
-                public int read(byte b[], int off, int len) throws IOException {
-                    if (buffered == limit)
-                        return -1;
-                    if (limit != -1) {
-                        long remaining = limit - buffered;
-                        if (len > remaining)
-                            len = (int)remaining;
-                    }
-                    int nr = super.read(b, off, len);
-                    if (nr >= 0)  buffered += nr;
-                    return nr;
-                }
-            };
-        }
-    }
-
-    void read() throws IOException {
-        boolean ok = false;
-        try {
-            //  pack200_archive:
-            //        file_header
-            //        *band_headers :BYTE1
-            //        cp_bands
-            //        attr_definition_bands
-            //        ic_bands
-            //        class_bands
-            //        bc_bands
-            //        file_bands
-            readFileHeader();
-            readBandHeaders();
-            readConstantPool();  // cp_bands
-            readAttrDefs();
-            readInnerClasses();
-            Class[] classes = readClasses();
-            readByteCodes();
-            readFiles();     // file_bands
-            assert(archiveSize1 == 0 || in.atLimit());
-            assert(archiveSize1 == 0 ||
-                   in.getBytesServed() == archiveSize0+archiveSize1);
-            all_bands.doneDisbursing();
-
-            // As a post-pass, build constant pools and inner classes.
-            for (int i = 0; i < classes.length; i++) {
-                reconstructClass(classes[i]);
-            }
-
-            ok = true;
-        } catch (Exception ee) {
-            Utils.log.warning("Error on input: "+ee, ee);
-            if (verbose > 0)
-                Utils.log.info("Stream offsets:"+
-                                 " served="+in.getBytesServed()+
-                                 " buffered="+in.buffered+
-                                 " limit="+in.limit);
-            //if (verbose > 0)  ee.printStackTrace();
-            if (ee instanceof IOException)  throw (IOException)ee;
-            if (ee instanceof RuntimeException)  throw (RuntimeException)ee;
-            throw new Error("error unpacking", ee);
-        }
-    }
-
-    // Temporary count values, until band decoding gets rolling.
-    int[] tagCount = new int[CONSTANT_Limit];
-    int numFiles;
-    int numAttrDefs;
-    int numInnerClasses;
-    int numClasses;
-
-    void readFileHeader() throws IOException {
-        //  file_header:
-        //        archive_magic archive_header
-        readArchiveMagic();
-        readArchiveHeader();
-    }
-
-    // Local routine used to parse fixed-format scalars
-    // in the file_header:
-    private int getMagicInt32() throws IOException {
-        int res = 0;
-        for (int i = 0; i < 4; i++) {
-            res <<= 8;
-            res |= (archive_magic.getByte() & 0xFF);
-        }
-        return res;
-    }
-
-    final static int MAGIC_BYTES = 4;
-
-    void readArchiveMagic() throws IOException {
-        // Read a minimum of bytes in the first gulp.
-        in.setReadLimit(MAGIC_BYTES + AH_LENGTH_MIN);
-
-        //  archive_magic:
-        //        #archive_magic_word :BYTE1[4]
-        archive_magic.expectLength(MAGIC_BYTES);
-        archive_magic.readFrom(in);
-
-        // read and check magic numbers:
-        int magic = getMagicInt32();
-        if (pkg.magic != magic) {
-            throw new IOException("Unexpected package magic number: got "
-                    + magic + "; expected " + pkg.magic);
-        }
-        archive_magic.doneDisbursing();
-    }
-
-     // Fixed 6211177, converted to throw IOException
-    void checkArchiveVersion() throws IOException {
-        Package.Version versionFound = null;
-        for (Package.Version v : new Package.Version[] {
-                JAVA8_PACKAGE_VERSION,
-                JAVA7_PACKAGE_VERSION,
-                JAVA6_PACKAGE_VERSION,
-                JAVA5_PACKAGE_VERSION
-            }) {
-            if (packageVersion.equals(v)) {
-                versionFound = v;
-                break;
-            }
-        }
-        if (versionFound == null) {
-            String expVer =   JAVA8_PACKAGE_VERSION.toString()
-                            + "OR"
-                            + JAVA7_PACKAGE_VERSION.toString()
-                            + " OR "
-                            + JAVA6_PACKAGE_VERSION.toString()
-                            + " OR "
-                            + JAVA5_PACKAGE_VERSION.toString();
-            throw new IOException("Unexpected package minor version: got "
-                    +  packageVersion.toString() + "; expected " + expVer);
-        }
-    }
-
-    void readArchiveHeader() throws IOException {
-        //  archive_header:
-        //        #archive_minver :UNSIGNED5[1]
-        //        #archive_majver :UNSIGNED5[1]
-        //        #archive_options :UNSIGNED5[1]
-        //        (archive_file_counts) ** (#have_file_headers)
-        //        (archive_special_counts) ** (#have_special_formats)
-        //        cp_counts
-        //        class_counts
-        //
-        //  archive_file_counts:
-        //        #archive_size_hi :UNSIGNED5[1]
-        //        #archive_size_lo :UNSIGNED5[1]
-        //        #archive_next_count :UNSIGNED5[1]
-        //        #archive_modtime :UNSIGNED5[1]
-        //        #file_count :UNSIGNED5[1]
-        //
-        //  class_counts:
-        //        #ic_count :UNSIGNED5[1]
-        //        #default_class_minver :UNSIGNED5[1]
-        //        #default_class_majver :UNSIGNED5[1]
-        //        #class_count :UNSIGNED5[1]
-        //
-        //  archive_special_counts:
-        //        #band_headers_size :UNSIGNED5[1]
-        //        #attr_definition_count :UNSIGNED5[1]
-        //
-        archive_header_0.expectLength(AH_LENGTH_0);
-        archive_header_0.readFrom(in);
-
-        int minver = archive_header_0.getInt();
-        int majver = archive_header_0.getInt();
-        packageVersion = Package.Version.of(majver, minver);
-        checkArchiveVersion();
-        this.initHighestClassVersion(JAVA7_MAX_CLASS_VERSION);
-
-        archiveOptions = archive_header_0.getInt();
-        archive_header_0.doneDisbursing();
-
-        // detect archive optional fields in archive header
-        boolean haveSpecial = testBit(archiveOptions, AO_HAVE_SPECIAL_FORMATS);
-        boolean haveFiles   = testBit(archiveOptions, AO_HAVE_FILE_HEADERS);
-        boolean haveNumbers = testBit(archiveOptions, AO_HAVE_CP_NUMBERS);
-        boolean haveCPExtra = testBit(archiveOptions, AO_HAVE_CP_EXTRAS);
-        initAttrIndexLimit();
-
-        // now we are ready to use the data:
-        archive_header_S.expectLength(haveFiles? AH_LENGTH_S: 0);
-        archive_header_S.readFrom(in);
-        if (haveFiles) {
-            long sizeHi = archive_header_S.getInt();
-            long sizeLo = archive_header_S.getInt();
-            archiveSize1 = (sizeHi << 32) + ((sizeLo << 32) >>> 32);
-            // Set the limit, now, up to the file_bits.
-            in.setReadLimit(archiveSize1);  // for debug only
-        } else {
-            archiveSize1 = 0;
-            in.setReadLimit(-1);  // remove limitation
-        }
-        archive_header_S.doneDisbursing();
-        archiveSize0 = in.getBytesServed();
-
-        int remainingHeaders = AH_LENGTH_MIN - AH_LENGTH_0 - AH_LENGTH_S;
-        if (haveFiles)    remainingHeaders += AH_FILE_HEADER_LEN;
-        if (haveSpecial)  remainingHeaders += AH_SPECIAL_FORMAT_LEN;
-        if (haveNumbers)  remainingHeaders += AH_CP_NUMBER_LEN;
-        if (haveCPExtra)  remainingHeaders += AH_CP_EXTRA_LEN;
-        archive_header_1.expectLength(remainingHeaders);
-        archive_header_1.readFrom(in);
-
-        if (haveFiles) {
-            archiveNextCount = archive_header_1.getInt();
-            pkg.default_modtime = archive_header_1.getInt();
-            numFiles = archive_header_1.getInt();
-        } else {
-            archiveNextCount = 0;
-            numFiles = 0;
-        }
-
-        if (haveSpecial) {
-            band_headers.expectLength(archive_header_1.getInt());
-            numAttrDefs = archive_header_1.getInt();
-        } else {
-            band_headers.expectLength(0);
-            numAttrDefs = 0;
-        }
-
-        readConstantPoolCounts(haveNumbers, haveCPExtra);
-
-        numInnerClasses = archive_header_1.getInt();
-
-        minver = (short) archive_header_1.getInt();
-        majver = (short) archive_header_1.getInt();
-        pkg.defaultClassVersion = Package.Version.of(majver, minver);
-        numClasses = archive_header_1.getInt();
-
-        archive_header_1.doneDisbursing();
-
-        // set some derived archive bits
-        if (testBit(archiveOptions, AO_DEFLATE_HINT)) {
-            pkg.default_options |= FO_DEFLATE_HINT;
-        }
-    }
-
-    void readBandHeaders() throws IOException {
-        band_headers.readFrom(in);
-        bandHeaderBytePos = 1;  // Leave room to pushback the initial XB byte.
-        bandHeaderBytes = new byte[bandHeaderBytePos + band_headers.length()];
-        for (int i = bandHeaderBytePos; i < bandHeaderBytes.length; i++) {
-            bandHeaderBytes[i] = (byte) band_headers.getByte();
-        }
-        band_headers.doneDisbursing();
-    }
-
-    void readConstantPoolCounts(boolean haveNumbers, boolean haveCPExtra) throws IOException {
-        // size the constant pools:
-        for (int k = 0; k < ConstantPool.TAGS_IN_ORDER.length; k++) {
-            //  cp_counts:
-            //        #cp_Utf8_count :UNSIGNED5[1]
-            //        (cp_number_counts) ** (#have_cp_numbers)
-            //        #cp_String_count :UNSIGNED5[1]
-            //        #cp_Class_count :UNSIGNED5[1]
-            //        #cp_Signature_count :UNSIGNED5[1]
-            //        #cp_Descr_count :UNSIGNED5[1]
-            //        #cp_Field_count :UNSIGNED5[1]
-            //        #cp_Method_count :UNSIGNED5[1]
-            //        #cp_Imethod_count :UNSIGNED5[1]
-            //        (cp_attr_counts) ** (#have_cp_attr_counts)
-            //
-            //  cp_number_counts:
-            //        #cp_Int_count :UNSIGNED5[1]
-            //        #cp_Float_count :UNSIGNED5[1]
-            //        #cp_Long_count :UNSIGNED5[1]
-            //        #cp_Double_count :UNSIGNED5[1]
-            //
-            //  cp_extra_counts:
-            //        #cp_MethodHandle_count :UNSIGNED5[1]
-            //        #cp_MethodType_count :UNSIGNED5[1]
-            //        #cp_InvokeDynamic_count :UNSIGNED5[1]
-            //        #cp_BootstrapMethod_count :UNSIGNED5[1]
-            //
-            byte tag = ConstantPool.TAGS_IN_ORDER[k];
-            if (!haveNumbers) {
-                // These four counts are optional.
-                switch (tag) {
-                case CONSTANT_Integer:
-                case CONSTANT_Float:
-                case CONSTANT_Long:
-                case CONSTANT_Double:
-                    continue;
-                }
-            }
-            if (!haveCPExtra) {
-                // These four counts are optional.
-                switch (tag) {
-                case CONSTANT_MethodHandle:
-                case CONSTANT_MethodType:
-                case CONSTANT_InvokeDynamic:
-                case CONSTANT_BootstrapMethod:
-                    continue;
-                }
-            }
-            tagCount[tag] = archive_header_1.getInt();
-        }
-    }
-
-    protected Index getCPIndex(byte tag) {
-        return pkg.cp.getIndexByTag(tag);
-    }
-    Index initCPIndex(byte tag, Entry[] cpMap) {
-        if (verbose > 3) {
-            for (int i = 0; i < cpMap.length; i++) {
-                Utils.log.fine("cp.add "+cpMap[i]);
-            }
-        }
-        Index index = ConstantPool.makeIndex(ConstantPool.tagName(tag), cpMap);
-        if (verbose > 1)  Utils.log.fine("Read "+index);
-        pkg.cp.initIndexByTag(tag, index);
-        return index;
-    }
-
-    void checkLegacy(String bandname) {
-        if (packageVersion.lessThan(JAVA7_PACKAGE_VERSION)) {
-            throw new RuntimeException("unexpected band " + bandname);
-        }
-    }
-    void readConstantPool() throws IOException {
-        //  cp_bands:
-        //        cp_Utf8
-        //        *cp_Int :UDELTA5
-        //        *cp_Float :UDELTA5
-        //        cp_Long
-        //        cp_Double
-        //        *cp_String :UDELTA5  (cp_Utf8)
-        //        *cp_Class :UDELTA5  (cp_Utf8)
-        //        cp_Signature
-        //        cp_Descr
-        //        cp_Field
-        //        cp_Method
-        //        cp_Imethod
-
-        if (verbose > 0)  Utils.log.info("Reading CP");
-
-        for (int k = 0; k < ConstantPool.TAGS_IN_ORDER.length; k++) {
-            byte tag = ConstantPool.TAGS_IN_ORDER[k];
-            int  len = tagCount[tag];
-
-            Entry[] cpMap = new Entry[len];
-            if (verbose > 0)
-                Utils.log.info("Reading "+cpMap.length+" "+ConstantPool.tagName(tag)+" entries...");
-
-            switch (tag) {
-            case CONSTANT_Utf8:
-                readUtf8Bands(cpMap);
-                break;
-            case CONSTANT_Integer:
-                cp_Int.expectLength(cpMap.length);
-                cp_Int.readFrom(in);
-                for (int i = 0; i < cpMap.length; i++) {
-                    int x = cp_Int.getInt();  // coding handles signs OK
-                    cpMap[i] = ConstantPool.getLiteralEntry(x);
-                }
-                cp_Int.doneDisbursing();
-                break;
-            case CONSTANT_Float:
-                cp_Float.expectLength(cpMap.length);
-                cp_Float.readFrom(in);
-                for (int i = 0; i < cpMap.length; i++) {
-                    int x = cp_Float.getInt();
-                    float fx = Float.intBitsToFloat(x);
-                    cpMap[i] = ConstantPool.getLiteralEntry(fx);
-                }
-                cp_Float.doneDisbursing();
-                break;
-            case CONSTANT_Long:
-                //  cp_Long:
-                //        *cp_Long_hi :UDELTA5
-                //        *cp_Long_lo :DELTA5
-                cp_Long_hi.expectLength(cpMap.length);
-                cp_Long_hi.readFrom(in);
-                cp_Long_lo.expectLength(cpMap.length);
-                cp_Long_lo.readFrom(in);
-                for (int i = 0; i < cpMap.length; i++) {
-                    long hi = cp_Long_hi.getInt();
-                    long lo = cp_Long_lo.getInt();
-                    long x = (hi << 32) + ((lo << 32) >>> 32);
-                    cpMap[i] = ConstantPool.getLiteralEntry(x);
-                }
-                cp_Long_hi.doneDisbursing();
-                cp_Long_lo.doneDisbursing();
-                break;
-            case CONSTANT_Double:
-                //  cp_Double:
-                //        *cp_Double_hi :UDELTA5
-                //        *cp_Double_lo :DELTA5
-                cp_Double_hi.expectLength(cpMap.length);
-                cp_Double_hi.readFrom(in);
-                cp_Double_lo.expectLength(cpMap.length);
-                cp_Double_lo.readFrom(in);
-                for (int i = 0; i < cpMap.length; i++) {
-                    long hi = cp_Double_hi.getInt();
-                    long lo = cp_Double_lo.getInt();
-                    long x = (hi << 32) + ((lo << 32) >>> 32);
-                    double dx = Double.longBitsToDouble(x);
-                    cpMap[i] = ConstantPool.getLiteralEntry(dx);
-                }
-                cp_Double_hi.doneDisbursing();
-                cp_Double_lo.doneDisbursing();
-                break;
-            case CONSTANT_String:
-                cp_String.expectLength(cpMap.length);
-                cp_String.readFrom(in);
-                cp_String.setIndex(getCPIndex(CONSTANT_Utf8));
-                for (int i = 0; i < cpMap.length; i++) {
-                    cpMap[i] = ConstantPool.getLiteralEntry(cp_String.getRef().stringValue());
-                }
-                cp_String.doneDisbursing();
-                break;
-            case CONSTANT_Class:
-                cp_Class.expectLength(cpMap.length);
-                cp_Class.readFrom(in);
-                cp_Class.setIndex(getCPIndex(CONSTANT_Utf8));
-                for (int i = 0; i < cpMap.length; i++) {
-                    cpMap[i] = ConstantPool.getClassEntry(cp_Class.getRef().stringValue());
-                }
-                cp_Class.doneDisbursing();
-                break;
-            case CONSTANT_Signature:
-                readSignatureBands(cpMap);
-                break;
-            case CONSTANT_NameandType:
-                //  cp_Descr:
-                //        *cp_Descr_type :DELTA5  (cp_Signature)
-                //        *cp_Descr_name :UDELTA5  (cp_Utf8)
-                cp_Descr_name.expectLength(cpMap.length);
-                cp_Descr_name.readFrom(in);
-                cp_Descr_name.setIndex(getCPIndex(CONSTANT_Utf8));
-                cp_Descr_type.expectLength(cpMap.length);
-                cp_Descr_type.readFrom(in);
-                cp_Descr_type.setIndex(getCPIndex(CONSTANT_Signature));
-                for (int i = 0; i < cpMap.length; i++) {
-                    Entry ref  = cp_Descr_name.getRef();
-                    Entry ref2 = cp_Descr_type.getRef();
-                    cpMap[i] = ConstantPool.getDescriptorEntry((Utf8Entry)ref,
-                                                        (SignatureEntry)ref2);
-                }
-                cp_Descr_name.doneDisbursing();
-                cp_Descr_type.doneDisbursing();
-                break;
-            case CONSTANT_Fieldref:
-                readMemberRefs(tag, cpMap, cp_Field_class, cp_Field_desc);
-                break;
-            case CONSTANT_Methodref:
-                readMemberRefs(tag, cpMap, cp_Method_class, cp_Method_desc);
-                break;
-            case CONSTANT_InterfaceMethodref:
-                readMemberRefs(tag, cpMap, cp_Imethod_class, cp_Imethod_desc);
-                break;
-            case CONSTANT_MethodHandle:
-                if (cpMap.length > 0) {
-                    checkLegacy(cp_MethodHandle_refkind.name());
-                }
-                cp_MethodHandle_refkind.expectLength(cpMap.length);
-                cp_MethodHandle_refkind.readFrom(in);
-                cp_MethodHandle_member.expectLength(cpMap.length);
-                cp_MethodHandle_member.readFrom(in);
-                cp_MethodHandle_member.setIndex(getCPIndex(CONSTANT_AnyMember));
-                for (int i = 0; i < cpMap.length; i++) {
-                    byte        refKind = (byte)        cp_MethodHandle_refkind.getInt();
-                    MemberEntry memRef  = (MemberEntry) cp_MethodHandle_member.getRef();
-                    cpMap[i] = ConstantPool.getMethodHandleEntry(refKind, memRef);
-                }
-                cp_MethodHandle_refkind.doneDisbursing();
-                cp_MethodHandle_member.doneDisbursing();
-                break;
-            case CONSTANT_MethodType:
-                if (cpMap.length > 0) {
-                    checkLegacy(cp_MethodType.name());
-                }
-                cp_MethodType.expectLength(cpMap.length);
-                cp_MethodType.readFrom(in);
-                cp_MethodType.setIndex(getCPIndex(CONSTANT_Signature));
-                for (int i = 0; i < cpMap.length; i++) {
-                    SignatureEntry typeRef  = (SignatureEntry) cp_MethodType.getRef();
-                    cpMap[i] = ConstantPool.getMethodTypeEntry(typeRef);
-                }
-                cp_MethodType.doneDisbursing();
-                break;
-            case CONSTANT_InvokeDynamic:
-                if (cpMap.length > 0) {
-                    checkLegacy(cp_InvokeDynamic_spec.name());
-                }
-                cp_InvokeDynamic_spec.expectLength(cpMap.length);
-                cp_InvokeDynamic_spec.readFrom(in);
-                cp_InvokeDynamic_spec.setIndex(getCPIndex(CONSTANT_BootstrapMethod));
-                cp_InvokeDynamic_desc.expectLength(cpMap.length);
-                cp_InvokeDynamic_desc.readFrom(in);
-                cp_InvokeDynamic_desc.setIndex(getCPIndex(CONSTANT_NameandType));
-                for (int i = 0; i < cpMap.length; i++) {
-                    BootstrapMethodEntry bss   = (BootstrapMethodEntry) cp_InvokeDynamic_spec.getRef();
-                    DescriptorEntry      descr = (DescriptorEntry)      cp_InvokeDynamic_desc.getRef();
-                    cpMap[i] = ConstantPool.getInvokeDynamicEntry(bss, descr);
-                }
-                cp_InvokeDynamic_spec.doneDisbursing();
-                cp_InvokeDynamic_desc.doneDisbursing();
-                break;
-            case CONSTANT_BootstrapMethod:
-                if (cpMap.length > 0) {
-                    checkLegacy(cp_BootstrapMethod_ref.name());
-                }
-                cp_BootstrapMethod_ref.expectLength(cpMap.length);
-                cp_BootstrapMethod_ref.readFrom(in);
-                cp_BootstrapMethod_ref.setIndex(getCPIndex(CONSTANT_MethodHandle));
-                cp_BootstrapMethod_arg_count.expectLength(cpMap.length);
-                cp_BootstrapMethod_arg_count.readFrom(in);
-                int totalArgCount = cp_BootstrapMethod_arg_count.getIntTotal();
-                cp_BootstrapMethod_arg.expectLength(totalArgCount);
-                cp_BootstrapMethod_arg.readFrom(in);
-                cp_BootstrapMethod_arg.setIndex(getCPIndex(CONSTANT_LoadableValue));
-                for (int i = 0; i < cpMap.length; i++) {
-                    MethodHandleEntry bsm = (MethodHandleEntry) cp_BootstrapMethod_ref.getRef();
-                    int argc = cp_BootstrapMethod_arg_count.getInt();
-                    Entry[] argRefs = new Entry[argc];
-                    for (int j = 0; j < argc; j++) {
-                        argRefs[j] = cp_BootstrapMethod_arg.getRef();
-                    }
-                    cpMap[i] = ConstantPool.getBootstrapMethodEntry(bsm, argRefs);
-                }
-                cp_BootstrapMethod_ref.doneDisbursing();
-                cp_BootstrapMethod_arg_count.doneDisbursing();
-                cp_BootstrapMethod_arg.doneDisbursing();
-                break;
-            default:
-                throw new AssertionError("unexpected CP tag in package");
-            }
-
-            Index index = initCPIndex(tag, cpMap);
-
-            if (optDumpBands) {
-                try (PrintStream ps = new PrintStream(getDumpStream(index, ".idx"))) {
-                    printArrayTo(ps, index.cpMap, 0, index.cpMap.length);
-                }
-            }
-        }
-
-        cp_bands.doneDisbursing();
-
-        if (optDumpBands || verbose > 1) {
-            for (byte tag = CONSTANT_GroupFirst; tag < CONSTANT_GroupLimit; tag++) {
-                Index index = pkg.cp.getIndexByTag(tag);
-                if (index == null || index.isEmpty())  continue;
-                Entry[] cpMap = index.cpMap;
-                if (verbose > 1)
-                    Utils.log.info("Index group "+ConstantPool.tagName(tag)+" contains "+cpMap.length+" entries.");
-                if (optDumpBands) {
-                    try (PrintStream ps = new PrintStream(getDumpStream(index.debugName, tag, ".gidx", index))) {
-                        printArrayTo(ps, cpMap, 0, cpMap.length, true);
-                    }
-                }
-            }
-        }
-
-        setBandIndexes();
-    }
-
-    void readUtf8Bands(Entry[] cpMap) throws IOException {
-        //  cp_Utf8:
-        //        *cp_Utf8_prefix :DELTA5
-        //        *cp_Utf8_suffix :UNSIGNED5
-        //        *cp_Utf8_chars :CHAR3
-        //        *cp_Utf8_big_suffix :DELTA5
-        //        (*cp_Utf8_big_chars :DELTA5)
-        //          ** length(cp_Utf8_big_suffix)
-        int len = cpMap.length;
-        if (len == 0)
-            return;  // nothing to read
-
-        // Bands have implicit leading zeroes, for the empty string:
-        final int SUFFIX_SKIP_1 = 1;
-        final int PREFIX_SKIP_2 = 2;
-
-        // First band:  Read lengths of shared prefixes.
-        cp_Utf8_prefix.expectLength(Math.max(0, len - PREFIX_SKIP_2));
-        cp_Utf8_prefix.readFrom(in);
-
-        // Second band:  Read lengths of unshared suffixes:
-        cp_Utf8_suffix.expectLength(Math.max(0, len - SUFFIX_SKIP_1));
-        cp_Utf8_suffix.readFrom(in);
-
-        char[][] suffixChars = new char[len][];
-        int bigSuffixCount = 0;
-
-        // Third band:  Read the char values in the unshared suffixes:
-        cp_Utf8_chars.expectLength(cp_Utf8_suffix.getIntTotal());
-        cp_Utf8_chars.readFrom(in);
-        for (int i = 0; i < len; i++) {
-            int suffix = (i < SUFFIX_SKIP_1)? 0: cp_Utf8_suffix.getInt();
-            if (suffix == 0 && i >= SUFFIX_SKIP_1) {
-                // chars are packed in cp_Utf8_big_chars
-                bigSuffixCount += 1;
-                continue;
-            }
-            suffixChars[i] = new char[suffix];
-            for (int j = 0; j < suffix; j++) {
-                int ch = cp_Utf8_chars.getInt();
-                assert(ch == (char)ch);
-                suffixChars[i][j] = (char)ch;
-            }
-        }
-        cp_Utf8_chars.doneDisbursing();
-
-        // Fourth band:  Go back and size the specially packed strings.
-        int maxChars = 0;
-        cp_Utf8_big_suffix.expectLength(bigSuffixCount);
-        cp_Utf8_big_suffix.readFrom(in);
-        cp_Utf8_suffix.resetForSecondPass();
-        for (int i = 0; i < len; i++) {
-            int suffix = (i < SUFFIX_SKIP_1)? 0: cp_Utf8_suffix.getInt();
-            int prefix = (i < PREFIX_SKIP_2)? 0: cp_Utf8_prefix.getInt();
-            if (suffix == 0 && i >= SUFFIX_SKIP_1) {
-                assert(suffixChars[i] == null);
-                suffix = cp_Utf8_big_suffix.getInt();
-            } else {
-                assert(suffixChars[i] != null);
-            }
-            if (maxChars < prefix + suffix)
-                maxChars = prefix + suffix;
-        }
-        char[] buf = new char[maxChars];
-
-        // Fifth band(s):  Get the specially packed characters.
-        cp_Utf8_suffix.resetForSecondPass();
-        cp_Utf8_big_suffix.resetForSecondPass();
-        for (int i = 0; i < len; i++) {
-            if (i < SUFFIX_SKIP_1)  continue;
-            int suffix = cp_Utf8_suffix.getInt();
-            if (suffix != 0)  continue;  // already input
-            suffix = cp_Utf8_big_suffix.getInt();
-            suffixChars[i] = new char[suffix];
-            if (suffix == 0) {
-                // Do not bother to add an empty "(Utf8_big_0)" band.
-                continue;
-            }
-            IntBand packed = cp_Utf8_big_chars.newIntBand("(Utf8_big_"+i+")");
-            packed.expectLength(suffix);
-            packed.readFrom(in);
-            for (int j = 0; j < suffix; j++) {
-                int ch = packed.getInt();
-                assert(ch == (char)ch);
-                suffixChars[i][j] = (char)ch;
-            }
-            packed.doneDisbursing();
-        }
-        cp_Utf8_big_chars.doneDisbursing();
-
-        // Finally, sew together all the prefixes and suffixes.
-        cp_Utf8_prefix.resetForSecondPass();
-        cp_Utf8_suffix.resetForSecondPass();
-        cp_Utf8_big_suffix.resetForSecondPass();
-        for (int i = 0; i < len; i++) {
-            int prefix = (i < PREFIX_SKIP_2)? 0: cp_Utf8_prefix.getInt();
-            int suffix = (i < SUFFIX_SKIP_1)? 0: cp_Utf8_suffix.getInt();
-            if (suffix == 0 && i >= SUFFIX_SKIP_1)
-                suffix = cp_Utf8_big_suffix.getInt();
-
-            // by induction, the buffer is already filled with the prefix
-            System.arraycopy(suffixChars[i], 0, buf, prefix, suffix);
-
-            cpMap[i] = ConstantPool.getUtf8Entry(new String(buf, 0, prefix+suffix));
-        }
-
-        cp_Utf8_prefix.doneDisbursing();
-        cp_Utf8_suffix.doneDisbursing();
-        cp_Utf8_big_suffix.doneDisbursing();
-    }
-
-    Map<Utf8Entry, SignatureEntry> utf8Signatures;
-
-    void readSignatureBands(Entry[] cpMap) throws IOException {
-        //  cp_Signature:
-        //        *cp_Signature_form :DELTA5  (cp_Utf8)
-        //        *cp_Signature_classes :UDELTA5  (cp_Class)
-        cp_Signature_form.expectLength(cpMap.length);
-        cp_Signature_form.readFrom(in);
-        cp_Signature_form.setIndex(getCPIndex(CONSTANT_Utf8));
-        int[] numSigClasses = new int[cpMap.length];
-        for (int i = 0; i < cpMap.length; i++) {
-            Utf8Entry formRef = (Utf8Entry) cp_Signature_form.getRef();
-            numSigClasses[i] = ConstantPool.countClassParts(formRef);
-        }
-        cp_Signature_form.resetForSecondPass();
-        cp_Signature_classes.expectLength(getIntTotal(numSigClasses));
-        cp_Signature_classes.readFrom(in);
-        cp_Signature_classes.setIndex(getCPIndex(CONSTANT_Class));
-        utf8Signatures = new HashMap<>();
-        for (int i = 0; i < cpMap.length; i++) {
-            Utf8Entry formRef = (Utf8Entry) cp_Signature_form.getRef();
-            ClassEntry[] classRefs = new ClassEntry[numSigClasses[i]];
-            for (int j = 0; j < classRefs.length; j++) {
-                classRefs[j] = (ClassEntry) cp_Signature_classes.getRef();
-            }
-            SignatureEntry se = ConstantPool.getSignatureEntry(formRef, classRefs);
-            cpMap[i] = se;
-            utf8Signatures.put(se.asUtf8Entry(), se);
-        }
-        cp_Signature_form.doneDisbursing();
-        cp_Signature_classes.doneDisbursing();
-    }
-
-    void readMemberRefs(byte tag, Entry[] cpMap, CPRefBand cp_class, CPRefBand cp_desc) throws IOException {
-        //  cp_Field:
-        //        *cp_Field_class :DELTA5  (cp_Class)
-        //        *cp_Field_desc :UDELTA5  (cp_Descr)
-        //  cp_Method:
-        //        *cp_Method_class :DELTA5  (cp_Class)
-        //        *cp_Method_desc :UDELTA5  (cp_Descr)
-        //  cp_Imethod:
-        //        *cp_Imethod_class :DELTA5  (cp_Class)
-        //        *cp_Imethod_desc :UDELTA5  (cp_Descr)
-        cp_class.expectLength(cpMap.length);
-        cp_class.readFrom(in);
-        cp_class.setIndex(getCPIndex(CONSTANT_Class));
-        cp_desc.expectLength(cpMap.length);
-        cp_desc.readFrom(in);
-        cp_desc.setIndex(getCPIndex(CONSTANT_NameandType));
-        for (int i = 0; i < cpMap.length; i++) {
-            ClassEntry      mclass = (ClassEntry     ) cp_class.getRef();
-            DescriptorEntry mdescr = (DescriptorEntry) cp_desc.getRef();
-            cpMap[i] = ConstantPool.getMemberEntry(tag, mclass, mdescr);
-        }
-        cp_class.doneDisbursing();
-        cp_desc.doneDisbursing();
-    }
-
-    void readFiles() throws IOException {
-        //  file_bands:
-        //        *file_name :UNSIGNED5  (cp_Utf8)
-        //        *file_size_hi :UNSIGNED5
-        //        *file_size_lo :UNSIGNED5
-        //        *file_modtime :DELTA5
-        //        *file_options :UNSIGNED5
-        //        *file_bits :BYTE1
-        if (verbose > 0)
-            Utils.log.info("  ...building "+numFiles+" files...");
-        file_name.expectLength(numFiles);
-        file_size_lo.expectLength(numFiles);
-        int options = archiveOptions;
-        boolean haveSizeHi  = testBit(options, AO_HAVE_FILE_SIZE_HI);
-        boolean haveModtime = testBit(options, AO_HAVE_FILE_MODTIME);
-        boolean haveOptions = testBit(options, AO_HAVE_FILE_OPTIONS);
-        if (haveSizeHi)
-            file_size_hi.expectLength(numFiles);
-        if (haveModtime)
-            file_modtime.expectLength(numFiles);
-        if (haveOptions)
-            file_options.expectLength(numFiles);
-
-        file_name.readFrom(in);
-        file_size_hi.readFrom(in);
-        file_size_lo.readFrom(in);
-        file_modtime.readFrom(in);
-        file_options.readFrom(in);
-        file_bits.setInputStreamFrom(in);
-
-        Iterator<Class> nextClass = pkg.getClasses().iterator();
-
-        // Compute file lengths before reading any file bits.
-        long totalFileLength = 0;
-        long[] fileLengths = new long[numFiles];
-        for (int i = 0; i < numFiles; i++) {
-            long size = ((long)file_size_lo.getInt() << 32) >>> 32;
-            if (haveSizeHi)
-                size += (long)file_size_hi.getInt() << 32;
-            fileLengths[i] = size;
-            totalFileLength += size;
-        }
-        assert(in.getReadLimit() == -1 || in.getReadLimit() == totalFileLength);
-
-        byte[] buf = new byte[1<<16];
-        for (int i = 0; i < numFiles; i++) {
-            // %%% Use a big temp file for file bits?
-            Utf8Entry name = (Utf8Entry) file_name.getRef();
-            long size = fileLengths[i];
-            File file = pkg.new File(name);
-            file.modtime = pkg.default_modtime;
-            file.options = pkg.default_options;
-            if (haveModtime)
-                file.modtime += file_modtime.getInt();
-            if (haveOptions)
-                file.options |= file_options.getInt();
-            if (verbose > 1)
-                Utils.log.fine("Reading "+size+" bytes of "+name.stringValue());
-            long toRead = size;
-            while (toRead > 0) {
-                int nr = buf.length;
-                if (nr > toRead)  nr = (int) toRead;
-                nr = file_bits.getInputStream().read(buf, 0, nr);
-                if (nr < 0)  throw new EOFException();
-                file.addBytes(buf, 0, nr);
-                toRead -= nr;
-            }
-            pkg.addFile(file);
-            if (file.isClassStub()) {
-                assert(file.getFileLength() == 0);
-                Class cls = nextClass.next();
-                cls.initFile(file);
-            }
-        }
-
-        // Do the rest of the classes.
-        while (nextClass.hasNext()) {
-            Class cls = nextClass.next();
-            cls.initFile(null);  // implicitly initialize to a trivial one
-            cls.file.modtime = pkg.default_modtime;
-        }
-
-        file_name.doneDisbursing();
-        file_size_hi.doneDisbursing();
-        file_size_lo.doneDisbursing();
-        file_modtime.doneDisbursing();
-        file_options.doneDisbursing();
-        file_bits.doneDisbursing();
-        file_bands.doneDisbursing();
-
-        if (archiveSize1 != 0 && !in.atLimit()) {
-            throw new RuntimeException("Predicted archive_size "+
-                                       archiveSize1+" != "+
-                                       (in.getBytesServed()-archiveSize0));
-        }
-    }
-
-    void readAttrDefs() throws IOException {
-        //  attr_definition_bands:
-        //        *attr_definition_headers :BYTE1
-        //        *attr_definition_name :UNSIGNED5  (cp_Utf8)
-        //        *attr_definition_layout :UNSIGNED5  (cp_Utf8)
-        attr_definition_headers.expectLength(numAttrDefs);
-        attr_definition_name.expectLength(numAttrDefs);
-        attr_definition_layout.expectLength(numAttrDefs);
-        attr_definition_headers.readFrom(in);
-        attr_definition_name.readFrom(in);
-        attr_definition_layout.readFrom(in);
-        try (PrintStream dump = !optDumpBands ? null
-                 : new PrintStream(getDumpStream(attr_definition_headers, ".def")))
-        {
-            for (int i = 0; i < numAttrDefs; i++) {
-                int       header = attr_definition_headers.getByte();
-                Utf8Entry name   = (Utf8Entry) attr_definition_name.getRef();
-                Utf8Entry layout = (Utf8Entry) attr_definition_layout.getRef();
-                int       ctype  = (header &  ADH_CONTEXT_MASK);
-                int       index  = (header >> ADH_BIT_SHIFT) - ADH_BIT_IS_LSB;
-                Attribute.Layout def = new Attribute.Layout(ctype,
-                                                            name.stringValue(),
-                                                            layout.stringValue());
-                // Check layout string for Java 6 extensions.
-                String pvLayout = def.layoutForClassVersion(getHighestClassVersion());
-                if (!pvLayout.equals(def.layout())) {
-                    throw new IOException("Bad attribute layout in archive: "+def.layout());
-                }
-                this.setAttributeLayoutIndex(def, index);
-                if (dump != null)  dump.println(index+" "+def);
-            }
-        }
-        attr_definition_headers.doneDisbursing();
-        attr_definition_name.doneDisbursing();
-        attr_definition_layout.doneDisbursing();
-        // Attribute layouts define bands, one per layout element.
-        // Create them now, all at once.
-        makeNewAttributeBands();
-        attr_definition_bands.doneDisbursing();
-    }
-
-    void readInnerClasses() throws IOException {
-        //  ic_bands:
-        //        *ic_this_class :UDELTA5  (cp_Class)
-        //        *ic_flags :UNSIGNED5
-        //        *ic_outer_class :DELTA5  (null or cp_Class)
-        //        *ic_name :DELTA5  (null or cp_Utf8)
-        ic_this_class.expectLength(numInnerClasses);
-        ic_this_class.readFrom(in);
-        ic_flags.expectLength(numInnerClasses);
-        ic_flags.readFrom(in);
-        int longICCount = 0;
-        for (int i = 0; i < numInnerClasses; i++) {
-            int flags = ic_flags.getInt();
-            boolean longForm = (flags & ACC_IC_LONG_FORM) != 0;
-            if (longForm) {
-                longICCount += 1;
-            }
-        }
-        ic_outer_class.expectLength(longICCount);
-        ic_outer_class.readFrom(in);
-        ic_name.expectLength(longICCount);
-        ic_name.readFrom(in);
-        ic_flags.resetForSecondPass();
-        List<InnerClass> icList = new ArrayList<>(numInnerClasses);
-        for (int i = 0; i < numInnerClasses; i++) {
-            int flags = ic_flags.getInt();
-            boolean longForm = (flags & ACC_IC_LONG_FORM) != 0;
-            flags &= ~ACC_IC_LONG_FORM;
-            ClassEntry thisClass = (ClassEntry) ic_this_class.getRef();
-            ClassEntry outerClass;
-            Utf8Entry  thisName;
-            if (longForm) {
-                outerClass = (ClassEntry) ic_outer_class.getRef();
-                thisName   = (Utf8Entry)  ic_name.getRef();
-            } else {
-                String n = thisClass.stringValue();
-                String[] parse = Package.parseInnerClassName(n);
-                assert(parse != null);
-                String pkgOuter = parse[0];
-                //String number = parse[1];
-                String name     = parse[2];
-                if (pkgOuter == null)
-                    outerClass = null;
-                else
-                    outerClass = ConstantPool.getClassEntry(pkgOuter);
-                if (name == null)
-                    thisName   = null;
-                else
-                    thisName   = ConstantPool.getUtf8Entry(name);
-            }
-            InnerClass ic =
-                new InnerClass(thisClass, outerClass, thisName, flags);
-            assert(longForm || ic.predictable);
-            icList.add(ic);
-        }
-        ic_flags.doneDisbursing();
-        ic_this_class.doneDisbursing();
-        ic_outer_class.doneDisbursing();
-        ic_name.doneDisbursing();
-        pkg.setAllInnerClasses(icList);
-        ic_bands.doneDisbursing();
-    }
-
-    void readLocalInnerClasses(Class cls) throws IOException {
-        int nc = class_InnerClasses_N.getInt();
-        List<InnerClass> localICs = new ArrayList<>(nc);
-        for (int i = 0; i < nc; i++) {
-            ClassEntry thisClass = (ClassEntry) class_InnerClasses_RC.getRef();
-            int        flags     =              class_InnerClasses_F.getInt();
-            if (flags == 0) {
-                // A zero flag means copy a global IC here.
-                InnerClass ic = pkg.getGlobalInnerClass(thisClass);
-                assert(ic != null);  // must be a valid global IC reference
-                localICs.add(ic);
-            } else {
-                if (flags == ACC_IC_LONG_FORM)
-                    flags = 0;  // clear the marker bit
-                ClassEntry outer = (ClassEntry) class_InnerClasses_outer_RCN.getRef();
-                Utf8Entry name   = (Utf8Entry)  class_InnerClasses_name_RUN.getRef();
-                localICs.add(new InnerClass(thisClass, outer, name, flags));
-            }
-        }
-        cls.setInnerClasses(localICs);
-        // cls.expandLocalICs may add more tuples to ics also,
-        // or may even delete tuples.
-        // We cannot do that now, because we do not know the
-        // full contents of the local constant pool yet.
-    }
-
-    static final int NO_FLAGS_YET = 0;  // placeholder for later flag read-in
-
-    Class[] readClasses() throws IOException {
-        //  class_bands:
-        //        *class_this :DELTA5  (cp_Class)
-        //        *class_super :DELTA5  (cp_Class)
-        //        *class_interface_count :DELTA5
-        //        *class_interface :DELTA5  (cp_Class)
-        //        ...(member bands)...
-        //        class_attr_bands
-        //        code_bands
-        Class[] classes = new Class[numClasses];
-        if (verbose > 0)
-            Utils.log.info("  ...building "+classes.length+" classes...");
-
-        class_this.expectLength(numClasses);
-        class_super.expectLength(numClasses);
-        class_interface_count.expectLength(numClasses);
-
-        class_this.readFrom(in);
-        class_super.readFrom(in);
-        class_interface_count.readFrom(in);
-        class_interface.expectLength(class_interface_count.getIntTotal());
-        class_interface.readFrom(in);
-        for (int i = 0; i < classes.length; i++) {
-            ClassEntry   thisClass  = (ClassEntry) class_this.getRef();
-            ClassEntry   superClass = (ClassEntry) class_super.getRef();
-            ClassEntry[] interfaces = new ClassEntry[class_interface_count.getInt()];
-            for (int j = 0; j < interfaces.length; j++) {
-                interfaces[j] = (ClassEntry) class_interface.getRef();
-            }
-            // Packer encoded rare case of null superClass as thisClass:
-            if (superClass == thisClass)  superClass = null;
-            Class cls = pkg.new Class(NO_FLAGS_YET,
-                                      thisClass, superClass, interfaces);
-            classes[i] = cls;
-        }
-        class_this.doneDisbursing();
-        class_super.doneDisbursing();
-        class_interface_count.doneDisbursing();
-        class_interface.doneDisbursing();
-        readMembers(classes);
-        countAndReadAttrs(ATTR_CONTEXT_CLASS, Arrays.asList(classes));
-        pkg.trimToSize();
-        readCodeHeaders();
-        //code_bands.doneDisbursing(); // still need to read code attrs
-        //class_bands.doneDisbursing(); // still need to read code attrs
-        return classes;
-    }
-
-    private int getOutputIndex(Entry e) {
-        // Output CPs do not contain signatures.
-        assert(e.tag != CONSTANT_Signature);
-        int k = pkg.cp.untypedIndexOf(e);
-        // In the output ordering, input signatures can serve
-        // in place of Utf8s.
-        if (k >= 0)
-            return k;
-        if (e.tag == CONSTANT_Utf8) {
-            Entry se = utf8Signatures.get(e);
-            return pkg.cp.untypedIndexOf(se);
-        }
-        return -1;
-    }
-
-    Comparator<Entry> entryOutputOrder = new Comparator<Entry>() {
-        public int compare(Entry e0, Entry e1) {
-            int k0 = getOutputIndex(e0);
-            int k1 = getOutputIndex(e1);
-            if (k0 >= 0 && k1 >= 0)
-                // If both have keys, use the keys.
-                return k0 - k1;
-            if (k0 == k1)
-                // If neither have keys, use their native tags & spellings.
-                return e0.compareTo(e1);
-            // Otherwise, the guy with the key comes first.
-            return (k0 >= 0)? 0-1: 1-0;
-        }
-    };
-
-    void reconstructClass(Class cls) {
-        if (verbose > 1)  Utils.log.fine("reconstruct "+cls);
-
-        // check for local .ClassFile.version
-        Attribute retroVersion = cls.getAttribute(attrClassFileVersion);
-        if (retroVersion != null) {
-            cls.removeAttribute(retroVersion);
-            cls.version = parseClassFileVersionAttr(retroVersion);
-        } else {
-            cls.version = pkg.defaultClassVersion;
-        }
-
-        // Replace null SourceFile by "obvious" string.
-        cls.expandSourceFile();
-
-        // record the local cp:
-        cls.setCPMap(reconstructLocalCPMap(cls));
-    }
-
-    Entry[] reconstructLocalCPMap(Class cls) {
-        Set<Entry> ldcRefs = ldcRefMap.get(cls);
-        Set<Entry> cpRefs = new HashSet<>();
-
-        // look for constant pool entries:
-        cls.visitRefs(VRM_CLASSIC, cpRefs);
-
-        ArrayList<BootstrapMethodEntry> bsms = new ArrayList<>();
-        /*
-         * BootstrapMethod(BSMs) are added here before InnerClasses(ICs),
-         * so as to ensure the order. Noting that the BSMs  may be
-         * removed if they are not found in the CP, after the ICs expansion.
-         */
-        cls.addAttribute(Package.attrBootstrapMethodsEmpty.canonicalInstance());
-
-        // flesh out the local constant pool
-        ConstantPool.completeReferencesIn(cpRefs, true, bsms);
-
-        // remove the attr previously set, otherwise add the bsm and
-        // references as required
-        if (bsms.isEmpty()) {
-            cls.attributes.remove(Package.attrBootstrapMethodsEmpty.canonicalInstance());
-        } else {
-            cpRefs.add(Package.getRefString("BootstrapMethods"));
-            Collections.sort(bsms);
-            cls.setBootstrapMethods(bsms);
-        }
-
-        // Now that we know all our local class references,
-        // compute the InnerClasses attribute.
-        int changed = cls.expandLocalICs();
-
-        if (changed != 0) {
-            if (changed > 0) {
-                // Just visit the expanded InnerClasses attr.
-                cls.visitInnerClassRefs(VRM_CLASSIC, cpRefs);
-            } else {
-                // Have to recompute from scratch, because of deletions.
-                cpRefs.clear();
-                cls.visitRefs(VRM_CLASSIC, cpRefs);
-            }
-
-            // flesh out the local constant pool, again
-            ConstantPool.completeReferencesIn(cpRefs, true, bsms);
-        }
-
-        // construct a local constant pool
-        int numDoubles = 0;
-        for (Entry e : cpRefs) {
-            if (e.isDoubleWord())  numDoubles++;
-        }
-        Entry[] cpMap = new Entry[1+numDoubles+cpRefs.size()];
-        int fillp = 1;
-
-        // Add all ldc operands first.
-        if (ldcRefs != null) {
-            assert(cpRefs.containsAll(ldcRefs));
-            for (Entry e : ldcRefs) {
-                cpMap[fillp++] = e;
-            }
-            assert(fillp == 1+ldcRefs.size());
-            cpRefs.removeAll(ldcRefs);
-            ldcRefs = null;  // done with it
-        }
-
-        // Next add all the two-byte references.
-        Set<Entry> wideRefs = cpRefs;
-        cpRefs = null;  // do not use!
-        int narrowLimit = fillp;
-        for (Entry e : wideRefs) {
-            cpMap[fillp++] = e;
-        }
-        assert(fillp == narrowLimit+wideRefs.size());
-        Arrays.sort(cpMap, 1, narrowLimit, entryOutputOrder);
-        Arrays.sort(cpMap, narrowLimit, fillp, entryOutputOrder);
-
-        if (verbose > 3) {
-            Utils.log.fine("CP of "+this+" {");
-            for (int i = 0; i < fillp; i++) {
-                Entry e = cpMap[i];
-                Utils.log.fine("  "+((e==null)?-1:getOutputIndex(e))
-                                   +" : "+e);
-            }
-            Utils.log.fine("}");
-        }
-
-        // Now repack backwards, introducing null elements.
-        int revp = cpMap.length;
-        for (int i = fillp; --i >= 1; ) {
-            Entry e = cpMap[i];
-            if (e.isDoubleWord())
-                cpMap[--revp] = null;
-            cpMap[--revp] = e;
-        }
-        assert(revp == 1);  // do not process the initial null
-
-        return cpMap;
-    }
-
-    void readMembers(Class[] classes) throws IOException {
-        //  class_bands:
-        //        ...
-        //        *class_field_count :DELTA5
-        //        *class_method_count :DELTA5
-        //
-        //        *field_descr :DELTA5  (cp_Descr)
-        //        field_attr_bands
-        //
-        //        *method_descr :MDELTA5  (cp_Descr)
-        //        method_attr_bands
-        //        ...
-        assert(classes.length == numClasses);
-        class_field_count.expectLength(numClasses);
-        class_method_count.expectLength(numClasses);
-        class_field_count.readFrom(in);
-        class_method_count.readFrom(in);
-
-        // Make a pre-pass over field and method counts to size the descrs:
-        int totalNF = class_field_count.getIntTotal();
-        int totalNM = class_method_count.getIntTotal();
-        field_descr.expectLength(totalNF);
-        method_descr.expectLength(totalNM);
-        if (verbose > 1)  Utils.log.fine("expecting #fields="+totalNF+
-                " and #methods="+totalNM+" in #classes="+numClasses);
-
-        List<Class.Field> fields = new ArrayList<>(totalNF);
-        field_descr.readFrom(in);
-        for (int i = 0; i < classes.length; i++) {
-            Class c = classes[i];
-            int nf = class_field_count.getInt();
-            for (int j = 0; j < nf; j++) {
-                Class.Field f = c.new Field(NO_FLAGS_YET, (DescriptorEntry)
-                                            field_descr.getRef());
-                fields.add(f);
-            }
-        }
-        class_field_count.doneDisbursing();
-        field_descr.doneDisbursing();
-        countAndReadAttrs(ATTR_CONTEXT_FIELD, fields);
-        fields = null;  // release to GC
-
-        List<Class.Method> methods = new ArrayList<>(totalNM);
-        method_descr.readFrom(in);
-        for (int i = 0; i < classes.length; i++) {
-            Class c = classes[i];
-            int nm = class_method_count.getInt();
-            for (int j = 0; j < nm; j++) {
-                Class.Method m = c.new Method(NO_FLAGS_YET, (DescriptorEntry)
-                                              method_descr.getRef());
-                methods.add(m);
-            }
-        }
-        class_method_count.doneDisbursing();
-        method_descr.doneDisbursing();
-        countAndReadAttrs(ATTR_CONTEXT_METHOD, methods);
-
-        // Up to this point, Code attributes look like empty attributes.
-        // Now we start to special-case them.  The empty canonical Code
-        // attributes stay in the method attribute lists, however.
-        allCodes = buildCodeAttrs(methods);
-    }
-
-    Code[] allCodes;
-    List<Code> codesWithFlags;
-    Map<Class, Set<Entry>> ldcRefMap = new HashMap<>();
-
-    Code[] buildCodeAttrs(List<Class.Method> methods) {
-        List<Code> codes = new ArrayList<>(methods.size());
-        for (Class.Method m : methods) {
-            if (m.getAttribute(attrCodeEmpty) != null) {
-                m.code = new Code(m);
-                codes.add(m.code);
-            }
-        }
-        Code[] a = new Code[codes.size()];
-        codes.toArray(a);
-        return a;
-    }
-
-    void readCodeHeaders() throws IOException {
-        //  code_bands:
-        //        *code_headers :BYTE1
-        //
-        //        *code_max_stack :UNSIGNED5
-        //        *code_max_na_locals :UNSIGNED5
-        //        *code_handler_count :UNSIGNED5
-        //        ...
-        //        code_attr_bands
-        boolean attrsOK = testBit(archiveOptions, AO_HAVE_ALL_CODE_FLAGS);
-        code_headers.expectLength(allCodes.length);
-        code_headers.readFrom(in);
-        List<Code> longCodes = new ArrayList<>(allCodes.length / 10);
-        for (int i = 0; i < allCodes.length; i++) {
-            Code c = allCodes[i];
-            int sc = code_headers.getByte();
-            assert(sc == (sc & 0xFF));
-            if (verbose > 2)
-                Utils.log.fine("codeHeader "+c+" = "+sc);
-            if (sc == LONG_CODE_HEADER) {
-                // We will read ms/ml/nh/flags from bands shortly.
-                longCodes.add(c);
-                continue;
-            }
-            // Short code header is the usual case:
-            c.setMaxStack(     shortCodeHeader_max_stack(sc) );
-            c.setMaxNALocals(  shortCodeHeader_max_na_locals(sc) );
-            c.setHandlerCount( shortCodeHeader_handler_count(sc) );
-            assert(shortCodeHeader(c) == sc);
-        }
-        code_headers.doneDisbursing();
-        code_max_stack.expectLength(longCodes.size());
-        code_max_na_locals.expectLength(longCodes.size());
-        code_handler_count.expectLength(longCodes.size());
-
-        // Do the long headers now.
-        code_max_stack.readFrom(in);
-        code_max_na_locals.readFrom(in);
-        code_handler_count.readFrom(in);
-        for (Code c : longCodes) {
-            c.setMaxStack(     code_max_stack.getInt() );
-            c.setMaxNALocals(  code_max_na_locals.getInt() );
-            c.setHandlerCount( code_handler_count.getInt() );
-        }
-        code_max_stack.doneDisbursing();
-        code_max_na_locals.doneDisbursing();
-        code_handler_count.doneDisbursing();
-
-        readCodeHandlers();
-
-        if (attrsOK) {
-            // Code attributes are common (debug info not stripped).
-            codesWithFlags = Arrays.asList(allCodes);
-        } else {
-            // Code attributes are very sparse (debug info is stripped).
-            codesWithFlags = longCodes;
-        }
-        countAttrs(ATTR_CONTEXT_CODE, codesWithFlags);
-        // do readAttrs later, after BCs are scanned
-    }
-
-    void readCodeHandlers() throws IOException {
-        //  code_bands:
-        //        ...
-        //        *code_handler_start_P :BCI5
-        //        *code_handler_end_PO :BRANCH5
-        //        *code_handler_catch_PO :BRANCH5
-        //        *code_handler_class_RCN :UNSIGNED5  (null or cp_Class)
-        //        ...
-        int nh = 0;
-        for (int i = 0; i < allCodes.length; i++) {
-            Code c = allCodes[i];
-            nh += c.getHandlerCount();
-        }
-
-        ValueBand[] code_handler_bands = {
-            code_handler_start_P,
-            code_handler_end_PO,
-            code_handler_catch_PO,
-            code_handler_class_RCN
-        };
-
-        for (int i = 0; i < code_handler_bands.length; i++) {
-            code_handler_bands[i].expectLength(nh);
-            code_handler_bands[i].readFrom(in);
-        }
-
-        for (int i = 0; i < allCodes.length; i++) {
-            Code c = allCodes[i];
-            for (int j = 0, jmax = c.getHandlerCount(); j < jmax; j++) {
-                c.handler_class[j] = code_handler_class_RCN.getRef();
-                // For now, just record the raw BCI codes.
-                // We must wait until we have instruction boundaries.
-                c.handler_start[j] = code_handler_start_P.getInt();
-                c.handler_end[j]   = code_handler_end_PO.getInt();
-                c.handler_catch[j] = code_handler_catch_PO.getInt();
-            }
-        }
-        for (int i = 0; i < code_handler_bands.length; i++) {
-            code_handler_bands[i].doneDisbursing();
-        }
-    }
-
-    void fixupCodeHandlers() {
-        // Actually decode (renumber) the BCIs now.
-        for (int i = 0; i < allCodes.length; i++) {
-            Code c = allCodes[i];
-            for (int j = 0, jmax = c.getHandlerCount(); j < jmax; j++) {
-                int sum = c.handler_start[j];
-                c.handler_start[j] = c.decodeBCI(sum);
-                sum += c.handler_end[j];
-                c.handler_end[j]   = c.decodeBCI(sum);
-                sum += c.handler_catch[j];
-                c.handler_catch[j] = c.decodeBCI(sum);
-            }
-        }
-    }
-
-    // Generic routines for reading attributes of
-    // classes, fields, methods, and codes.
-    // The holders is a global list, already collected,
-    // of attribute "customers".
-    void countAndReadAttrs(int ctype, Collection<? extends Attribute.Holder> holders)
-            throws IOException {
-        //  class_attr_bands:
-        //        *class_flags :UNSIGNED5
-        //        *class_attr_count :UNSIGNED5
-        //        *class_attr_indexes :UNSIGNED5
-        //        *class_attr_calls :UNSIGNED5
-        //        *class_Signature_RS :UNSIGNED5 (cp_Signature)
-        //        class_metadata_bands
-        //        *class_SourceFile_RU :UNSIGNED5 (cp_Utf8)
-        //        *class_EnclosingMethod_RM :UNSIGNED5 (cp_Method)
-        //        ic_local_bands
-        //        *class_ClassFile_version_minor_H :UNSIGNED5
-        //        *class_ClassFile_version_major_H :UNSIGNED5
-        //        class_type_metadata_bands
-        //
-        //  field_attr_bands:
-        //        *field_flags :UNSIGNED5
-        //        *field_attr_count :UNSIGNED5
-        //        *field_attr_indexes :UNSIGNED5
-        //        *field_attr_calls :UNSIGNED5
-        //        *field_Signature_RS :UNSIGNED5 (cp_Signature)
-        //        field_metadata_bands
-        //        *field_ConstantValue_KQ :UNSIGNED5 (cp_Int, etc.; see note)
-        //        field_type_metadata_bands
-        //
-        //  method_attr_bands:
-        //        *method_flags :UNSIGNED5
-        //        *method_attr_count :UNSIGNED5
-        //        *method_attr_indexes :UNSIGNED5
-        //        *method_attr_calls :UNSIGNED5
-        //        *method_Signature_RS :UNSIGNED5 (cp_Signature)
-        //        method_metadata_bands
-        //        *method_Exceptions_N :UNSIGNED5
-        //        *method_Exceptions_RC :UNSIGNED5  (cp_Class)
-        //        *method_MethodParameters_NB: BYTE1
-        //        *method_MethodParameters_RUN: UNSIGNED5 (cp_Utf8)
-        //        *method_MethodParameters_FH:  UNSIGNED5 (flag)
-        //        method_type_metadata_bands
-        //
-        //  code_attr_bands:
-        //        *code_flags :UNSIGNED5
-        //        *code_attr_count :UNSIGNED5
-        //        *code_attr_indexes :UNSIGNED5
-        //        *code_attr_calls :UNSIGNED5
-        //        *code_LineNumberTable_N :UNSIGNED5
-        //        *code_LineNumberTable_bci_P :BCI5
-        //        *code_LineNumberTable_line :UNSIGNED5
-        //        *code_LocalVariableTable_N :UNSIGNED5
-        //        *code_LocalVariableTable_bci_P :BCI5
-        //        *code_LocalVariableTable_span_O :BRANCH5
-        //        *code_LocalVariableTable_name_RU :UNSIGNED5 (cp_Utf8)
-        //        *code_LocalVariableTable_type_RS :UNSIGNED5 (cp_Signature)
-        //        *code_LocalVariableTable_slot :UNSIGNED5
-        //        code_type_metadata_bands
-
-        countAttrs(ctype, holders);
-        readAttrs(ctype, holders);
-    }
-
-    // Read flags and count the attributes that are to be placed
-    // on the given holders.
-    void countAttrs(int ctype, Collection<? extends Attribute.Holder> holders)
-            throws IOException {
-        // Here, xxx stands for one of class, field, method, code.
-        MultiBand xxx_attr_bands = attrBands[ctype];
-        long flagMask = attrFlagMask[ctype];
-        if (verbose > 1) {
-            Utils.log.fine("scanning flags and attrs for "+
-                    Attribute.contextName(ctype)+"["+holders.size()+"]");
-        }
-
-        // Fetch the attribute layout definitions which govern the bands
-        // we are about to read.
-        List<Attribute.Layout> defList = attrDefs.get(ctype);
-        Attribute.Layout[] defs = new Attribute.Layout[defList.size()];
-        defList.toArray(defs);
-        IntBand xxx_flags_hi = getAttrBand(xxx_attr_bands, AB_FLAGS_HI);
-        IntBand xxx_flags_lo = getAttrBand(xxx_attr_bands, AB_FLAGS_LO);
-        IntBand xxx_attr_count = getAttrBand(xxx_attr_bands, AB_ATTR_COUNT);
-        IntBand xxx_attr_indexes = getAttrBand(xxx_attr_bands, AB_ATTR_INDEXES);
-        IntBand xxx_attr_calls = getAttrBand(xxx_attr_bands, AB_ATTR_CALLS);
-
-        // Count up the number of holders which have overflow attrs.
-        int overflowMask = attrOverflowMask[ctype];
-        int overflowHolderCount = 0;
-        boolean haveLongFlags = haveFlagsHi(ctype);
-        xxx_flags_hi.expectLength(haveLongFlags? holders.size(): 0);
-        xxx_flags_hi.readFrom(in);
-        xxx_flags_lo.expectLength(holders.size());
-        xxx_flags_lo.readFrom(in);
-        assert((flagMask & overflowMask) == overflowMask);
-        for (Attribute.Holder h : holders) {
-            int flags = xxx_flags_lo.getInt();
-            h.flags = flags;
-            if ((flags & overflowMask) != 0)
-                overflowHolderCount += 1;
-        }
-
-        // For each holder with overflow attrs, read a count.
-        xxx_attr_count.expectLength(overflowHolderCount);
-        xxx_attr_count.readFrom(in);
-        xxx_attr_indexes.expectLength(xxx_attr_count.getIntTotal());
-        xxx_attr_indexes.readFrom(in);
-
-        // Now it's time to check flag bits that indicate attributes.
-        // We accumulate (a) a list of attribute types for each holder
-        // (class/field/method/code), and also we accumulate (b) a total
-        // count for each attribute type.
-        int[] totalCounts = new int[defs.length];
-        for (Attribute.Holder h : holders) {
-            assert(h.attributes == null);
-            // System.out.println("flags="+h.flags+" using fm="+flagMask);
-            long attrBits = ((h.flags & flagMask) << 32) >>> 32;
-            // Clean up the flags now.
-            h.flags -= (int)attrBits;   // strip attr bits
-            assert(h.flags == (char)h.flags);  // 16 bits only now
-            assert((ctype != ATTR_CONTEXT_CODE) || h.flags == 0);
-            if (haveLongFlags)
-                attrBits += (long)xxx_flags_hi.getInt() << 32;
-            if (attrBits == 0)  continue;  // no attrs on this guy
-
-            int noa = 0;  // number of overflow attrs
-            long overflowBit = (attrBits & overflowMask);
-            assert(overflowBit >= 0);
-            attrBits -= overflowBit;
-            if (overflowBit != 0) {
-                noa = xxx_attr_count.getInt();
-            }
-
-            int nfa = 0;  // number of flag attrs
-            long bits = attrBits;
-            for (int ai = 0; bits != 0; ai++) {
-                if ((bits & (1L<<ai)) == 0)  continue;
-                bits -= (1L<<ai);
-                nfa += 1;
-            }
-            List<Attribute> ha = new ArrayList<>(nfa + noa);
-            h.attributes = ha;
-            bits = attrBits;  // iterate again
-            for (int ai = 0; bits != 0; ai++) {
-                if ((bits & (1L<<ai)) == 0)  continue;
-                bits -= (1L<<ai);
-                totalCounts[ai] += 1;
-                // This definition index is live in this holder.
-                if (defs[ai] == null)  badAttrIndex(ai, ctype);
-                Attribute canonical = defs[ai].canonicalInstance();
-                ha.add(canonical);
-                nfa -= 1;
-            }
-            assert(nfa == 0);
-            for (; noa > 0; noa--) {
-                int ai = xxx_attr_indexes.getInt();
-                totalCounts[ai] += 1;
-                // This definition index is live in this holder.
-                if (defs[ai] == null)  badAttrIndex(ai, ctype);
-                Attribute canonical = defs[ai].canonicalInstance();
-                ha.add(canonical);
-            }
-        }
-
-        xxx_flags_hi.doneDisbursing();
-        xxx_flags_lo.doneDisbursing();
-        xxx_attr_count.doneDisbursing();
-        xxx_attr_indexes.doneDisbursing();
-
-        // Now each holder has a list of canonical attribute instances.
-        // For layouts with no elements, we are done.  However, for
-        // layouts with bands, we must replace each canonical (empty)
-        // instance with a value-bearing one, initialized from the
-        // appropriate bands.
-
-        // Make a small pass to detect and read backward call counts.
-        int callCounts = 0;
-        for (boolean predef = true; ; predef = false) {
-            for (int ai = 0; ai < defs.length; ai++) {
-                Attribute.Layout def = defs[ai];
-                if (def == null)  continue;  // unused index
-                if (predef != isPredefinedAttr(ctype, ai))
-                    continue;  // wrong pass
-                int totalCount = totalCounts[ai];
-                if (totalCount == 0)
-                    continue;  // irrelevant
-                Attribute.Layout.Element[] cbles = def.getCallables();
-                for (int j = 0; j < cbles.length; j++) {
-                    assert(cbles[j].kind == Attribute.EK_CBLE);
-                    if (cbles[j].flagTest(Attribute.EF_BACK))
-                        callCounts += 1;
-                }
-            }
-            if (!predef)  break;
-        }
-        xxx_attr_calls.expectLength(callCounts);
-        xxx_attr_calls.readFrom(in);
-
-        // Finally, size all the attribute bands.
-        for (boolean predef = true; ; predef = false) {
-            for (int ai = 0; ai < defs.length; ai++) {
-                Attribute.Layout def = defs[ai];
-                if (def == null)  continue;  // unused index
-                if (predef != isPredefinedAttr(ctype, ai))
-                    continue;  // wrong pass
-                int totalCount = totalCounts[ai];
-                Band[] ab = attrBandTable.get(def);
-                if (def == attrInnerClassesEmpty) {
-                    // Special case.
-                    // Size the bands as if using the following layout:
-                    //    [RCH TI[ (0)[] ()[RCNH RUNH] ]].
-                    class_InnerClasses_N.expectLength(totalCount);
-                    class_InnerClasses_N.readFrom(in);
-                    int tupleCount = class_InnerClasses_N.getIntTotal();
-                    class_InnerClasses_RC.expectLength(tupleCount);
-                    class_InnerClasses_RC.readFrom(in);
-                    class_InnerClasses_F.expectLength(tupleCount);
-                    class_InnerClasses_F.readFrom(in);
-                    // Drop remaining columns wherever flags are zero:
-                    tupleCount -= class_InnerClasses_F.getIntCount(0);
-                    class_InnerClasses_outer_RCN.expectLength(tupleCount);
-                    class_InnerClasses_outer_RCN.readFrom(in);
-                    class_InnerClasses_name_RUN.expectLength(tupleCount);
-                    class_InnerClasses_name_RUN.readFrom(in);
-                } else if (!optDebugBands && totalCount == 0) {
-                    // Expect no elements at all.  Skip quickly. however if we
-                    // are debugging bands, read all bands regardless
-                    for (int j = 0; j < ab.length; j++) {
-                        ab[j].doneWithUnusedBand();
-                    }
-                } else {
-                    // Read these bands in sequence.
-                    boolean hasCallables = def.hasCallables();
-                    if (!hasCallables) {
-                        readAttrBands(def.elems, totalCount, new int[0], ab);
-                    } else {
-                        Attribute.Layout.Element[] cbles = def.getCallables();
-                        // At first, record initial calls.
-                        // Later, forward calls may also accumulate here:
-                        int[] forwardCounts = new int[cbles.length];
-                        forwardCounts[0] = totalCount;
-                        for (int j = 0; j < cbles.length; j++) {
-                            assert(cbles[j].kind == Attribute.EK_CBLE);
-                            int entryCount = forwardCounts[j];
-                            forwardCounts[j] = -1;  // No more, please!
-                            if (totalCount > 0 && cbles[j].flagTest(Attribute.EF_BACK))
-                                entryCount += xxx_attr_calls.getInt();
-                            readAttrBands(cbles[j].body, entryCount, forwardCounts, ab);
-                        }
-                    }
-                    // mark them read,  to satisfy asserts
-                    if (optDebugBands && totalCount == 0) {
-                        for (int j = 0; j < ab.length; j++) {
-                            ab[j].doneDisbursing();
-                        }
-                    }
-                }
-            }
-            if (!predef)  break;
-        }
-        xxx_attr_calls.doneDisbursing();
-    }
-
-    void badAttrIndex(int ai, int ctype) throws IOException {
-        throw new IOException("Unknown attribute index "+ai+" for "+
-                                   ATTR_CONTEXT_NAME[ctype]+" attribute");
-    }
-
-    void readAttrs(int ctype, Collection<? extends Attribute.Holder> holders)
-            throws IOException {
-        // Decode band values into attributes.
-        Set<Attribute.Layout> sawDefs = new HashSet<>();
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-        for (final Attribute.Holder h : holders) {
-            if (h.attributes == null)  continue;
-            for (ListIterator<Attribute> j = h.attributes.listIterator(); j.hasNext(); ) {
-                Attribute a = j.next();
-                Attribute.Layout def = a.layout();
-                if (def.bandCount == 0) {
-                    if (def == attrInnerClassesEmpty) {
-                        // Special logic to read this attr.
-                        readLocalInnerClasses((Class) h);
-                        continue;
-                    }
-                    // Canonical empty attr works fine (e.g., Synthetic).
-                    continue;
-                }
-                sawDefs.add(def);
-                boolean isCV = (ctype == ATTR_CONTEXT_FIELD && def == attrConstantValue);
-                if (isCV)  setConstantValueIndex((Class.Field)h);
-                if (verbose > 2)
-                    Utils.log.fine("read "+a+" in "+h);
-                final Band[] ab = attrBandTable.get(def);
-                // Read one attribute of type def from ab into a byte array.
-                buf.reset();
-                Object fixups = a.unparse(new Attribute.ValueStream() {
-                    public int getInt(int bandIndex) {
-                        return ((IntBand) ab[bandIndex]).getInt();
-                    }
-                    public Entry getRef(int bandIndex) {
-                        return ((CPRefBand) ab[bandIndex]).getRef();
-                    }
-                    public int decodeBCI(int bciCode) {
-                        Code code = (Code) h;
-                        return code.decodeBCI(bciCode);
-                    }
-                }, buf);
-                // Replace the canonical attr with the one just read.
-                j.set(a.addContent(buf.toByteArray(), fixups));
-                if (isCV)  setConstantValueIndex(null);  // clean up
-            }
-        }
-
-        // Mark the bands we just used as done disbursing.
-        for (Attribute.Layout def : sawDefs) {
-            if (def == null)  continue;  // unused index
-            Band[] ab = attrBandTable.get(def);
-            for (int j = 0; j < ab.length; j++) {
-                ab[j].doneDisbursing();
-            }
-        }
-
-        if (ctype == ATTR_CONTEXT_CLASS) {
-            class_InnerClasses_N.doneDisbursing();
-            class_InnerClasses_RC.doneDisbursing();
-            class_InnerClasses_F.doneDisbursing();
-            class_InnerClasses_outer_RCN.doneDisbursing();
-            class_InnerClasses_name_RUN.doneDisbursing();
-        }
-
-        MultiBand xxx_attr_bands = attrBands[ctype];
-        for (int i = 0; i < xxx_attr_bands.size(); i++) {
-            Band b = xxx_attr_bands.get(i);
-            if (b instanceof MultiBand)
-                b.doneDisbursing();
-        }
-        xxx_attr_bands.doneDisbursing();
-    }
-
-    private
-    void readAttrBands(Attribute.Layout.Element[] elems,
-                       int count, int[] forwardCounts,
-                       Band[] ab)
-            throws IOException {
-        for (int i = 0; i < elems.length; i++) {
-            Attribute.Layout.Element e = elems[i];
-            Band eBand = null;
-            if (e.hasBand()) {
-                eBand = ab[e.bandIndex];
-                eBand.expectLength(count);
-                eBand.readFrom(in);
-            }
-            switch (e.kind) {
-            case Attribute.EK_REPL:
-                // Recursive call.
-                int repCount = ((IntBand)eBand).getIntTotal();
-                // Note:  getIntTotal makes an extra pass over this band.
-                readAttrBands(e.body, repCount, forwardCounts, ab);
-                break;
-            case Attribute.EK_UN:
-                int remainingCount = count;
-                for (int j = 0; j < e.body.length; j++) {
-                    int caseCount;
-                    if (j == e.body.length-1) {
-                        caseCount = remainingCount;
-                    } else {
-                        caseCount = 0;
-                        for (int j0 = j;
-                             (j == j0)
-                             || (j < e.body.length
-                                 && e.body[j].flagTest(Attribute.EF_BACK));
-                             j++) {
-                            caseCount += ((IntBand)eBand).getIntCount(e.body[j].value);
-                        }
-                        --j;  // back up to last occurrence of this body
-                    }
-                    remainingCount -= caseCount;
-                    readAttrBands(e.body[j].body, caseCount, forwardCounts, ab);
-                }
-                assert(remainingCount == 0);
-                break;
-            case Attribute.EK_CALL:
-                assert(e.body.length == 1);
-                assert(e.body[0].kind == Attribute.EK_CBLE);
-                if (!e.flagTest(Attribute.EF_BACK)) {
-                    // Backward calls are pre-counted, but forwards are not.
-                    // Push the present count forward.
-                    assert(forwardCounts[e.value] >= 0);
-                    forwardCounts[e.value] += count;
-                }
-                break;
-            case Attribute.EK_CBLE:
-                assert(false);
-                break;
-            }
-        }
-    }
-
-    void readByteCodes() throws IOException {
-        //  bc_bands:
-        //        *bc_codes :BYTE1
-        //        *bc_case_count :UNSIGNED5
-        //        *bc_case_value :DELTA5
-        //        *bc_byte :BYTE1
-        //        *bc_short :DELTA5
-        //        *bc_local :UNSIGNED5
-        //        *bc_label :BRANCH5
-        //        *bc_intref :DELTA5  (cp_Int)
-        //        *bc_floatref :DELTA5  (cp_Float)
-        //        *bc_longref :DELTA5  (cp_Long)
-        //        *bc_doubleref :DELTA5  (cp_Double)
-        //        *bc_stringref :DELTA5  (cp_String)
-        //        *bc_classref :UNSIGNED5  (current class or cp_Class)
-        //        *bc_fieldref :DELTA5  (cp_Field)
-        //        *bc_methodref :UNSIGNED5  (cp_Method)
-        //        *bc_imethodref :DELTA5  (cp_Imethod)
-        //        *bc_thisfield :UNSIGNED5 (cp_Field, only for current class)
-        //        *bc_superfield :UNSIGNED5 (cp_Field, only for current super)
-        //        *bc_thismethod :UNSIGNED5 (cp_Method, only for current class)
-        //        *bc_supermethod :UNSIGNED5 (cp_Method, only for current super)
-        //        *bc_initref :UNSIGNED5 (cp_Field, only for most recent new)
-        //        *bc_escref :UNSIGNED5 (cp_All)
-        //        *bc_escrefsize :UNSIGNED5
-        //        *bc_escsize :UNSIGNED5
-        //        *bc_escbyte :BYTE1
-        bc_codes.elementCountForDebug = allCodes.length;
-        bc_codes.setInputStreamFrom(in);
-        readByteCodeOps();  // reads from bc_codes and bc_case_count
-        bc_codes.doneDisbursing();
-
-        // All the operand bands have now been sized.  Read them all in turn.
-        Band[] operand_bands = {
-            bc_case_value,
-            bc_byte, bc_short,
-            bc_local, bc_label,
-            bc_intref, bc_floatref,
-            bc_longref, bc_doubleref, bc_stringref,
-            bc_loadablevalueref,
-            bc_classref, bc_fieldref,
-            bc_methodref, bc_imethodref,
-            bc_indyref,
-            bc_thisfield, bc_superfield,
-            bc_thismethod, bc_supermethod,
-            bc_initref,
-            bc_escref, bc_escrefsize, bc_escsize
-        };
-        for (int i = 0; i < operand_bands.length; i++) {
-            operand_bands[i].readFrom(in);
-        }
-        bc_escbyte.expectLength(bc_escsize.getIntTotal());
-        bc_escbyte.readFrom(in);
-
-        expandByteCodeOps();
-
-        // Done fetching values from operand bands:
-        bc_case_count.doneDisbursing();
-        for (int i = 0; i < operand_bands.length; i++) {
-            operand_bands[i].doneDisbursing();
-        }
-        bc_escbyte.doneDisbursing();
-        bc_bands.doneDisbursing();
-
-        // We must delay the parsing of Code attributes until we
-        // have a complete model of bytecodes, for BCI encodings.
-        readAttrs(ATTR_CONTEXT_CODE, codesWithFlags);
-        // Ditto for exception handlers in codes.
-        fixupCodeHandlers();
-        // Now we can finish with class_bands; cf. readClasses().
-        code_bands.doneDisbursing();
-        class_bands.doneDisbursing();
-    }
-
-    private void readByteCodeOps() throws IOException {
-        // scratch buffer for collecting code::
-        byte[] buf = new byte[1<<12];
-        // record of all switch opcodes (these are variable-length)
-        List<Integer> allSwitchOps = new ArrayList<>();
-        for (int k = 0; k < allCodes.length; k++) {
-            Code c = allCodes[k];
-        scanOneMethod:
-            for (int i = 0; ; i++) {
-                int bc = bc_codes.getByte();
-                if (i + 10 > buf.length)  buf = realloc(buf);
-                buf[i] = (byte)bc;
-                boolean isWide = false;
-                if (bc == _wide) {
-                    bc = bc_codes.getByte();
-                    buf[++i] = (byte)bc;
-                    isWide = true;
-                }
-                assert(bc == (0xFF & bc));
-                // Adjust expectations of various band sizes.
-                switch (bc) {
-                case _tableswitch:
-                case _lookupswitch:
-                    bc_case_count.expectMoreLength(1);
-                    allSwitchOps.add(bc);
-                    break;
-                case _iinc:
-                    bc_local.expectMoreLength(1);
-                    if (isWide)
-                        bc_short.expectMoreLength(1);
-                    else
-                        bc_byte.expectMoreLength(1);
-                    break;
-                case _sipush:
-                    bc_short.expectMoreLength(1);
-                    break;
-                case _bipush:
-                    bc_byte.expectMoreLength(1);
-                    break;
-                case _newarray:
-                    bc_byte.expectMoreLength(1);
-                    break;
-                case _multianewarray:
-                    assert(getCPRefOpBand(bc) == bc_classref);
-                    bc_classref.expectMoreLength(1);
-                    bc_byte.expectMoreLength(1);
-                    break;
-                case _ref_escape:
-                    bc_escrefsize.expectMoreLength(1);
-                    bc_escref.expectMoreLength(1);
-                    break;
-                case _byte_escape:
-                    bc_escsize.expectMoreLength(1);
-                    // bc_escbyte will have to be counted too
-                    break;
-                default:
-                    if (Instruction.isInvokeInitOp(bc)) {
-                        bc_initref.expectMoreLength(1);
-                        break;
-                    }
-                    if (Instruction.isSelfLinkerOp(bc)) {
-                        CPRefBand bc_which = selfOpRefBand(bc);
-                        bc_which.expectMoreLength(1);
-                        break;
-                    }
-                    if (Instruction.isBranchOp(bc)) {
-                        bc_label.expectMoreLength(1);
-                        break;
-                    }
-                    if (Instruction.isCPRefOp(bc)) {
-                        CPRefBand bc_which = getCPRefOpBand(bc);
-                        bc_which.expectMoreLength(1);
-                        assert(bc != _multianewarray);  // handled elsewhere
-                        break;
-                    }
-                    if (Instruction.isLocalSlotOp(bc)) {
-                        bc_local.expectMoreLength(1);
-                        break;
-                    }
-                    break;
-                case _end_marker:
-                    {
-                        // Transfer from buf to a more permanent place:
-                        c.bytes = realloc(buf, i);
-                        break scanOneMethod;
-                    }
-                }
-            }
-        }
-
-        // To size instruction bands correctly, we need info on switches:
-        bc_case_count.readFrom(in);
-        for (Integer i : allSwitchOps) {
-            int bc = i.intValue();
-            int caseCount = bc_case_count.getInt();
-            bc_label.expectMoreLength(1+caseCount); // default label + cases
-            bc_case_value.expectMoreLength(bc == _tableswitch ? 1 : caseCount);
-        }
-        bc_case_count.resetForSecondPass();
-    }
-
-    private void expandByteCodeOps() throws IOException {
-        // scratch buffer for collecting code:
-        byte[] buf = new byte[1<<12];
-        // scratch buffer for collecting instruction boundaries:
-        int[] insnMap = new int[1<<12];
-        // list of label carriers, for label decoding post-pass:
-        int[] labels = new int[1<<10];
-        // scratch buffer for registering CP refs:
-        Fixups fixupBuf = new Fixups();
-
-        for (int k = 0; k < allCodes.length; k++) {
-            Code code = allCodes[k];
-            byte[] codeOps = code.bytes;
-            code.bytes = null;  // just for now, while we accumulate bits
-
-            Class curClass = code.thisClass();
-
-            Set<Entry> ldcRefSet = ldcRefMap.get(curClass);
-            if (ldcRefSet == null)
-                ldcRefMap.put(curClass, ldcRefSet = new HashSet<>());
-
-            ClassEntry thisClass  = curClass.thisClass;
-            ClassEntry superClass = curClass.superClass;
-            ClassEntry newClass   = null;  // class of last _new opcode
-
-            int pc = 0;  // fill pointer in buf; actual bytecode PC
-            int numInsns = 0;
-            int numLabels = 0;
-            boolean hasEscs = false;
-            fixupBuf.clear();
-            for (int i = 0; i < codeOps.length; i++) {
-                int bc = Instruction.getByte(codeOps, i);
-                int curPC = pc;
-                insnMap[numInsns++] = curPC;
-                if (pc + 10 > buf.length)  buf = realloc(buf);
-                if (numInsns+10 > insnMap.length)  insnMap = realloc(insnMap);
-                if (numLabels+10 > labels.length)  labels = realloc(labels);
-                boolean isWide = false;
-                if (bc == _wide) {
-                    buf[pc++] = (byte) bc;
-                    bc = Instruction.getByte(codeOps, ++i);
-                    isWide = true;
-                }
-                switch (bc) {
-                case _tableswitch: // apc:  (df, lo, hi, (hi-lo+1)*(label))
-                case _lookupswitch: // apc:  (df, nc, nc*(case, label))
-                    {
-                        int caseCount = bc_case_count.getInt();
-                        while ((pc + 30 + caseCount*8) > buf.length)
-                            buf = realloc(buf);
-                        buf[pc++] = (byte) bc;
-                        //initialize apc, df, lo, hi bytes to reasonable bits:
-                        Arrays.fill(buf, pc, pc+30, (byte)0);
-                        Instruction.Switch isw = (Instruction.Switch)
-                            Instruction.at(buf, curPC);
-                        //isw.setDefaultLabel(getLabel(bc_label, code, curPC));
-                        isw.setCaseCount(caseCount);
-                        if (bc == _tableswitch) {
-                            isw.setCaseValue(0, bc_case_value.getInt());
-                        } else {
-                            for (int j = 0; j < caseCount; j++) {
-                                isw.setCaseValue(j, bc_case_value.getInt());
-                            }
-                        }
-                        // Make our getLabel calls later.
-                        labels[numLabels++] = curPC;
-                        pc = isw.getNextPC();
-                        continue;
-                    }
-                case _iinc:
-                    {
-                        buf[pc++] = (byte) bc;
-                        int local = bc_local.getInt();
-                        int delta;
-                        if (isWide) {
-                            delta = bc_short.getInt();
-                            Instruction.setShort(buf, pc, local); pc += 2;
-                            Instruction.setShort(buf, pc, delta); pc += 2;
-                        } else {
-                            delta = (byte) bc_byte.getByte();
-                            buf[pc++] = (byte)local;
-                            buf[pc++] = (byte)delta;
-                        }
-                        continue;
-                    }
-                case _sipush:
-                    {
-                        int val = bc_short.getInt();
-                        buf[pc++] = (byte) bc;
-                        Instruction.setShort(buf, pc, val); pc += 2;
-                        continue;
-                    }
-                case _bipush:
-                case _newarray:
-                    {
-                        int val = bc_byte.getByte();
-                        buf[pc++] = (byte) bc;
-                        buf[pc++] = (byte) val;
-                        continue;
-                    }
-                case _ref_escape:
-                    {
-                        // Note that insnMap has one entry for this.
-                        hasEscs = true;
-                        int size = bc_escrefsize.getInt();
-                        Entry ref = bc_escref.getRef();
-                        if (size == 1)  ldcRefSet.add(ref);
-                        int fmt;
-                        switch (size) {
-                        case 1: fixupBuf.addU1(pc, ref); break;
-                        case 2: fixupBuf.addU2(pc, ref); break;
-                        default: assert(false); fmt = 0;
-                        }
-                        buf[pc+0] = buf[pc+1] = 0;
-                        pc += size;
-                    }
-                    continue;
-                case _byte_escape:
-                    {
-                        // Note that insnMap has one entry for all these bytes.
-                        hasEscs = true;
-                        int size = bc_escsize.getInt();
-                        while ((pc + size) > buf.length)
-                            buf = realloc(buf);
-                        while (size-- > 0) {
-                            buf[pc++] = (byte) bc_escbyte.getByte();
-                        }
-                    }
-                    continue;
-                default:
-                    if (Instruction.isInvokeInitOp(bc)) {
-                        int idx = (bc - _invokeinit_op);
-                        int origBC = _invokespecial;
-                        ClassEntry classRef;
-                        switch (idx) {
-                        case _invokeinit_self_option:
-                            classRef = thisClass; break;
-                        case _invokeinit_super_option:
-                            classRef = superClass; break;
-                        default:
-                            assert(idx == _invokeinit_new_option);
-                            classRef = newClass; break;
-                        }
-                        buf[pc++] = (byte) origBC;
-                        int coding = bc_initref.getInt();
-                        // Find the nth overloading of <init> in classRef.
-                        MemberEntry ref = pkg.cp.getOverloadingForIndex(CONSTANT_Methodref, classRef, "<init>", coding);
-                        fixupBuf.addU2(pc, ref);
-                        buf[pc+0] = buf[pc+1] = 0;
-                        pc += 2;
-                        assert(Instruction.opLength(origBC) == (pc - curPC));
-                        continue;
-                    }
-                    if (Instruction.isSelfLinkerOp(bc)) {
-                        int idx = (bc - _self_linker_op);
-                        boolean isSuper = (idx >= _self_linker_super_flag);
-                        if (isSuper)  idx -= _self_linker_super_flag;
-                        boolean isAload = (idx >= _self_linker_aload_flag);
-                        if (isAload)  idx -= _self_linker_aload_flag;
-                        int origBC = _first_linker_op + idx;
-                        boolean isField = Instruction.isFieldOp(origBC);
-                        CPRefBand bc_which;
-                        ClassEntry which_cls  = isSuper ? superClass : thisClass;
-                        Index which_ix;
-                        if (isField) {
-                            bc_which = isSuper ? bc_superfield  : bc_thisfield;
-                            which_ix = pkg.cp.getMemberIndex(CONSTANT_Fieldref, which_cls);
-                        } else {
-                            bc_which = isSuper ? bc_supermethod : bc_thismethod;
-                            which_ix = pkg.cp.getMemberIndex(CONSTANT_Methodref, which_cls);
-                        }
-                        assert(bc_which == selfOpRefBand(bc));
-                        MemberEntry ref = (MemberEntry) bc_which.getRef(which_ix);
-                        if (isAload) {
-                            buf[pc++] = (byte) _aload_0;
-                            curPC = pc;
-                            // Note: insnMap keeps the _aload_0 separate.
-                            insnMap[numInsns++] = curPC;
-                        }
-                        buf[pc++] = (byte) origBC;
-                        fixupBuf.addU2(pc, ref);
-                        buf[pc+0] = buf[pc+1] = 0;
-                        pc += 2;
-                        assert(Instruction.opLength(origBC) == (pc - curPC));
-                        continue;
-                    }
-                    if (Instruction.isBranchOp(bc)) {
-                        buf[pc++] = (byte) bc;
-                        assert(!isWide);  // no wide prefix for branches
-                        int nextPC = curPC + Instruction.opLength(bc);
-                        // Make our getLabel calls later.
-                        labels[numLabels++] = curPC;
-                        //Instruction.at(buf, curPC).setBranchLabel(getLabel(bc_label, code, curPC));
-                        while (pc < nextPC)  buf[pc++] = 0;
-                        continue;
-                    }
-                    if (Instruction.isCPRefOp(bc)) {
-                        CPRefBand bc_which = getCPRefOpBand(bc);
-                        Entry ref = bc_which.getRef();
-                        if (ref == null) {
-                            if (bc_which == bc_classref) {
-                                // Shorthand for class self-references.
-                                ref = thisClass;
-                            } else {
-                                assert(false);
-                            }
-                        }
-                        int origBC = bc;
-                        int size = 2;
-                        switch (bc) {
-                        case _invokestatic_int:
-                            origBC = _invokestatic;
-                            break;
-                        case _invokespecial_int:
-                            origBC = _invokespecial;
-                            break;
-                        case _ildc:
-                        case _cldc:
-                        case _fldc:
-                        case _sldc:
-                        case _qldc:
-                            origBC = _ldc;
-                            size = 1;
-                            ldcRefSet.add(ref);
-                            break;
-                        case _ildc_w:
-                        case _cldc_w:
-                        case _fldc_w:
-                        case _sldc_w:
-                        case _qldc_w:
-                            origBC = _ldc_w;
-                            break;
-                        case _lldc2_w:
-                        case _dldc2_w:
-                            origBC = _ldc2_w;
-                            break;
-                        case _new:
-                            newClass = (ClassEntry) ref;
-                            break;
-                        }
-                        buf[pc++] = (byte) origBC;
-                        int fmt;
-                        switch (size) {
-                        case 1: fixupBuf.addU1(pc, ref); break;
-                        case 2: fixupBuf.addU2(pc, ref); break;
-                        default: assert(false); fmt = 0;
-                        }
-                        buf[pc+0] = buf[pc+1] = 0;
-                        pc += size;
-                        if (origBC == _multianewarray) {
-                            // Copy the trailing byte also.
-                            int val = bc_byte.getByte();
-                            buf[pc++] = (byte) val;
-                        } else if (origBC == _invokeinterface) {
-                            int argSize = ((MemberEntry)ref).descRef.typeRef.computeSize(true);
-                            buf[pc++] = (byte)( 1 + argSize );
-                            buf[pc++] = 0;
-                        } else if (origBC == _invokedynamic) {
-                            buf[pc++] = 0;
-                            buf[pc++] = 0;
-                        }
-                        assert(Instruction.opLength(origBC) == (pc - curPC));
-                        continue;
-                    }
-                    if (Instruction.isLocalSlotOp(bc)) {
-                        buf[pc++] = (byte) bc;
-                        int local = bc_local.getInt();
-                        if (isWide) {
-                            Instruction.setShort(buf, pc, local);
-                            pc += 2;
-                            if (bc == _iinc) {
-                                int iVal = bc_short.getInt();
-                                Instruction.setShort(buf, pc, iVal);
-                                pc += 2;
-                            }
-                        } else {
-                            Instruction.setByte(buf, pc, local);
-                            pc += 1;
-                            if (bc == _iinc) {
-                                int iVal = bc_byte.getByte();
-                                Instruction.setByte(buf, pc, iVal);
-                                pc += 1;
-                            }
-                        }
-                        assert(Instruction.opLength(bc) == (pc - curPC));
-                        continue;
-                    }
-                    // Random bytecode.  Just copy it.
-                    if (bc >= _bytecode_limit)
-                        Utils.log.warning("unrecognized bytescode "+bc
-                                            +" "+Instruction.byteName(bc));
-                    assert(bc < _bytecode_limit);
-                    buf[pc++] = (byte) bc;
-                    assert(Instruction.opLength(bc) == (pc - curPC));
-                    continue;
-                }
-            }
-            // now make a permanent copy of the bytecodes
-            code.setBytes(realloc(buf, pc));
-            code.setInstructionMap(insnMap, numInsns);
-            // fix up labels, now that code has its insnMap
-            Instruction ibr = null;  // temporary branch instruction
-            for (int i = 0; i < numLabels; i++) {
-                int curPC = labels[i];
-                // (Note:  Passing ibr in allows reuse, a speed hack.)
-                ibr = Instruction.at(code.bytes, curPC, ibr);
-                if (ibr instanceof Instruction.Switch) {
-                    Instruction.Switch isw = (Instruction.Switch) ibr;
-                    isw.setDefaultLabel(getLabel(bc_label, code, curPC));
-                    int caseCount = isw.getCaseCount();
-                    for (int j = 0; j < caseCount; j++) {
-                        isw.setCaseLabel(j, getLabel(bc_label, code, curPC));
-                    }
-                } else {
-                    ibr.setBranchLabel(getLabel(bc_label, code, curPC));
-                }
-            }
-            if (fixupBuf.size() > 0) {
-                if (verbose > 2)
-                    Utils.log.fine("Fixups in code: "+fixupBuf);
-                code.addFixups(fixupBuf);
-            }
-        }
-    }
-}
diff --git a/openjdk/com/sun/management/OperatingSystem.java b/openjdk/com/sun/management/OperatingSystem.java
deleted file mode 100644
index 8dcfe32d..00000000
--- a/openjdk/com/sun/management/OperatingSystem.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
-  Copyright (C) 2010 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-
-package com.sun.management;
-
-import ikvm.internal.NotYetImplementedError;
-import cli.System.Activator;
-import cli.System.Diagnostics.Process;
-import cli.System.Reflection.Assembly;
-import cli.System.Reflection.PropertyInfo;
-import cli.System.Runtime.InteropServices.DllImportAttribute;
-import cli.System.Runtime.InteropServices.LayoutKind;
-import cli.System.Runtime.InteropServices.StructLayoutAttribute;
-import cli.System.Security.SecuritySafeCriticalAttribute;
-import cli.System.Type;
-import sun.management.OperatingSystemImpl;
-import sun.management.VMManagement;
-
-class OperatingSystem extends OperatingSystemImpl implements OperatingSystemMXBean
-{
-    OperatingSystem(VMManagement vmm)
-    {
-        super(vmm);
-    }
-
-    public long getProcessCpuTime()
-    {
-        return Process.GetCurrentProcess().get_TotalProcessorTime().get_Ticks() * 100;
-    }
-
-    public long getCommittedVirtualMemorySize()
-    {
-        return Process.GetCurrentProcess().get_PagedMemorySize64();
-    }
-
-    public long getTotalPhysicalMemorySize()
-    {
-        long value = get("TotalPhysicalMemory");
-        if (value != -1)
-        {
-            return value;
-        }
-        return GetMemoryStatusEx().ullTotalPhys;
-    }
-
-    public long getFreePhysicalMemorySize()
-    {
-        long value = get("AvailablePhysicalMemory");
-        if (value != -1)
-        {
-            return value;
-        }
-        return GetMemoryStatusEx().ullAvailPhys;
-    }
-    
-    public long getTotalSwapSpaceSize()
-    {
-        return GetMemoryStatusEx().ullTotalPageFile;
-    }
-
-    public long getFreeSwapSpaceSize()
-    {
-        return GetMemoryStatusEx().ullAvailPageFile;
-    }
-    
-    public /*native*/ double getSystemCpuLoad()
-    {
-    	throw new NotYetImplementedError(); //TODO JDK7
-    }
-    
-    public /*native*/ double getProcessCpuLoad()
-    {
-    	throw new NotYetImplementedError(); //TODO JDK7
-    }
-
-    private static long get(String propertyName)
-    {
-        Assembly asm = Assembly.LoadWithPartialName("Microsoft.VisualBasic");
-        if (asm != null)
-        {
-            Type type = asm.GetType("Microsoft.VisualBasic.Devices.ComputerInfo");
-            if (type != null)
-            {
-                PropertyInfo property = type.GetProperty(propertyName);
-                if (property != null)
-                {
-                    Object obj = Activator.CreateInstance(type);
-                    try
-                    {
-                        if (false) throw new cli.System.NotImplementedException();
-                        return ikvm.lang.CIL.unbox_ulong((cli.System.UInt64)property.GetValue(obj, null));
-                    }
-                    catch (cli.System.NotImplementedException _)
-                    {
-                        // Mono doesn't implement this property
-                    }
-                }
-            }
-        }
-        return -1;
-    }
-    
-    @SecuritySafeCriticalAttribute.Annotation
-    private static MEMORYSTATUSEX GetMemoryStatusEx()
-    {
-        if (ikvm.internal.Util.WINDOWS)
-        {
-            MEMORYSTATUSEX mem = new MEMORYSTATUSEX();
-            if (GlobalMemoryStatusEx(mem))
-            {
-                return mem;
-            }
-        }
-        throw new InternalError("Unsupported Platform");
-    }
-
-    @DllImportAttribute.Annotation("kernel32")    
-    private static native boolean GlobalMemoryStatusEx(MEMORYSTATUSEX lpBuffer);
-}
-
-@StructLayoutAttribute.Annotation(LayoutKind.__Enum.Sequential)
-final class MEMORYSTATUSEX extends cli.System.Object
-{
-    int dwLength = 64;
-    int dwMemoryLoad;
-    long ullTotalPhys;
-    long ullAvailPhys;
-    long ullTotalPageFile;
-    long ullAvailPageFile;
-    long ullTotalVirtual;
-    long ullAvailVirtual;
-    long ullAvailExtendedVirtual;
-}
diff --git a/openjdk/dependencies.txt b/openjdk/dependencies.txt
deleted file mode 100644
index 68cc0d68..00000000
--- a/openjdk/dependencies.txt
+++ /dev/null
@@ -1,148 +0,0 @@
-# This file declares the dependencies of the OpenJDK assemblies.
-# It exists to prevent accidentally introducing new dependencies.
-#
-# Note that mscorlib, System, IKVM.Runtime and IKVM.OpenJDK.Core are not very interesting,
-# so these dependencies are ignored by the dependency checker.
-
-IKVM.OpenJDK.Core
-->System.Core
-->IKVM.OpenJDK.Util
-->IKVM.OpenJDK.Security
-->IKVM.OpenJDK.Text
-->IKVM.OpenJDK.XML.API
-
-IKVM.OpenJDK.Corba
-->IKVM.OpenJDK.Misc
-->IKVM.OpenJDK.Util
-->IKVM.OpenJDK.SwingAWT
-->IKVM.OpenJDK.Text
-->IKVM.OpenJDK.Naming
-->IKVM.OpenJDK.Remoting
-
-IKVM.OpenJDK.XML.API
-
-IKVM.OpenJDK.XML.XPath
-->IKVM.OpenJDK.XML.API
-->IKVM.OpenJDK.XML.Parse
-->IKVM.OpenJDK.Text
-
-IKVM.OpenJDK.XML.Parse
-->IKVM.OpenJDK.XML.API
-->IKVM.OpenJDK.Text
-->IKVM.OpenJDK.Beans
-
-IKVM.OpenJDK.XML.Transform
-->IKVM.OpenJDK.Util
-->IKVM.OpenJDK.XML.Parse
-->IKVM.OpenJDK.XML.API
-->IKVM.OpenJDK.Text
-->IKVM.OpenJDK.XML.XPath
-
-IKVM.OpenJDK.XML.Bind
-->IKVM.OpenJDK.XML.API
-->IKVM.OpenJDK.Util
-->IKVM.OpenJDK.Text
-->IKVM.OpenJDK.SwingAWT
-->IKVM.OpenJDK.Beans
-->IKVM.OpenJDK.Media
-->IKVM.OpenJDK.XML.Parse
-
-IKVM.OpenJDK.XML.WebServices
-->IKVM.OpenJDK.XML.API
-->IKVM.OpenJDK.Text
-->IKVM.OpenJDK.Util
-->IKVM.OpenJDK.Misc
-->IKVM.OpenJDK.SwingAWT
-->IKVM.OpenJDK.XML.Parse
-->IKVM.OpenJDK.XML.Bind
-->IKVM.OpenJDK.Security
-->IKVM.OpenJDK.Remoting
-->IKVM.OpenJDK.Beans
-->IKVM.OpenJDK.Media
-->IKVM.OpenJDK.Management
-
-IKVM.OpenJDK.XML.Crypto
-->IKVM.OpenJDK.Util
-->IKVM.OpenJDK.XML.API
-->IKVM.OpenJDK.Security
-->IKVM.OpenJDK.Text
-->IKVM.OpenJDK.XML.Parse
-->IKVM.OpenJDK.XML.XPath
-
-IKVM.OpenJDK.SwingAWT
-->System.Drawing
-->IKVM.AWT.WinForms
-->IKVM.OpenJDK.Util
-->IKVM.OpenJDK.Text
-->IKVM.OpenJDK.XML.API
-->IKVM.OpenJDK.Charsets
-->IKVM.OpenJDK.Beans
-->IKVM.OpenJDK.Media
-->IKVM.OpenJDK.Remoting
-
-IKVM.OpenJDK.Charsets
-
-IKVM.OpenJDK.Util
-->IKVM.OpenJDK.Security
-->IKVM.OpenJDK.Text
-->IKVM.OpenJDK.XML.API
-
-IKVM.OpenJDK.Text
-->IKVM.OpenJDK.Util
-->IKVM.OpenJDK.SwingAWT
-
-IKVM.OpenJDK.Security
-->IKVM.OpenJDK.Text
-->IKVM.OpenJDK.SwingAWT
-->IKVM.OpenJDK.Util
-->IKVM.OpenJDK.Naming
-
-IKVM.OpenJDK.Management
-->IKVM.OpenJDK.Security
-->IKVM.OpenJDK.Corba
-->IKVM.OpenJDK.Util
-->IKVM.OpenJDK.Naming
-->IKVM.OpenJDK.Remoting
-->IKVM.OpenJDK.Beans
-->IKVM.OpenJDK.Text
-
-IKVM.OpenJDK.Misc
-->System.Drawing
-->IKVM.OpenJDK.SwingAWT
-->IKVM.OpenJDK.XML.API
-->IKVM.OpenJDK.Util
-->IKVM.OpenJDK.Corba
-->IKVM.OpenJDK.Text
-->IKVM.OpenJDK.Security
-->IKVM.OpenJDK.Naming
-->IKVM.OpenJDK.Remoting
-
-IKVM.OpenJDK.Jdbc
-->System.Data
-->IKVM.OpenJDK.Text
-->IKVM.OpenJDK.Misc
-->IKVM.OpenJDK.XML.API
-->IKVM.OpenJDK.Util
-->IKVM.OpenJDK.Naming
-
-IKVM.OpenJDK.Naming
-->IKVM.OpenJDK.Security
-->IKVM.OpenJDK.SwingAWT
-
-IKVM.OpenJDK.Remoting
-->IKVM.OpenJDK.Naming
-->IKVM.OpenJDK.Security
-->IKVM.OpenJDK.Text
-->IKVM.OpenJDK.Util
-
-IKVM.OpenJDK.Beans
-->IKVM.OpenJDK.SwingAWT
-->IKVM.OpenJDK.XML.API
-->IKVM.OpenJDK.Util
-
-IKVM.OpenJDK.Media
-->System.Drawing
-->IKVM.OpenJDK.SwingAWT
-->IKVM.OpenJDK.XML.API
-->IKVM.OpenJDK.Util
-->IKVM.OpenJDK.Text
diff --git a/openjdk/exclude.lst b/openjdk/exclude.lst
deleted file mode 100644
index e88cb6b1..00000000
--- a/openjdk/exclude.lst
+++ /dev/null
@@ -1,5 +0,0 @@
-^java\.lang\.AutoCloseable$
-^java\.lang\.Comparable$
-^java\.lang\.Object$
-^java\.lang\.String$
-^java\.lang\.Throwable$
diff --git a/openjdk/gnu/java/awt/Buffers.java b/openjdk/gnu/java/awt/Buffers.java
deleted file mode 100644
index 2015634b..00000000
--- a/openjdk/gnu/java/awt/Buffers.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/* Buffers.java --
-   Copyright (C) 2000, 2002, 2004  Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-
-package gnu.java.awt;
-
-import java.awt.image.DataBuffer;
-import java.awt.image.DataBufferByte;
-import java.awt.image.DataBufferDouble;
-import java.awt.image.DataBufferFloat;
-import java.awt.image.DataBufferInt;
-import java.awt.image.DataBufferShort;
-import java.awt.image.DataBufferUShort;
-
-/** 
- * Utility class for creating and accessing data buffers of arbitrary
- * data types.
- */
-public final class Buffers
-{
-  /**
-   * Create a data buffer of a particular type.
-   *
-   * @param dataType the desired data type of the buffer.
-   * @param data an array containing data, or null
-   * @param size the size of the data buffer bank
-   */
-  public static DataBuffer createBuffer(int dataType, Object data,
-					int size)
-  {
-    if (data == null) return createBuffer(dataType, size, 1);
-
-    return createBufferFromData(dataType, data, size);
-  }
-
-
-  /**
-   * Create a data buffer of a particular type.
-   *
-   * @param dataType the desired data type of the buffer.
-   * @param size the size of the data buffer bank
-   */
-  public static DataBuffer createBuffer(int dataType, int size) {
-    return createBuffer(dataType, size, 1);
-  }
-
-  /**
-   * Create a data buffer of a particular type.
-   *
-   * @param dataType the desired data type of the buffer.
-   * @param size the size of the data buffer bank
-   * @param numBanks the number of banks the buffer should have
-   */
-  public static DataBuffer createBuffer(int dataType, int size, int numBanks)
-  {
-    switch (dataType)
-      {
-      case DataBuffer.TYPE_BYTE:
-	return new DataBufferByte(size, numBanks);
-      case DataBuffer.TYPE_SHORT:
-	return new DataBufferShort(size, numBanks);
-      case DataBuffer.TYPE_USHORT:
-	return new DataBufferUShort(size, numBanks);
-      case DataBuffer.TYPE_INT:
-	return new DataBufferInt(size, numBanks);
-      case DataBuffer.TYPE_FLOAT:
-	return new DataBufferFloat(size, numBanks);
-      case DataBuffer.TYPE_DOUBLE:
-	return new DataBufferDouble(size, numBanks);
-      default:
-	throw new UnsupportedOperationException();
-      }
-  }
-  
-  /**
-   * Create a data buffer of a particular type.
-   *
-   * @param dataType the desired data type of the buffer
-   * @param data an array containing the data
-   * @param size the size of the data buffer bank
-   */
-  public static DataBuffer createBufferFromData(int dataType, Object data,
-						int size)
-  {
-    switch (dataType)
-      {
-      case DataBuffer.TYPE_BYTE:
-	return new DataBufferByte((byte[]) data, size);
-      case DataBuffer.TYPE_SHORT:
-	return new DataBufferShort((short[]) data, size);
-      case DataBuffer.TYPE_USHORT:
-	return new DataBufferUShort((short[]) data, size);
-      case DataBuffer.TYPE_INT:
-	return new DataBufferInt((int[]) data, size);
-      case DataBuffer.TYPE_FLOAT:
-	return new DataBufferFloat((float[]) data, size);
-      case DataBuffer.TYPE_DOUBLE:
-	return new DataBufferDouble((double[]) data, size);
-      default:
-	throw new UnsupportedOperationException();
-      }
-  }
-
-  /** 
-   * Return the data array of a data buffer, regardless of the data
-   * type.
-   *
-   * @return an array of primitive values. The actual array type
-   * depends on the data type of the buffer.
-   */
-  public static Object getData(DataBuffer buffer)
-  {
-    return getData(buffer, 0, null, 0, buffer.getSize());
-  }
-
-    
-  /**
-   * Copy data from array contained in data buffer, much like
-   * System.arraycopy. Create a suitable destination array if the
-   * given destination array is null.
-   */
-  public static Object getData(DataBuffer src, int srcOffset,
-			       Object dest,  int dstOffset,
-			       int length)
-  {
-    Object from;
-    switch(src.getDataType())
-      {
-      case DataBuffer.TYPE_BYTE:
-	if (dest == null) dest = new byte[length+dstOffset];
-	for(int i = 0; i < length; i++)
-	  ((byte[])dest)[i + dstOffset] = (byte)src.getElem(i + srcOffset);
-	break;
-
-      case DataBuffer.TYPE_DOUBLE:
-	if (dest == null) dest = new double[length+dstOffset];
-	for(int i = 0; i < length; i++)
-	  ((double[])dest)[i + dstOffset] = src.getElemDouble(i + srcOffset);
-	break;
-
-      case DataBuffer.TYPE_FLOAT:
-	if (dest == null) dest = new float[length+dstOffset];
-	for(int i = 0; i < length; i++)
-	  ((float[])dest)[i + dstOffset] = src.getElemFloat(i + srcOffset);
-	break;
-
-      case DataBuffer.TYPE_INT:
-	if (dest == null) dest = new int[length+dstOffset];
-	for(int i = 0; i < length; i++)
-	  ((int[])dest)[i + dstOffset] = src.getElem(i + srcOffset);
-	break;
-
-      case DataBuffer.TYPE_SHORT:
-      case DataBuffer.TYPE_USHORT:
-	if (dest == null) dest = new short[length+dstOffset];
-	for(int i = 0; i < length; i++)
-	  ((short[])dest)[i + dstOffset] = (short)src.getElem(i + srcOffset);
-	break;
-
-      case DataBuffer.TYPE_UNDEFINED:
-	throw new ClassCastException("Unknown data buffer type");
-      }
-    return dest;
-  }
-  
-  /**
-   * @param bits the width of a data element measured in bits
-   *
-   * @return the smallest data type that can store data elements of
-   * the given number of bits, without any truncation.
-   */
-  public static int smallestAppropriateTransferType(int bits)
-  {
-    if (bits <= 8)
-      {
-	return DataBuffer.TYPE_BYTE;
-      }
-    else if (bits <= 16)
-      {
-	return DataBuffer.TYPE_USHORT;
-      } 
-    else if (bits <= 32)
-      {
-	return DataBuffer.TYPE_INT;
-      }
-    else
-      {
-	return DataBuffer.TYPE_UNDEFINED;
-      }
-  }
-}
diff --git a/openjdk/gnu/java/awt/color/CieXyzConverter.java b/openjdk/gnu/java/awt/color/CieXyzConverter.java
deleted file mode 100644
index e1b548e9..00000000
--- a/openjdk/gnu/java/awt/color/CieXyzConverter.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* CieXyzConverter.java -- CieXyz conversion class
-   Copyright (C) 2004 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package gnu.java.awt.color;
-
-
-/**
- * CieXyzConverter - converts to/from a D50-relative CIE XYZ color space.
- *
- * The sRGB<->CIE XYZ conversions in SrgbConverter are used.
- *
- * @author Sven de Marothy
- */
-public class CieXyzConverter implements ColorSpaceConverter
-{
-  public float[] toCIEXYZ(float[] in)
-  {
-    float[] out = new float[3];
-    System.arraycopy(in, 0, out, 0, 3);
-    return out;
-  }
-
-  public float[] fromCIEXYZ(float[] in)
-  {
-    float[] out = new float[3];
-    System.arraycopy(in, 0, out, 0, 3);
-    return out;
-  }
-
-  public float[] toRGB(float[] in)
-  {
-    return SrgbConverter.XYZtoRGB(in);
-  }
-
-  public float[] fromRGB(float[] in)
-  {
-    return SrgbConverter.RGBtoXYZ(in);
-  }
-}
diff --git a/openjdk/gnu/java/awt/color/ClutProfileConverter.java b/openjdk/gnu/java/awt/color/ClutProfileConverter.java
deleted file mode 100644
index 5229ce80..00000000
--- a/openjdk/gnu/java/awt/color/ClutProfileConverter.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/* ClutProfileConverter.java -- Conversion routines for CLUT-Based profiles
-   Copyright (C) 2004 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package gnu.java.awt.color;
-
-import java.awt.color.ICC_Profile;
-
-
-/**
- * ClutProfileConverter - conversions through a CLUT-based profile
- *
- * @author Sven de Marothy
- */
-public class ClutProfileConverter implements ColorSpaceConverter
-{
-  private ColorLookUpTable toPCS;
-  private ColorLookUpTable fromPCS;
-  private int nChannels;
-
-  public ClutProfileConverter(ICC_Profile profile)
-  {
-    nChannels = profile.getNumComponents();
-
-    // Sun does not specifiy which rendering intent should be used,
-    // neither does the ICC v2 spec really.
-    // Try intent 0
-    try
-      {
-        toPCS = new ColorLookUpTable(profile, ICC_Profile.icSigAToB0Tag);
-      }
-    catch (Exception e)
-      {
-        toPCS = null;
-      }
-
-    try
-      {
-        fromPCS = new ColorLookUpTable(profile, ICC_Profile.icSigBToA0Tag);
-      }
-    catch (Exception e)
-      {
-        fromPCS = null;
-      }
-
-    if (toPCS != null || fromPCS != null)
-      return;
-
-    // If no intent 0 clut is available, look for a intent 1 clut.
-    try
-      {
-        toPCS = new ColorLookUpTable(profile, ICC_Profile.icSigAToB1Tag);
-      }
-    catch (Exception e)
-      {
-        toPCS = null;
-      }
-
-    try
-      {
-        fromPCS = new ColorLookUpTable(profile, ICC_Profile.icSigBToA1Tag);
-      }
-    catch (Exception e)
-      {
-        fromPCS = null;
-      }
-
-    if (toPCS != null || fromPCS != null)
-      return;
-
-    // Last shot.. intent 2 CLUT.
-    try
-      {
-        toPCS = new ColorLookUpTable(profile, ICC_Profile.icSigAToB2Tag);
-      }
-    catch (Exception e)
-      {
-        toPCS = null;
-      }
-
-    try
-      {
-        fromPCS = new ColorLookUpTable(profile, ICC_Profile.icSigBToA2Tag);
-      }
-    catch (Exception e)
-      {
-        fromPCS = null;
-      }
-
-    if (toPCS == null && fromPCS == null)
-      throw new IllegalArgumentException("No CLUTs in profile!");
-  }
-
-  public float[] toCIEXYZ(float[] in)
-  {
-    if (toPCS != null)
-      return toPCS.lookup(in);
-    else
-      return new float[3];
-  }
-
-  public float[] toRGB(float[] in)
-  {
-    return SrgbConverter.XYZtoRGB(toCIEXYZ(in));
-  }
-
-  public float[] fromCIEXYZ(float[] in)
-  {
-    if (fromPCS != null)
-      return fromPCS.lookup(in);
-    else
-      return new float[nChannels];
-  }
-
-  public float[] fromRGB(float[] in)
-  {
-    return fromCIEXYZ(SrgbConverter.RGBtoXYZ(in));
-  }
-}
diff --git a/openjdk/gnu/java/awt/color/ColorLookUpTable.java b/openjdk/gnu/java/awt/color/ColorLookUpTable.java
deleted file mode 100644
index 581320c3..00000000
--- a/openjdk/gnu/java/awt/color/ColorLookUpTable.java
+++ /dev/null
@@ -1,429 +0,0 @@
-/* ColorLookUpTable.java -- ICC v2 CLUT
-   Copyright (C) 2004 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package gnu.java.awt.color;
-
-import java.awt.color.ColorSpace;
-import java.awt.color.ICC_Profile;
-import java.nio.ByteBuffer;
-
-
-/**
- * ColorLookUpTable handles color lookups through a color lookup table,
- * as defined in the ICC specification.
- * Both 'mft2' and 'mft1' (8 and 16-bit) type CLUTs are handled.
- *
- * This will have to be updated later for ICC 4.0.0
- *
- * @author Sven de Marothy
- */
-public class ColorLookUpTable
-{
-  /**
-   * CIE 1931 D50 white point (in Lab coordinates)
-   */
-  private static float[] D50 = { 0.96422f, 1.00f, 0.82521f };
-
-  /**
-   * Number of input/output channels
-   */
-  int nIn;
-
-  /**
-   * Number of input/output channels
-   */
-  int nOut;
-  int nInTableEntries; // Number of input table entries
-  int nOutTableEntries; // Number of output table entries
-  int gridpoints; // Number of gridpoints
-  int nClut; // This is nOut*(gridpoints**nIn)
-  double[][] inTable; // 1D input table ([channel][table])
-  short[][] outTable; // 1D input table ([channel][table])
-  double[] clut; // The color lookup table
-  float[][] inMatrix; // input matrix (XYZ only)
-  boolean useMatrix; // Whether to use the matrix or not.
-  int[] multiplier;
-  int[] offsets; // Hypercube offsets
-  boolean inputLab; // Set if the CLUT input CS is Lab
-  boolean outputLab; // Set if the CLUT output CS is Lab
-
-  /**
-   * Constructor
-   * Requires a profile file to get the CLUT from and the tag of the
-   * CLUT to create. (icSigXToYZTag where X,Y = [A | B], Z = [0,1,2])
-   */
-  public ColorLookUpTable(ICC_Profile profile, int tag)
-  {
-    useMatrix = false;
-
-    switch (tag)
-      {
-      case ICC_Profile.icSigAToB0Tag:
-      case ICC_Profile.icSigAToB1Tag:
-      case ICC_Profile.icSigAToB2Tag:
-        if (profile.getColorSpaceType() == ColorSpace.TYPE_XYZ)
-          useMatrix = true;
-        inputLab = false;
-        outputLab = (profile.getPCSType() == ColorSpace.TYPE_Lab);
-        break;
-      case ICC_Profile.icSigBToA0Tag:
-      case ICC_Profile.icSigBToA1Tag:
-      case ICC_Profile.icSigBToA2Tag:
-        if (profile.getPCSType() == ColorSpace.TYPE_XYZ)
-          useMatrix = true;
-        inputLab = (profile.getPCSType() == ColorSpace.TYPE_Lab);
-        outputLab = false;
-        break;
-      default:
-        throw new IllegalArgumentException("Not a clut-type tag.");
-      }
-
-    byte[] data = profile.getData(tag);
-    if (data == null)
-      throw new IllegalArgumentException("Unsuitable profile, does not contain a CLUT.");
-
-    // check 'mft'
-    if (data[0] != 0x6d || data[1] != 0x66 || data[2] != 0x74)
-      throw new IllegalArgumentException("Unsuitable profile, invalid CLUT data.");
-
-    if (data[3] == 0x32)
-      readClut16(data);
-    else if (data[3] == 0x31)
-      readClut8(data);
-    else
-      throw new IllegalArgumentException("Unknown/invalid CLUT type.");
-  }
-
-  /**
-   * Loads a 16-bit CLUT into our data structures
-   */
-  private void readClut16(byte[] data)
-  {
-    ByteBuffer buf = ByteBuffer.wrap(data);
-
-    nIn = data[8] & (0xFF);
-    nOut = data[9] & (0xFF);
-    nInTableEntries = buf.getShort(48);
-    nOutTableEntries = buf.getShort(50);
-    gridpoints = data[10] & (0xFF);
-
-    inMatrix = new float[3][3];
-    for (int i = 0; i < 3; i++)
-      for (int j = 0; j < 3; j++)
-        inMatrix[i][j] = ((float) (buf.getInt(12 + (i * 3 + j) * 4))) / 65536.0f;
-
-    inTable = new double[nIn][nInTableEntries];
-    for (int channel = 0; channel < nIn; channel++)
-      for (int i = 0; i < nInTableEntries; i++)
-        inTable[channel][i] = (double) ((int) buf.getShort(52
-                                                           + (channel * nInTableEntries
-                                                           + i) * 2)
-                              & (0xFFFF)) / 65536.0;
-
-    nClut = nOut;
-    multiplier = new int[nIn];
-    multiplier[nIn - 1] = nOut;
-    for (int i = 0; i < nIn; i++)
-      {
-        nClut *= gridpoints;
-        if (i > 0)
-          multiplier[nIn - i - 1] = multiplier[nIn - i] * gridpoints;
-      }
-
-    int clutOffset = 52 + nIn * nInTableEntries * 2;
-    clut = new double[nClut];
-    for (int i = 0; i < nClut; i++)
-      clut[i] = (double) ((int) buf.getShort(clutOffset + i * 2) & (0xFFFF)) / 65536.0;
-
-    outTable = new short[nOut][nOutTableEntries];
-    for (int channel = 0; channel < nOut; channel++)
-      for (int i = 0; i < nOutTableEntries; i++)
-        outTable[channel][i] = buf.getShort(clutOffset
-                                            + (nClut
-                                            + channel * nOutTableEntries + i) * 2);
-
-    // calculate the hypercube corner offsets
-    offsets = new int[(1 << nIn)];
-    offsets[0] = 0;
-    for (int j = 0; j < nIn; j++)
-      {
-        int factor = 1 << j;
-        for (int i = 0; i < factor; i++)
-          offsets[factor + i] = offsets[i] + multiplier[j];
-      }
-  }
-
-  /**
-   * Loads a 8-bit CLUT into our data structures.
-   */
-  private void readClut8(byte[] data)
-  {
-    ByteBuffer buf = ByteBuffer.wrap(data);
-
-    nIn = (data[8] & (0xFF));
-    nOut = (data[9] & (0xFF));
-    nInTableEntries = 256; // always 256
-    nOutTableEntries = 256; // always 256
-    gridpoints = (data[10] & (0xFF));
-
-    inMatrix = new float[3][3];
-    for (int i = 0; i < 3; i++)
-      for (int j = 0; j < 3; j++)
-        inMatrix[i][j] = ((float) (buf.getInt(12 + (i * 3 + j) * 4))) / 65536.0f;
-
-    inTable = new double[nIn][nInTableEntries];
-    for (int channel = 0; channel < nIn; channel++)
-      for (int i = 0; i < nInTableEntries; i++)
-        inTable[channel][i] = (double) ((int) buf.get(48
-                                                      + (channel * nInTableEntries
-                                                      + i)) & (0xFF)) / 255.0;
-
-    nClut = nOut;
-    multiplier = new int[nIn];
-    multiplier[nIn - 1] = nOut;
-    for (int i = 0; i < nIn; i++)
-      {
-        nClut *= gridpoints;
-        if (i > 0)
-          multiplier[nIn - i - 1] = multiplier[nIn - i] * gridpoints;
-      }
-
-    int clutOffset = 48 + nIn * nInTableEntries;
-    clut = new double[nClut];
-    for (int i = 0; i < nClut; i++)
-      clut[i] = (double) ((int) buf.get(clutOffset + i) & (0xFF)) / 255.0;
-
-    outTable = new short[nOut][nOutTableEntries];
-    for (int channel = 0; channel < nOut; channel++)
-      for (int i = 0; i < nOutTableEntries; i++)
-        outTable[channel][i] = (short) (buf.get(clutOffset + nClut
-                                                + channel * nOutTableEntries
-                                                + i) * 257);
-
-    // calculate the hypercube corner offsets
-    offsets = new int[(1 << nIn)];
-    offsets[0] = 0;
-    for (int j = 0; j < nIn; j++)
-      {
-        int factor = 1 << j;
-        for (int i = 0; i < factor; i++)
-          offsets[factor + i] = offsets[i] + multiplier[j];
-      }
-  }
-
-  /**
-   * Performs a lookup through the Color LookUp Table.
-   * If the CLUT tag type is AtoB the conversion will be from the device
-   * color space to the PCS, BtoA type goes in the opposite direction.
-   *
-   * For convenience, the PCS values for input or output will always be
-   * CIE XYZ (D50), if the actual PCS is Lab, the values will be converted.
-   *
-   * N-dimensional linear interpolation is used.
-   */
-  float[] lookup(float[] in)
-  {
-    float[] in2 = new float[in.length];
-    if (useMatrix)
-      {
-        for (int i = 0; i < 3; i++)
-          in2[i] = in[0] * inMatrix[i][0] + in[1] * inMatrix[i][1]
-                   + in[2] * inMatrix[i][2];
-      }
-    else if (inputLab)
-      in2 = XYZtoLab(in);
-    else
-      System.arraycopy(in, 0, in2, 0, in.length);
-
-    // input table
-    for (int i = 0; i < nIn; i++)
-      {
-        int index = (int) Math.floor(in2[i] * (double) (nInTableEntries - 1)); // floor in
-
-        // clip values.
-        if (index >= nInTableEntries - 1)
-          in2[i] = (float) inTable[i][nInTableEntries - 1];
-        else if (index < 0)
-          in2[i] = (float) inTable[i][0];
-        else
-          {
-            // linear interpolation
-            double alpha = in2[i] * ((double) nInTableEntries - 1.0) - index;
-            in2[i] = (float) (inTable[i][index] * (1 - alpha)
-                     + inTable[i][index + 1] * alpha);
-          }
-      }
-
-    // CLUT lookup
-    double[] output2 = new double[nOut];
-    double[] weights = new double[(1 << nIn)];
-    double[] clutalpha = new double[nIn]; // interpolation values
-    int offset = 0; // = gp
-    for (int i = 0; i < nIn; i++)
-      {
-        int index = (int) Math.floor(in2[i] * ((double) gridpoints - 1.0));
-        double alpha = in2[i] * ((double) gridpoints - 1.0) - (double) index;
-
-        // clip values.
-        if (index >= gridpoints - 1)
-          {
-            index = gridpoints - 1;
-            alpha = 1.0;
-          }
-        else if (index < 0)
-          index = 0;
-        clutalpha[i] = alpha;
-        offset += index * multiplier[i];
-      }
-
-    // Calculate interpolation weights
-    weights[0] = 1.0;
-    for (int j = 0; j < nIn; j++)
-      {
-        int factor = 1 << j;
-        for (int i = 0; i < factor; i++)
-          {
-            weights[factor + i] = weights[i] * clutalpha[j];
-            weights[i] *= (1.0 - clutalpha[j]);
-          }
-      }
-
-    for (int i = 0; i < nOut; i++)
-      output2[i] = weights[0] * clut[offset + i];
-
-    for (int i = 1; i < (1 << nIn); i++)
-      {
-        int offset2 = offset + offsets[i];
-        for (int f = 0; f < nOut; f++)
-          output2[f] += weights[i] * clut[offset2 + f];
-      }
-
-    // output table
-    float[] output = new float[nOut];
-    for (int i = 0; i < nOut; i++)
-      {
-        int index = (int) Math.floor(output2[i] * ((double) nOutTableEntries
-                                     - 1.0));
-
-        // clip values.
-        if (index >= nOutTableEntries - 1)
-          output[i] = outTable[i][nOutTableEntries - 1];
-        else if (index < 0)
-          output[i] = outTable[i][0];
-        else
-          {
-            // linear interpolation
-            double a = output2[i] * ((double) nOutTableEntries - 1.0)
-                       - (double) index;
-            output[i] = (float) ((double) ((int) outTable[i][index] & (0xFFFF)) * (1
-                        - a)
-                        + (double) ((int) outTable[i][index + 1] & (0xFFFF)) * a) / 65536f;
-          }
-      }
-
-    if (outputLab)
-      return LabtoXYZ(output);
-    return output;
-  }
-
-  /**
-   * Converts CIE Lab coordinates to (D50) XYZ ones.
-   */
-  private float[] LabtoXYZ(float[] in)
-  {
-    // Convert from byte-packed format to a
-    // more convenient one (actual Lab values)
-    // (See ICC spec for details)
-    // factor is 100 * 65536 / 65280
-    in[0] = (float) (100.392156862745 * in[0]);
-    in[1] = (in[1] * 256.0f) - 128.0f;
-    in[2] = (in[2] * 256.0f) - 128.0f;
-
-    float[] out = new float[3];
-
-    out[1] = (in[0] + 16.0f) / 116.0f;
-    out[0] = in[1] / 500.0f + out[1];
-    out[2] = out[1] - in[2] / 200.0f;
-
-    for (int i = 0; i < 3; i++)
-      {
-        double exp = out[i] * out[i] * out[i];
-        if (exp <= 0.008856)
-          out[i] = (out[i] - 16.0f / 116.0f) / 7.787f;
-        else
-          out[i] = (float) exp;
-        out[i] = D50[i] * out[i];
-      }
-    return out;
-  }
-
-  /**
-   * Converts CIE XYZ coordinates to Lab ones.
-   */
-  private float[] XYZtoLab(float[] in)
-  {
-    float[] temp = new float[3];
-
-    for (int i = 0; i < 3; i++)
-      {
-        temp[i] = in[i] / D50[i];
-
-        if (temp[i] <= 0.008856f)
-          temp[i] = (7.7870689f * temp[i]) + (16f / 116.0f);
-        else
-          temp[i] = (float) Math.exp((1.0 / 3.0) * Math.log(temp[i]));
-      }
-
-    float[] out = new float[3];
-    out[0] = (116.0f * temp[1]) - 16f;
-    out[1] = 500.0f * (temp[0] - temp[1]);
-    out[2] = 200.0f * (temp[1] - temp[2]);
-
-    // Normalize to packed format
-    out[0] = (float) (out[0] / 100.392156862745);
-    out[1] = (out[1] + 128f) / 256f;
-    out[2] = (out[2] + 128f) / 256f;
-    for (int i = 0; i < 3; i++)
-      {
-        if (out[i] < 0f)
-          out[i] = 0f;
-        if (out[i] > 1f)
-          out[i] = 1f;
-      }
-    return out;
-  }
-}
diff --git a/openjdk/gnu/java/awt/color/ColorSpaceConverter.java b/openjdk/gnu/java/awt/color/ColorSpaceConverter.java
deleted file mode 100644
index 63ba08a4..00000000
--- a/openjdk/gnu/java/awt/color/ColorSpaceConverter.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ColorSpaceConverter.java -- an interface for colorspace conversion
-   Copyright (C) 2004 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package gnu.java.awt.color;
-
-
-/**
- * ColorSpaceConverter - used by java.awt.color.ICC_ColorSpace
- *
- * Color space conversion can occur in several ways:
- *
- * -Directly (for the built in spaces sRGB, linear RGB, gray, CIE XYZ and PYCC
- * -ICC_ProfileRGB works through TRC curves and a matrix
- * -ICC_ProfileGray works through a single TRC
- * -Everything else is done through Color lookup tables.
- *
- * The different conversion methods are implemented through
- * an interface. The built-in colorspaces are implemented directly
- * with the relevant conversion equations.
- *
- * In this way, we hopefully will always use the fastest and most
- * accurate method available.
- *
- * @author Sven de Marothy
- */
-public interface ColorSpaceConverter
-{
-  float[] toCIEXYZ(float[] in);
-
-  float[] fromCIEXYZ(float[] in);
-
-  float[] toRGB(float[] in);
-
-  float[] fromRGB(float[] in);
-}
diff --git a/openjdk/gnu/java/awt/color/GrayProfileConverter.java b/openjdk/gnu/java/awt/color/GrayProfileConverter.java
deleted file mode 100644
index 3f95b07d..00000000
--- a/openjdk/gnu/java/awt/color/GrayProfileConverter.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/* GrayProfileConverter.java -- Gray profile conversion class
-   Copyright (C) 2004 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-
-package gnu.java.awt.color;
-
-import java.awt.color.ICC_Profile;
-import java.awt.color.ICC_ProfileGray;
-import java.awt.color.ProfileDataException;
-
-/**
- * GrayProfileConverter - converts Grayscale profiles (ICC_ProfileGray)
- *
- * This type of profile contains a single tone reproduction curve (TRC).
- * Conversion consists of simple TRC lookup.
- *
- * This implementation is very lazy and does everything applying the TRC and
- * utilizing the built-in linear grayscale color space.
- *
- * @author Sven de Marothy
- */
-public class GrayProfileConverter implements ColorSpaceConverter
-{
-  private GrayScaleConverter gc;
-  private ToneReproductionCurve trc;
-  private ColorLookUpTable toPCS;
-  private ColorLookUpTable fromPCS;
-
-  /**
-   * Constructs the converter described by an ICC_ProfileGray object
-   */
-  public GrayProfileConverter(ICC_ProfileGray profile)
-  {
-    try
-      {
-        trc = new ToneReproductionCurve(profile.getGamma());
-      }
-    catch (ProfileDataException e)
-      {
-        trc = new ToneReproductionCurve(profile.getTRC());
-      }
-
-    // linear grayscale converter
-    gc = new GrayScaleConverter();
-
-    // If a CLUT is available, it should be used, and the TRCs ignored.
-    // Note: A valid profile may only have CLUTs in one direction, and
-    // TRC:s without useful info, making reverse-transforms impossible.
-    // In this case the TRC will be used for the reverse-transform with
-    // unpredictable results. This is in line with the Java specification,
-    try
-      {
-        toPCS = new ColorLookUpTable(profile, ICC_Profile.icSigAToB0Tag);
-      }
-    catch (Exception e)
-      {
-        toPCS = null;
-      }
-
-    try
-      {
-        fromPCS = new ColorLookUpTable(profile, ICC_Profile.icSigBToA0Tag);
-      }
-    catch (Exception e)
-      {
-        fromPCS = null;
-      }
-  }
-
-  public float[] toCIEXYZ(float[] in)
-  {
-    if (toPCS != null)
-      return toPCS.lookup(in);
-    float[] gray = new float[1];
-    gray[0] = trc.lookup(in[0]);
-    return gc.toCIEXYZ(gray);
-  }
-
-  public float[] toRGB(float[] in)
-  {
-    float[] gray = new float[1];
-    gray[0] = trc.lookup(in[0]);
-    return gc.toRGB(gray);
-  }
-
-  public float[] fromRGB(float[] in)
-  {
-    // get linear grayscale value
-    float[] gray = gc.fromRGB(in);
-    gray[0] = trc.reverseLookup(gray[0]);
-    return gray;
-  }
-
-  public float[] fromCIEXYZ(float[] in)
-  {
-    if (fromPCS != null)
-      return fromPCS.lookup(in);
-
-    float[] gray = gc.fromCIEXYZ(in);
-    gray[0] = trc.reverseLookup(gray[0]);
-    return gray;
-  }
-}
diff --git a/openjdk/gnu/java/awt/color/GrayScaleConverter.java b/openjdk/gnu/java/awt/color/GrayScaleConverter.java
deleted file mode 100644
index 1466d4e3..00000000
--- a/openjdk/gnu/java/awt/color/GrayScaleConverter.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/* GrayScaleConverter.java -- Linear grayscale conversion class
-   Copyright (C) 2004 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package gnu.java.awt.color;
-
-
-/**
- * Linear Grayscale converter
- *
- * @author Sven de Marothy
- */
-public class GrayScaleConverter implements ColorSpaceConverter
-{
-  // intensity factors (ITU Rec. BT.709)
-  double[] coeff = { 0.2125f, 0.7154f, 0.0721f };
-
-  /**
-   * CIE 1931 D50 white point (in Lab coordinates)
-   */
-  private static float[] D50 = { 0.96422f, 1.00f, 0.82521f };
-
-  public float[] toCIEXYZ(float[] in)
-  {
-    float g = in[0];
-    if (g < 0)
-      g = 1 + g;
-    float[] out = { g * D50[0], g * D50[1], g * D50[2] }; // White spot
-    return out;
-  }
-
-  public float[] toRGB(float[] in)
-  {
-    float[] out = new float[3];
-    if (in[0] <= 0.00304f)
-      out[0] = in[0] * 12.92f;
-    else
-      out[0] = 1.055f * ((float) Math.exp((1 / 2.4) * Math.log(in[0])))
-               - 0.055f;
-    out[1] = out[2] = out[0];
-    return out;
-  }
-
-  public float[] fromCIEXYZ(float[] in)
-  {
-    float[] temp = new float[3];
-    temp[0] = 3.1338f * in[0] - 1.6171f * in[1] - 0.4907f * in[2];
-    temp[1] = -0.9785f * in[0] + 1.9160f * in[1] + 0.0334f * in[2];
-    temp[2] = 0.0720f * in[0] - 0.2290f * in[1] + 1.4056f * in[2];
-    float[] out = new float[1];
-    for (int i = 0; i < 3; i++)
-      out[0] += (float) (temp[i] * coeff[i]);
-    return out;
-  }
-
-  public float[] fromRGB(float[] in)
-  {
-    float[] out = new float[1];
-
-    // Convert non-linear RGB coordinates to linear ones,
-    //  numbers from the w3 spec.
-    out[0] = 0;
-    for (int i = 0; i < 3; i++)
-      {
-        float n = in[i];
-        if (n < 0)
-          n = 0f;
-        if (n > 1)
-          n = 1f;
-        if (n <= 0.03928f)
-          out[0] += (float) (coeff[i] * n / 12.92);
-        else
-          out[0] += (float) (coeff[i] * Math.exp(2.4 * Math.log((n + 0.055) / 1.055)));
-      }
-    return out;
-  }
-}
diff --git a/openjdk/gnu/java/awt/color/ProfileHeader.java b/openjdk/gnu/java/awt/color/ProfileHeader.java
deleted file mode 100644
index 2a6402db..00000000
--- a/openjdk/gnu/java/awt/color/ProfileHeader.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/* ProfileHeader.java -- Encapsules ICC Profile header data
-   Copyright (C) 2004 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package gnu.java.awt.color;
-
-import java.awt.color.ColorSpace;
-import java.awt.color.ICC_Profile;
-import java.nio.ByteBuffer;
-
-
-/**
- * Header, abstracts and validates the header data.
- *
- * @author Sven de Marothy
- */
-public class ProfileHeader
-{
-  /**
-   * Magic identifier (ASCII 'acsp')
-   */
-  private static final int icMagicNumber = 0x61637370;
-
-  /**
-   * Mapping from ICC Profile signatures to ColorSpace types
-   */
-  private static final int[] csTypeMap =
-                                         {
-                                           ICC_Profile.icSigXYZData,
-                                           ColorSpace.TYPE_XYZ,
-                                           ICC_Profile.icSigLabData,
-                                           ColorSpace.TYPE_Lab,
-                                           ICC_Profile.icSigLuvData,
-                                           ColorSpace.TYPE_Luv,
-                                           ICC_Profile.icSigYCbCrData,
-                                           ColorSpace.TYPE_YCbCr,
-                                           ICC_Profile.icSigYxyData,
-                                           ColorSpace.TYPE_Yxy,
-                                           ICC_Profile.icSigRgbData,
-                                           ColorSpace.TYPE_RGB,
-                                           ICC_Profile.icSigGrayData,
-                                           ColorSpace.TYPE_GRAY,
-                                           ICC_Profile.icSigHsvData,
-                                           ColorSpace.TYPE_HSV,
-                                           ICC_Profile.icSigHlsData,
-                                           ColorSpace.TYPE_HLS,
-                                           ICC_Profile.icSigCmykData,
-                                           ColorSpace.TYPE_CMYK,
-                                           ICC_Profile.icSigCmyData,
-                                           ColorSpace.TYPE_CMY,
-                                           ICC_Profile.icSigSpace2CLR,
-                                           ColorSpace.TYPE_2CLR,
-                                           ICC_Profile.icSigSpace3CLR,
-                                           ColorSpace.TYPE_3CLR,
-                                           ICC_Profile.icSigSpace4CLR,
-                                           ColorSpace.TYPE_4CLR,
-                                           ICC_Profile.icSigSpace5CLR,
-                                           ColorSpace.TYPE_5CLR,
-                                           ICC_Profile.icSigSpace6CLR,
-                                           ColorSpace.TYPE_6CLR,
-                                           ICC_Profile.icSigSpace7CLR,
-                                           ColorSpace.TYPE_7CLR,
-                                           ICC_Profile.icSigSpace8CLR,
-                                           ColorSpace.TYPE_8CLR,
-                                           ICC_Profile.icSigSpace9CLR,
-                                           ColorSpace.TYPE_9CLR,
-                                           ICC_Profile.icSigSpaceACLR,
-                                           ColorSpace.TYPE_ACLR,
-                                           ICC_Profile.icSigSpaceBCLR,
-                                           ColorSpace.TYPE_BCLR,
-                                           ICC_Profile.icSigSpaceCCLR,
-                                           ColorSpace.TYPE_CCLR,
-                                           ICC_Profile.icSigSpaceDCLR,
-                                           ColorSpace.TYPE_DCLR,
-                                           ICC_Profile.icSigSpaceECLR,
-                                           ColorSpace.TYPE_ECLR,
-                                           ICC_Profile.icSigSpaceFCLR,
-                                           ColorSpace.TYPE_FCLR
-                                         };
-
-  /**
-   * Size of an ICC header (128 bytes)
-   */
-  public static final int HEADERSIZE = 128;
-
-  /**
-   * Mapping of ICC class signatures to profile class constants
-   */
-  private static final int[] classMap =
-                                        {
-                                          ICC_Profile.icSigInputClass,
-                                          ICC_Profile.CLASS_INPUT,
-                                          ICC_Profile.icSigDisplayClass,
-                                          ICC_Profile.CLASS_DISPLAY,
-                                          ICC_Profile.icSigOutputClass,
-                                          ICC_Profile.CLASS_OUTPUT,
-                                          ICC_Profile.icSigLinkClass,
-                                          ICC_Profile.CLASS_DEVICELINK,
-                                          ICC_Profile.icSigColorSpaceClass,
-                                          ICC_Profile.CLASS_COLORSPACECONVERSION,
-                                          ICC_Profile.icSigAbstractClass,
-                                          ICC_Profile.CLASS_ABSTRACT,
-                                          ICC_Profile.icSigNamedColorClass,
-                                          ICC_Profile.CLASS_NAMEDCOLOR
-                                        };
-  private int size;
-  private int cmmId;
-
-  // Major/Minor version, The ICC-1998 spec is major v2
-  private int majorVersion;
-
-  // Major/Minor version, The ICC-1998 spec is major v2
-  private int minorVersion;
-  private int profileClass; // profile device class
-  private int colorSpace; // data color space type
-  private int profileColorSpace; // profile connection space (PCS) type
-  private byte[] timestamp; // original creation timestamp
-  private int platform; // platform signature
-  private int flags; // flags
-  private int magic; // magic number.
-  private int manufacturerSig; // manufacturer sig
-  private int modelSig; // model sig
-  private byte[] attributes; // Attributes
-  private int intent; // rendering intent
-  private byte[] illuminant; // illuminant info (Coordinates of D50 in the PCS)
-  private int creatorSig; // Creator sig (same type as manufacturer)
-
-  /**
-   * Creates a 'default' header for use with our predefined profiles.
-   * Note the device and profile color spaces are not set.
-   */
-  public ProfileHeader()
-  {
-    creatorSig = 0;
-    intent = 0;
-    modelSig = manufacturerSig = (int) 0x6E6f6E65; // 'none'
-    magic = icMagicNumber;
-    cmmId = 0;
-    platform = 0; // no preferred platform
-    timestamp = new byte[8];
-    majorVersion = 2;
-    minorVersion = 0x10;
-    flags = 0;
-
-    // D50 in XYZ format (encoded)
-    illuminant = new byte[]
-                 {
-                   (byte) 0x00, (byte) 0x00, (byte) 0xf6, (byte) 0xd6,
-                   (byte) 0x00, (byte) 0x01, (byte) 0x00, (byte) 0x00,
-                   (byte) 0x00, (byte) 0x00, (byte) 0xd3, (byte) 0x2d
-                 };
-    attributes = new byte[8];
-    profileClass = ICC_Profile.CLASS_DISPLAY;
-  }
-
-  /**
-   * Creates a header from profile data. Only the header portion (128 bytes)
-   * is read, so the array passed need not be the full profile.
-   */
-  public ProfileHeader(byte[] data)
-  {
-    ByteBuffer buf = ByteBuffer.wrap(data);
-
-    // Get size (the sign bit shouldn't matter.
-    // A valid profile can never be +2Gb)
-    size = buf.getInt(ICC_Profile.icHdrSize);
-
-    // CMM ID
-    cmmId = buf.getInt(ICC_Profile.icHdrCmmId);
-
-    // Version number
-    majorVersion = (int) (data[ICC_Profile.icHdrVersion]);
-    minorVersion = (int) (data[ICC_Profile.icHdrVersion + 1]);
-
-    // Profile/Device class
-    int classSig = buf.getInt(ICC_Profile.icHdrDeviceClass);
-    profileClass = -1;
-    for (int i = 0; i < classMap.length; i += 2)
-      if (classMap[i] == classSig)
-        {
-          profileClass = classMap[i + 1];
-          break;
-        }
-
-    // get the data color space
-    int csSig = buf.getInt(ICC_Profile.icHdrColorSpace);
-    colorSpace = -1;
-    for (int i = 0; i < csTypeMap.length; i += 2)
-      if (csTypeMap[i] == csSig)
-        {
-          colorSpace = csTypeMap[i + 1];
-          break;
-        }
-
-    // get the profile color space (PCS), must be xyz or lab except
-    // for device-link-class profiles
-    int pcsSig = buf.getInt(ICC_Profile.icHdrPcs);
-    profileColorSpace = -1;
-    if (profileClass != ICC_Profile.CLASS_DEVICELINK)
-      {
-        if (pcsSig == ICC_Profile.icSigXYZData)
-          profileColorSpace = ColorSpace.TYPE_XYZ;
-        if (pcsSig == ICC_Profile.icSigLabData)
-          profileColorSpace = ColorSpace.TYPE_Lab;
-      }
-    else
-      {
-        for (int i = 0; i < csTypeMap.length; i += 2)
-          if (csTypeMap[i] == pcsSig)
-            {
-              profileColorSpace = csTypeMap[i + 1];
-              break;
-            }
-      }
-
-    // creation timestamp
-    timestamp = new byte[8];
-    System.arraycopy(data, ICC_Profile.icHdrDate, timestamp, 0, 8);
-
-    // magic number
-    magic = buf.getInt(ICC_Profile.icHdrMagic);
-
-    //  platform info
-    platform = buf.getInt(ICC_Profile.icHdrPlatform);
-    // get flags
-    flags = buf.getInt(ICC_Profile.icHdrFlags);
-    // get manufacturer sign
-    manufacturerSig = buf.getInt(ICC_Profile.icHdrManufacturer);
-    // get header model
-    modelSig = buf.getInt(ICC_Profile.icHdrModel);
-    // attributes
-    attributes = new byte[8];
-    System.arraycopy(data, ICC_Profile.icHdrAttributes, attributes, 0, 8);
-    // rendering intent
-    intent = buf.getInt(ICC_Profile.icHdrRenderingIntent);
-    // illuminant info
-    illuminant = new byte[12];
-    System.arraycopy(data, ICC_Profile.icHdrIlluminant, illuminant, 0, 12);
-    // Creator signature
-    creatorSig = buf.getInt(ICC_Profile.icHdrCreator);
-    // The rest of the header (Total size: 128 bytes) is unused..
-  }
-
-  /**
-   * Verify that the header is valid
-   * @param size equals the file size if it is to be verified, -1 otherwise
-   * @throws IllegalArgumentException if the header is found to be invalid.
-   */
-  public void verifyHeader(int size) throws IllegalArgumentException
-  {
-    // verify size
-    if (size != -1 && this.size != size)
-      throw new IllegalArgumentException("Invalid profile length:" + size);
-
-    // Check version number
-    if (majorVersion != 2)
-      throw new IllegalArgumentException("Wrong major version number:"
-                                         + majorVersion);
-
-    // Profile/Device class
-    if (profileClass == -1)
-      throw new IllegalArgumentException("Invalid profile/device class");
-
-    // get the data color space
-    if (colorSpace == -1)
-      throw new IllegalArgumentException("Invalid colorspace");
-
-    // profile color space
-    if (profileColorSpace == -1)
-      throw new IllegalArgumentException("Invalid PCS.");
-
-    // check magic number
-    if (magic != icMagicNumber)
-      throw new IllegalArgumentException("Invalid magic number!");
-  }
-
-  /**
-   * Creates a header, setting the header file size at the same time.
-   * @param size the profile file size.
-   */
-  public byte[] getData(int size)
-  {
-    byte[] data = new byte[HEADERSIZE];
-    ByteBuffer buf = ByteBuffer.wrap(data);
-    buf.putInt(ICC_Profile.icHdrSize, size);
-    buf.putInt(ICC_Profile.icHdrCmmId, cmmId);
-    buf.putShort(ICC_Profile.icHdrVersion,
-                 (short) (majorVersion << 8 | minorVersion));
-    for (int i = 1; i < classMap.length; i += 2)
-      if (profileClass == classMap[i])
-        buf.putInt(ICC_Profile.icHdrDeviceClass, classMap[i - 1]);
-    for (int i = 1; i < csTypeMap.length; i += 2)
-      if (csTypeMap[i] == colorSpace)
-        buf.putInt(ICC_Profile.icHdrColorSpace, csTypeMap[i - 1]);
-    for (int i = 1; i < csTypeMap.length; i += 2)
-      if (csTypeMap[i] == profileColorSpace)
-        buf.putInt(ICC_Profile.icHdrPcs, csTypeMap[i - 1]);
-
-    System.arraycopy(timestamp, 0, data, ICC_Profile.icHdrDate,
-                     timestamp.length);
-    buf.putInt(ICC_Profile.icHdrMagic, icMagicNumber);
-    buf.putInt(ICC_Profile.icHdrPlatform, platform);
-    buf.putInt(ICC_Profile.icHdrFlags, flags);
-    buf.putInt(ICC_Profile.icHdrManufacturer, manufacturerSig);
-    buf.putInt(ICC_Profile.icHdrModel, modelSig);
-    System.arraycopy(attributes, 0, data, ICC_Profile.icHdrAttributes,
-                     attributes.length);
-    buf.putInt(ICC_Profile.icHdrRenderingIntent, intent);
-    System.arraycopy(illuminant, 0, data, ICC_Profile.icHdrIlluminant,
-                     illuminant.length);
-    buf.putInt(ICC_Profile.icHdrCreator, creatorSig);
-    return buf.array();
-  }
-
-  public int getSize()
-  {
-    return size;
-  }
-
-  public void setSize(int s)
-  {
-    size = s;
-  }
-
-  public int getMajorVersion()
-  {
-    return majorVersion;
-  }
-
-  public int getMinorVersion()
-  {
-    return minorVersion;
-  }
-
-  public int getProfileClass()
-  {
-    return profileClass;
-  }
-
-  public void setProfileClass(int pc)
-  {
-    profileClass = pc;
-  }
-
-  public int getColorSpace()
-  {
-    return colorSpace;
-  }
-
-  public int getProfileColorSpace()
-  {
-    return profileColorSpace;
-  }
-
-  public void setColorSpace(int cs)
-  {
-    colorSpace = cs;
-  }
-
-  public void setProfileColorSpace(int pcs)
-  {
-    profileColorSpace = pcs;
-  }
-
-}
diff --git a/openjdk/gnu/java/awt/color/RgbProfileConverter.java b/openjdk/gnu/java/awt/color/RgbProfileConverter.java
deleted file mode 100644
index 7623890a..00000000
--- a/openjdk/gnu/java/awt/color/RgbProfileConverter.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/* RgbProfileConverter.java -- RGB Profile conversion class
-   Copyright (C) 2004 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-
-package gnu.java.awt.color;
-
-import java.awt.color.ICC_Profile;
-import java.awt.color.ICC_ProfileRGB;
-import java.awt.color.ProfileDataException;
-
-/**
- * RgbProfileConverter - converts RGB profiles (ICC_ProfileRGB)
- *
- * This type of profile contains a matrix and three
- * tone reproduction curves (TRCs).
- *
- * Device RGB --&gt; CIE XYZ is done through first multiplying with
- * a matrix, then each component is looked-up against it's TRC.
- *
- * The opposite transform is done using the inverse of the matrix,
- * and TRC:s.
- *
- * @author Sven de Marothy
- */
-public class RgbProfileConverter implements ColorSpaceConverter
-{
-  private float[][] matrix;
-  private float[][] inv_matrix;
-  private ToneReproductionCurve rTRC;
-  private ToneReproductionCurve gTRC;
-  private ToneReproductionCurve bTRC;
-  private ColorLookUpTable toPCS;
-  private ColorLookUpTable fromPCS;
-
-  /**
-   * CIE 1931 D50 white point (in Lab coordinates)
-   */
-  private static float[] D50 = { 0.96422f, 1.00f, 0.82521f };
-
-  /**
-   * Constructs an RgbProfileConverter from a given ICC_ProfileRGB
-   */
-  public RgbProfileConverter(ICC_ProfileRGB profile)
-  {
-    toPCS = fromPCS = null;
-    matrix = profile.getMatrix();
-
-    // get TRCs
-    try
-      {
-        rTRC = new ToneReproductionCurve(profile.getGamma(ICC_ProfileRGB.REDCOMPONENT));
-      }
-    catch (ProfileDataException e)
-      {
-        rTRC = new ToneReproductionCurve(profile.getTRC(ICC_ProfileRGB.REDCOMPONENT));
-      }
-    try
-      {
-        gTRC = new ToneReproductionCurve(profile.getGamma(ICC_ProfileRGB.GREENCOMPONENT));
-      }
-    catch (ProfileDataException e)
-      {
-        gTRC = new ToneReproductionCurve(profile.getTRC(ICC_ProfileRGB.GREENCOMPONENT));
-      }
-    try
-      {
-        bTRC = new ToneReproductionCurve(profile.getGamma(ICC_ProfileRGB.BLUECOMPONENT));
-      }
-    catch (ProfileDataException e)
-      {
-        bTRC = new ToneReproductionCurve(profile.getTRC(ICC_ProfileRGB.BLUECOMPONENT));
-      }
-
-    // If a CLUT is available, it should be used, and the TRCs ignored.
-    // Note: A valid profile may only have CLUTs in one direction, and
-    // TRC:s without useful info, making reverse-transforms impossible.
-    // In this case the TRC will be used for the reverse-transform with
-    // unpredictable results. This is in line with the Java specification,
-    try
-      {
-        toPCS = new ColorLookUpTable(profile, ICC_Profile.icSigAToB0Tag);
-      }
-    catch (Exception e)
-      {
-        toPCS = null;
-      }
-
-    try
-      {
-        fromPCS = new ColorLookUpTable(profile, ICC_Profile.icSigBToA0Tag);
-      }
-    catch (Exception e)
-      {
-        fromPCS = null;
-      }
-
-    // Calculate the inverse matrix if no reverse CLUT is available
-    if(fromPCS == null)
-        inv_matrix = invertMatrix(matrix);
-    else
-      {
-        // otherwise just set it to an identity matrix
-        inv_matrix = new float[3][3];
-        inv_matrix[0][0] = inv_matrix[1][1] = inv_matrix[2][2] = 1.0f;
-      }
-  }
-
-  public float[] toCIEXYZ(float[] in)
-  {
-    // CLUT takes precedence
-    if (toPCS != null)
-      return toPCS.lookup(in);
-
-    float[] temp = new float[3];
-    float[] out = new float[3];
-
-    // device space --> linear gamma
-    temp[0] = rTRC.lookup(in[0]);
-    temp[1] = gTRC.lookup(in[1]);
-    temp[2] = bTRC.lookup(in[2]);
-
-    // matrix multiplication
-    out[0] = matrix[0][0] * temp[0] + matrix[0][1] * temp[1]
-             + matrix[0][2] * temp[2];
-    out[1] = matrix[1][0] * temp[0] + matrix[1][1] * temp[1]
-             + matrix[1][2] * temp[2];
-    out[2] = matrix[2][0] * temp[0] + matrix[2][1] * temp[1]
-             + matrix[2][2] * temp[2];
-
-    return out;
-  }
-
-  public float[] toRGB(float[] in)
-  {
-    return SrgbConverter.XYZtoRGB(toCIEXYZ(in));
-  }
-
-  public float[] fromCIEXYZ(float[] in)
-  {
-    if (fromPCS != null)
-      return fromPCS.lookup(in);
-
-    float[] temp = new float[3];
-    float[] out = new float[3];
-
-    // matrix multiplication
-    temp[0] = inv_matrix[0][0] * in[0] + inv_matrix[0][1] * in[1]
-              + inv_matrix[0][2] * in[2];
-    temp[1] = inv_matrix[1][0] * in[0] + inv_matrix[1][1] * in[1]
-              + inv_matrix[1][2] * in[2];
-    temp[2] = inv_matrix[2][0] * in[0] + inv_matrix[2][1] * in[1]
-              + inv_matrix[2][2] * in[2];
-
-    // device space --> linear gamma
-    out[0] = rTRC.reverseLookup(temp[0]);
-    out[1] = gTRC.reverseLookup(temp[1]);
-    out[2] = bTRC.reverseLookup(temp[2]);
-
-    // FIXME: Sun appears to clip the return values to [0,1]
-    // I don't believe that is a Good Thing,
-    // (some colorspaces may allow values outside that range.)
-    // So we return the actual values here.
-    return out;
-  }
-
-  public float[] fromRGB(float[] in)
-  {
-    return fromCIEXYZ(SrgbConverter.RGBtoXYZ(in));
-  }
-
-  /**
-   * Inverts a 3x3 matrix, returns the inverse,
-   * throws an IllegalArgumentException if the matrix is not
-   * invertible (this shouldn't happen for a valid profile)
-   */
-  private float[][] invertMatrix(float[][] matrix)
-  {
-    float[][] out = new float[3][3];
-    double determinant = matrix[0][0] * (matrix[1][1] * matrix[2][2]
-                         - matrix[2][1] * matrix[1][2])
-                         - matrix[0][1] * (matrix[1][0] * matrix[2][2]
-                         - matrix[2][0] * matrix[1][2])
-                         + matrix[0][2] * (matrix[1][0] * matrix[2][1]
-                         - matrix[2][0] * matrix[1][1]);
-
-    if (determinant == 0.0)
-      throw new IllegalArgumentException("Can't invert conversion matrix.");
-    float invdet = (float) (1.0 / determinant);
-
-    out[0][0] = invdet * (matrix[1][1] * matrix[2][2]
-                - matrix[1][2] * matrix[2][1]);
-    out[0][1] = invdet * (matrix[0][2] * matrix[2][1]
-                - matrix[0][1] * matrix[2][2]);
-    out[0][2] = invdet * (matrix[0][1] * matrix[1][2]
-                - matrix[0][2] * matrix[1][1]);
-    out[1][0] = invdet * (matrix[1][2] * matrix[2][0]
-                - matrix[1][0] * matrix[2][2]);
-    out[1][1] = invdet * (matrix[0][0] * matrix[2][2]
-                - matrix[0][2] * matrix[2][0]);
-    out[1][2] = invdet * (matrix[0][2] * matrix[1][0]
-                - matrix[0][0] * matrix[1][2]);
-    out[2][0] = invdet * (matrix[1][0] * matrix[2][1]
-                - matrix[1][1] * matrix[2][0]);
-    out[2][1] = invdet * (matrix[0][1] * matrix[2][0]
-                - matrix[0][0] * matrix[2][1]);
-    out[2][2] = invdet * (matrix[0][0] * matrix[1][1]
-                - matrix[0][1] * matrix[1][0]);
-    return out;
-  }
-}
diff --git a/openjdk/gnu/java/awt/color/SrgbConverter.java b/openjdk/gnu/java/awt/color/SrgbConverter.java
deleted file mode 100644
index 76831c0e..00000000
--- a/openjdk/gnu/java/awt/color/SrgbConverter.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/* SrgbConverter.java -- sRGB conversion class
-   Copyright (C) 2004 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package gnu.java.awt.color;
-
-
-/**
- * SrgbConverter - conversion routines for the sRGB colorspace
- * sRGB is a standard for RGB colorspaces, adopted by the w3c.
- *
- * The specification is available at:
- * http://www.w3.org/Graphics/Color/sRGB.html
- *
- * @author Sven de Marothy
- */
-/**
- *
- * Note the matrix numbers used here are NOT identical to those in the
- * w3 spec, as those numbers are CIE XYZ relative a D65 white point.
- * The CIE XYZ we use is relative a D50 white point, so therefore a
- * linear Bradford transform matrix for D65->D50 mapping has been applied.
- * (The ICC documents describe this transform)
- *
- *   Linearized Bradford transform:
- *    0.8951    0.2664   -0.1614
- *   -0.7502    1.7135    0.0367
- *    0.0389   -0.0685    1.0296
- *
- *   Inverse:
- *   0.9870   -0.1471    0.1600
- *   0.4323    0.5184    0.0493
- *  -0.00853   0.0400    0.9685
- */
-public class SrgbConverter implements ColorSpaceConverter
-{
-  public float[] fromCIEXYZ(float[] in)
-  {
-    return XYZtoRGB(in);
-  }
-
-  public float[] toCIEXYZ(float[] in)
-  {
-    return RGBtoXYZ(in);
-  }
-
-  public float[] toRGB(float[] in)
-  {
-    float[] out = new float[3];
-    System.arraycopy(in, 0, out, 0, 3);
-    return out;
-  }
-
-  public float[] fromRGB(float[] in)
-  {
-    float[] out = new float[3];
-    System.arraycopy(in, 0, out, 0, 3);
-    return out;
-  }
-
-  /**
-   * CIE XYZ (D50 relative) --> sRGB
-   *
-   * Static as it's used by other ColorSpaceConverters to
-   * convert to sRGB if the color space is defined in XYZ.
-   */
-  public static float[] XYZtoRGB(float[] in)
-  {
-    float[] temp = new float[3];
-    temp[0] = 3.1338f * in[0] - 1.6171f * in[1] - 0.4907f * in[2];
-    temp[1] = -0.9785f * in[0] + 1.9160f * in[1] + 0.0334f * in[2];
-    temp[2] = 0.0720f * in[0] - 0.2290f * in[1] + 1.4056f * in[2];
-
-    float[] out = new float[3];
-    for (int i = 0; i < 3; i++)
-      {
-        if (temp[i] < 0)
-          temp[i] = 0.0f;
-        if (temp[i] > 1)
-          temp[i] = 1.0f;
-        if (temp[i] <= 0.00304f)
-          out[i] = temp[i] * 12.92f;
-        else
-          out[i] = 1.055f * ((float) Math.exp((1 / 2.4) * Math.log(temp[i])))
-                   - 0.055f;
-      }
-    return out;
-  }
-
-  /**
-   * sRGB --> CIE XYZ (D50 relative)
-   *
-   * Static as it's used by other ColorSpaceConverters to
-   * convert to XYZ if the color space is defined in RGB.
-   */
-  public static float[] RGBtoXYZ(float[] in)
-  {
-    float[] temp = new float[3];
-    float[] out = new float[3];
-    for (int i = 0; i < 3; i++)
-      if (in[i] <= 0.03928f)
-        temp[i] = in[i] / 12.92f;
-      else
-        temp[i] = (float) Math.exp(2.4 * Math.log((in[i] + 0.055) / 1.055));
-
-    /*
-     * Note: The numbers which were used to calculate this only had four
-     * digits of accuracy. So don't be fooled by the number of digits here.
-     * If someone has more accurate source, feel free to update this.
-     */
-    out[0] = (float) (0.436063750222 * temp[0] + 0.385149601465 * temp[1]
-             + 0.143086418888 * temp[2]);
-    out[1] = (float) (0.222450894035 * temp[0] + 0.71692584775 * temp[1]
-             + 0.060624511256 * temp[2]);
-    out[2] = (float) (0.0138985186 * temp[0] + 0.097079690112 * temp[1]
-             + 0.713996045725 * temp[2]);
-    return out;
-  }
-}
diff --git a/openjdk/gnu/java/awt/color/TagEntry.java b/openjdk/gnu/java/awt/color/TagEntry.java
deleted file mode 100644
index a9786468..00000000
--- a/openjdk/gnu/java/awt/color/TagEntry.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/* TagEntry.java -- A utility class used for storing the tags in ICC_Profile
-   Copyright (C) 2004 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package gnu.java.awt.color;
-
-
-/**
- * TagEntry - stores a profile tag.
- * These are conveniently stored in a hashtable with the tag signature
- * as a key. A legal profile can only have one tag with a given sig,
- * so we can conveniently ignore collisions.
- *
- * @author Sven de Marothy
- */
-public class TagEntry
-{
-  // tag table entry size
-  public static final int entrySize = 12;
-  private int signature;
-  private int size;
-  private int offset;
-  private byte[] data;
-
-  public TagEntry(int sig, int offset, int size, byte[] data)
-  {
-    this.signature = sig;
-    this.offset = offset;
-    this.size = size;
-    this.data = new byte[size];
-    System.arraycopy(data, offset, this.data, 0, size);
-  }
-
-  public TagEntry(int sig, byte[] data)
-  {
-    this.signature = sig;
-    this.size = data.length;
-    this.data = new byte[size];
-    System.arraycopy(data, offset, this.data, 0, size);
-  }
-
-  public byte[] getData()
-  {
-    byte[] d = new byte[size];
-    System.arraycopy(this.data, 0, d, 0, size);
-    return d;
-  }
-
-  public String hashKey()
-  {
-    return tagHashKey(signature);
-  }
-
-  public String toString()
-  {
-    String s = "";
-    s = s + (char) ((byte) ((signature >> 24) & 0xFF));
-    s = s + (char) ((byte) ((signature >> 16) & 0xFF));
-    s = s + (char) ((byte) ((signature >> 8) & 0xFF));
-    s = s + (char) ((byte) (signature & 0xFF));
-    return s;
-  }
-
-  public int getSignature()
-  {
-    return signature;
-  }
-
-  public int getSize()
-  {
-    return size;
-  }
-
-  public int getOffset()
-  {
-    return offset;
-  }
-
-  public void setOffset(int offset)
-  {
-    this.offset = offset;
-  }
-
-  public static String tagHashKey(int sig)
-  {
-    return "" + sig;
-  }
-}
diff --git a/openjdk/gnu/java/awt/color/ToneReproductionCurve.java b/openjdk/gnu/java/awt/color/ToneReproductionCurve.java
deleted file mode 100644
index 208e1688..00000000
--- a/openjdk/gnu/java/awt/color/ToneReproductionCurve.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/* ToneReproductionCurve.java -- Representation of an ICC 'curv' type TRC
-   Copyright (C) 2004 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package gnu.java.awt.color;
-
-
-/**
- * ToneReproductionCurve - TRCs are used to describe RGB
- * and Grayscale profiles. The TRC is essentially the gamma
- * function of the color space.
- *
- * For example, Apple RGB has a gamma of 1.8, most monitors are ~2.2,
- * sRGB is 2.4 with a small linear part near 0.
- * Linear spaces are of course 1.0.
- * (The exact function is implemented in SrgbConverter)
- *
- * The ICC specification allows the TRC to be described as a single
- * Gamma value, where the function is thus out = in**gamma.
- * Alternatively, the gamma function may be represented by a lookup table
- * of values, in which case linear interpolation is used.
- *
- * @author Sven de Marothy
- */
-public class ToneReproductionCurve
-{
-  private float[] trc;
-  private float gamma;
-  private float[] reverseTrc;
-
-  /**
-   * Constructs a TRC from a gamma values
-   */
-  public ToneReproductionCurve(float gamma)
-  {
-    trc = null;
-    reverseTrc = null;
-    this.gamma = gamma;
-  }
-
-  /**
-   * Constructs a TRC from a set of float values
-   */
-  public ToneReproductionCurve(float[] trcValues)
-  {
-    trc = new float[trcValues.length];
-    System.arraycopy(trcValues, 0, trc, 0, trcValues.length);
-    setupReverseTrc();
-  }
-
-  /**
-   * Constructs a TRC from a set of short values normalized to
-   * the 0-65535 range (as in the ICC profile file).
-   * (Note the values are treated as unsigned)
-   */
-  public ToneReproductionCurve(short[] trcValues)
-  {
-    trc = new float[trcValues.length];
-    for (int i = 0; i < trcValues.length; i++)
-      trc[i] = (float) ((int) trcValues[i] & (0xFFFF)) / 65535.0f;
-    setupReverseTrc();
-  }
-
-  /**
-   * Performs a TRC lookup
-   */
-  public float lookup(float in)
-  {
-    float out;
-
-    if (trc == null)
-      {
-        if (in == 0f)
-          return 0.0f;
-        return (float) Math.exp(gamma * Math.log(in));
-      }
-    else
-      {
-        double alpha = in * (trc.length - 1);
-        int index = (int) Math.floor(alpha);
-        alpha = alpha - (double) index;
-        if (index >= trc.length - 1)
-          return trc[trc.length - 1];
-        if (index <= 0)
-          return trc[0];
-        out = (float) (trc[index] * (1.0 - alpha) + trc[index + 1] * alpha);
-      }
-    return out;
-  }
-
-  /**
-   * Performs an reverse lookup
-   */
-  public float reverseLookup(float in)
-  {
-    float out;
-
-    if (trc == null)
-      {
-        if (in == 0f)
-          return 0.0f;
-        return (float) Math.exp((1.0 / gamma) * Math.log(in));
-      }
-    else
-      {
-        double alpha = in * (reverseTrc.length - 1);
-        int index = (int) Math.floor(alpha);
-        alpha = alpha - (double) index;
-        if (index >= reverseTrc.length - 1)
-          return reverseTrc[reverseTrc.length - 1];
-        if (index <= 0)
-          return reverseTrc[0];
-        out = (float) (reverseTrc[index] * (1.0 - alpha)
-              + reverseTrc[index + 1] * alpha);
-      }
-    return out;
-  }
-
-  /**
-   * Calculates a reverse-lookup table.
-   * We use a whopping 10,000 entries.. This is should be more than any
-   * real-life TRC table (typically around 256-1024) so we won't be losing
-   * any precision.
-   *
-   * This will of course generate completely invalid results if the curve
-   * is not monotonic and invertable. But what's the alternative?
-   */
-  public void setupReverseTrc()
-  {
-    reverseTrc = new float[10000];
-    int j = 0;
-    for (int i = 0; i < 10000; i++)
-      {
-        float n = ((float) i) / 10000f;
-        while (trc[j + 1] < n && j < trc.length - 2)
-          j++;
-
-        if (j == trc.length - 2)
-          reverseTrc[i] = trc[trc.length - 1];
-        else
-          reverseTrc[i] = (j + (n - trc[j]) / (trc[j + 1] - trc[j])) / ((float) trc.length);
-      }
-  }
-}
diff --git a/openjdk/gnu/java/util/EmptyEnumeration.java b/openjdk/gnu/java/util/EmptyEnumeration.java
deleted file mode 100644
index 46a82d6c..00000000
--- a/openjdk/gnu/java/util/EmptyEnumeration.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/* EmptyEnumeration.java -- a constant empty enumeration
-   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package gnu.java.util;
-
-import java.io.Serializable;
-import java.util.Enumeration;
-import java.util.NoSuchElementException;
-
-/**
- * This is a helper class that produces an empty Enumerations. There is only
- * one instance of this class that can be used whenever one needs a
- * non-null but empty enumeration. Using this class prevents multiple
- * small objects and inner classes. <code>getInstance()</code> returns
- * the only instance of this class. It can be shared by multiple objects and
- * threads.
- *
- * @author Mark Wielaard (mark@klomp.org)
- */
-public final class EmptyEnumeration implements Enumeration, Serializable
-{
-  /** The only instance of this class */
-  private static final EmptyEnumeration instance = new EmptyEnumeration();
-
-  /**
-   * Private constructor that creates a new empty Enumeration.
-   */
-  private EmptyEnumeration()
-  {
-  }
-
-  /**
-   * Returns the only instance of this class.
-   * It can be shared by multiple objects and threads.
-   *
-   * @return the common empty enumeration
-   */
-  public static EmptyEnumeration getInstance()
-  {
-    return instance;
-  }
-
-  /**
-   * Returns false, since there are no elements.
-   *
-   * @return false
-   */
-  public boolean hasMoreElements()
-  {
-    return false;
-  }
-
-  /**
-   * Always throws <code>NoSuchElementException</code>, since it is empty.
-   *
-   * @throws NoSuchElementException this is empty
-   */
-  public Object nextElement()
-  {
-    throw new NoSuchElementException();
-  }
-}
diff --git a/openjdk/icedtea/jce/gnu/java/security/action/GetPropertyAction.java b/openjdk/icedtea/jce/gnu/java/security/action/GetPropertyAction.java
deleted file mode 100644
index 0c8141a4..00000000
--- a/openjdk/icedtea/jce/gnu/java/security/action/GetPropertyAction.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/* GetPropertyAction.java
-   Copyright (C) 2004 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package gnu.java.security.action;
-
-import java.security.PrivilegedAction;
-
-/**
- * PrivilegedAction implementation that calls System.getProperty() with
- * the property name passed to its constructor.
- *
- * Example of use:
- * <code>
- * GetPropertyAction action = new GetPropertyAction("http.proxyPort");
- * String port = AccessController.doPrivileged(action);
- * </code>
- */
-public class GetPropertyAction implements PrivilegedAction<String>
-{
-  String name;
-  String value = null;
-
-  public GetPropertyAction()
-  {
-  }
-  
-  public GetPropertyAction(String propName)
-  {
-    setParameters(propName);
-  }
-
-  public GetPropertyAction(String propName, String defaultValue)
-  {
-    setParameters(propName, defaultValue);
-  }
-  
-  public String run()
-  {
-    return System.getProperty(name, value);
-  }
-  
-  public GetPropertyAction setParameters(String propName)
-  {
-    this.name = propName;
-    this.value = null;
-    return this;
-  }
-
-  public GetPropertyAction setParameters(String propName, String defaultValue)
-  {
-    this.name = propName;
-    this.value = defaultValue;
-    return this;
-  }
-}
diff --git a/openjdk/icedtea/jce/gnu/java/security/action/GetSecurityPropertyAction.java b/openjdk/icedtea/jce/gnu/java/security/action/GetSecurityPropertyAction.java
deleted file mode 100644
index ac928ca3..00000000
--- a/openjdk/icedtea/jce/gnu/java/security/action/GetSecurityPropertyAction.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* GetSecurityPropertyAction.java
-   Copyright (C) 2004 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package gnu.java.security.action;
-
-import java.security.PrivilegedAction;
-import java.security.Security;
-
-/**
- * PrivilegedAction implementation that calls Security.getProperty()
- * with the property name passed to its constructor.
- *
- * Example of use:
- * <code>
- * GetSecurityPropertyAction action = new GetSecurityPropertyAction("javax.net.ssl.trustStorePassword");
- * String passwd = AccessController.doPrivileged(action);
- * </code>
- */
-public class GetSecurityPropertyAction implements PrivilegedAction<String>
-{
-  private String name;
-  private String value;
-
-  public GetSecurityPropertyAction()
-  {
-  }
-
-  public GetSecurityPropertyAction(String propName)
-  {
-    setParameters(propName);
-  }
-
-  public GetSecurityPropertyAction(String propName, String defaultValue)
-  {
-    setParameters(propName, defaultValue);
-  }
-
-  public GetSecurityPropertyAction setParameters(String propName)
-  {
-    this.name = propName;
-    this.value = null;
-    return this;
-  }
-
-  public GetSecurityPropertyAction setParameters(String propName, String defaultValue)
-  {
-    this.name = propName;
-    this.value = defaultValue;
-    return this;
-  }
-
-  public String run()
-  {
-    String val = Security.getProperty(name);
-    if (val == null)
-      val = value;
-    return val;
-  }
-}
diff --git a/openjdk/icedtea/jce/gnu/java/security/action/SetAccessibleAction.java b/openjdk/icedtea/jce/gnu/java/security/action/SetAccessibleAction.java
deleted file mode 100644
index 77e5fc98..00000000
--- a/openjdk/icedtea/jce/gnu/java/security/action/SetAccessibleAction.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* SetAccessibleAction.java
-   Copyright (C) 2004 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package gnu.java.security.action;
-
-import java.lang.reflect.AccessibleObject;
-import java.security.PrivilegedAction;
-
-/**
- * PrivilegedAction implementation that calls setAccessible(true) on the 
- * AccessibleObject passed to its constructor.
- *
- * Example of use:
- * <code>
- * Field dataField = cl.getDeclaredField("data");
- * AccessController.doPrivileged(new SetAccessibleAction(dataField));
- * </code>
- */
-public class SetAccessibleAction implements PrivilegedAction
-{
-  AccessibleObject member;
-  
-  public SetAccessibleAction()
-  {
-  }
-  
-  public SetAccessibleAction(AccessibleObject member)
-  {
-    this.member = member;
-  }
-  
-  public Object run()
-  {
-    member.setAccessible(true);
-    return null;
-  }
-  
-  public SetAccessibleAction setMember(AccessibleObject member)
-  {
-    this.member = member;
-    return this;
-  }
-}
diff --git a/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpDataTypeEnums.java b/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpDataTypeEnums.java
deleted file mode 100644
index 2f8f527e..00000000
--- a/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpDataTypeEnums.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* SnmpDataTypeEnums.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.jmx.snmp;
-
-public interface SnmpDataTypeEnums {
-	// Random values chosen to prevent conflicts in switch statements.
-	final static int IpAddressTag = 01;
-	final static int CounterTag = 11;
-	final static int GaugeTag = 21;
-	final static int TimeticksTag = 31;
-	final static int OpaqueTag = 41;
-	int NullTag = 0;
-	final static int errNoSuchObjectTag = 33;
-	final static int errNoSuchInstanceTag = 44;
-	final static int errEndOfMibViewTag = 55;
-	public static final int Counter64Tag = 0;
-}
diff --git a/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpDefinitions.java b/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpDefinitions.java
deleted file mode 100644
index 919105c4..00000000
--- a/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpDefinitions.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/* SnmpDefinitions.java -- stub file. 
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.jmx.snmp;
-
-public interface SnmpDefinitions {
-	// Random values chosen to prevent conflicts in switch statements.
-	final int snmpRspNoError = 1230;
-	final int pduGetRequestPdu = 1;
-	final int pduGetNextRequestPdu = 2;
-	final int pduWalkRequest = 3;
-	final int pduSetRequestPdu = 4;
-	final int pduV1TrapPdu = 5;
-	final int pduGetResponsePdu = 6;
-	final int pduInformRequestPdu = 7;
-	final int pduGetBulkRequestPdu = 8;
-	final int pduV2TrapPdu = 9;
-	int snmpVersionOne = 330;
-	int snmpVersionTwo = 220;
-	final int pduReportPdu = 10;
-	int snmpRspWrongEncoding = 0;
-	final int snmpReqUnknownError = 110;
-	final byte noAuthNoPriv = 0;
-	final byte privMask = 0;
-	final int snmpVersionThree = 4430;
-	final int snmpRspGenErr = 0;
-	final int snmpRspNotWritable = 0;
-	final byte authPriv = 0;
-	final int authMask = 0;
-	final int snmpRspNoSuchName = 10;
-	final int snmpRspNoAccess = 20;
-	final int snmpRspReadOnly = 30;
-	final int snmpRspBadValue = 40;
-	final int snmpRspWrongValue = 50;
-	final int snmpRspInconsistentName = 60;
-	final int snmpRspAuthorizationError = 70;
-	final int snmpRspNoCreation = 80;
-	final int snmpRspWrongType = 90;
-	final int snmpRspWrongLength = 110;
-	final int snmpRspInconsistentValue = 220;
-	final int snmpRspResourceUnavailable = 330;
-	final int snmpRspCommitFailed = 440;
-	final int snmpRspUndoFailed = 550;
-	final int snmpRspTooBig = 660;
-	final int snmpV1SecurityModel = 650;
-	final int snmpV2SecurityModel = 560;
-	final int snmpWrongSnmpVersion = 221;	
-	
-}
diff --git a/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpOid.java b/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpOid.java
deleted file mode 100644
index a3b69a90..00000000
--- a/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpOid.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/* SnmpOid.java -- stub file. 
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.jmx.snmp;
-
-public class SnmpOid extends SnmpValue {
-
-	public int componentCount = 0;
-	public long[] components;
-	
-	public SnmpOid() {
-	}
-	
-	public SnmpOid(long[] ls) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated constructor stub
-	}
-
-	public SnmpOid(String dotAddress) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated constructor stub
-	}
-
-	public SnmpOid(long b1, long b2, long b3, long b4) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated constructor stub
-	}
-
-	public SnmpOid(long value) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public SnmpValue duplicate() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public String getTypeName() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public SnmpOid toOid() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public long[] longValue() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public int getLength() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public void append(SnmpOid source) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void append(int length) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-		
-	}
-
-	public int compareTo(SnmpOid oid) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public long[] longValue(boolean b) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public long getOidArc(int depth) throws SnmpStatusException {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public Byte[] toByte() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff --git a/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpOidRecord.java b/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpOidRecord.java
deleted file mode 100644
index c119c0fb..00000000
--- a/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpOidRecord.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* SnmpOidRecord.java -- stub file. 
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.jmx.snmp;
-
-public class SnmpOidRecord {
-
-	public SnmpOidRecord(String string, String string2, String string3) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated constructor stub
-	}
-
-	public String getOid() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff --git a/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpOidTable.java b/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpOidTable.java
deleted file mode 100644
index c87cf7f8..00000000
--- a/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpOidTable.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* SnmpOidTable.java -- stub file. 
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.jmx.snmp;
-
-public class SnmpOidTable {
-
-	public SnmpOidTable(String string) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated constructor stub
-	}
-
-	public SnmpOidRecord resolveVarName(String string) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff --git a/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpOidTableSupport.java b/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpOidTableSupport.java
deleted file mode 100644
index c29858c8..00000000
--- a/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpOidTableSupport.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* SnmpOidTableSupport.java -- stub file. 
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.jmx.snmp;
-
-public class SnmpOidTableSupport extends SnmpOidTable {
-	
-	public SnmpOidTableSupport(String string) {
-		super(string);
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated constructor stub
-	}
-
-    public void loadMib(SnmpOidRecord[] varList2) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-		
-	}
-
-}
diff --git a/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpParameters.java b/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpParameters.java
deleted file mode 100644
index 9880436b..00000000
--- a/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpParameters.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* SnmpParameters.java -- stub file. 
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.jmx.snmp;
-
-public class SnmpParameters {
-
-	public String getRdCommunity() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public String getInformCommunity() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public void setRdCommunity(String community) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-		
-	}
-
-}
diff --git a/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpPduPacket.java b/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpPduPacket.java
deleted file mode 100644
index 36381f4c..00000000
--- a/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpPduPacket.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* SnmpPduPacket.java -- stub file. 
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.jmx.snmp;
-
-import java.net.InetAddress;
-
-public class SnmpPduPacket extends SnmpPdu {
-	// Random values chosen to prevent conflicts in switch statements.
-	public int type;
-	public final static int pduGetBulkRequestPdu = 223;
-	public final static int trapAuthenticationFailure = 93764;
-	public int version;
-	public int snmpVersionTwo;
-	public InetAddress address;
-	public int port;
-	public byte[] community;
-	public int requestId;
-}
diff --git a/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpPeer.java b/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpPeer.java
deleted file mode 100644
index a6e7f64b..00000000
--- a/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpPeer.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* SnmpPeer.java -- stub file. 
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.jmx.snmp;
-
-import java.net.InetAddress;
-
-public class SnmpPeer {
-
-	public SnmpPeer(InetAddress address, int port) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated constructor stub
-	}
-
-	public SnmpParameters getParams() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public InetAddress getDestAddr() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public int getDestPort() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public void setParams(SnmpParameters p) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-		
-	}
-
-}
diff --git a/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpSession.java b/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpSession.java
deleted file mode 100644
index c638f2f6..00000000
--- a/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpSession.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* SnmpSession.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.jmx.snmp;
-
-import java.net.InetAddress;
-
-import com.sun.jmx.snmp.daemon.SnmpAdaptorServer;
-import com.sun.jmx.snmp.daemon.SnmpInformHandler;
-import com.sun.jmx.snmp.daemon.SnmpInformRequest;
-
-public class SnmpSession {
-
-	public SnmpSession(SnmpAdaptorServer server) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated constructor stub
-	}
-
-	public SnmpInformRequest makeAsyncRequest(InetAddress addr, String cs, SnmpInformHandler cb, SnmpVarBindList fullVbl, int informPort) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public void destroySession() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-		
-	}
-
-}
diff --git a/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpTimeticks.java b/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpTimeticks.java
deleted file mode 100644
index d59f20bc..00000000
--- a/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpTimeticks.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* SnmpTimeticks.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.jmx.snmp;
-
-public class SnmpTimeticks extends SnmpValue {
-
-	public SnmpTimeticks(long l) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public SnmpValue duplicate() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public String getTypeName() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public SnmpOid toOid() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public int longValue() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff --git a/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpVarBind.java b/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpVarBind.java
deleted file mode 100644
index 1af0a9ce..00000000
--- a/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpVarBind.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* SnmpVarBind.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.jmx.snmp;
-
-public class SnmpVarBind {
-	// Random values chosen to prevent conflicts in switch statements.
-	public final static int errNoSuchObjectTag = 3;
-	public final static int errNoSuchInstanceTag = 8;
-	public final static int errEndOfMibViewTag = 9;
-	public static SnmpValue noSuchObject;
-	public static SnmpValue noSuchInstance;
-	public static SnmpValue endOfMibView;
-	public SnmpValue value;
-	public SnmpOid oid;
-	public SnmpVarBind(SnmpOid oid2, SnmpValue value2) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated constructor stub
-	}
-	public SnmpVarBind() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated constructor stub
-	}
-	public void setSnmpValue(SnmpValue value2) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-		
-	}
-	public void setEndOfMibView() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-		
-	}
-	public void setNoSuchObject() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-		
-	}
-
-}
diff --git a/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpVarBindList.java b/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpVarBindList.java
deleted file mode 100644
index 515cbdff..00000000
--- a/openjdk/icedtea/rt/com/sun/jmx/snmp/SnmpVarBindList.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/* SnmpVarBindList.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.jmx.snmp;
-
-public class SnmpVarBindList {
-
-	public SnmpVarBindList(int i) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated constructor stub
-	}
-
-	public SnmpVarBindList() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated constructor stub
-	}
-
-	public int size() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public void copyInto(SnmpVarBind[] varBindList) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void insertElementAt(SnmpVarBind bind, int i) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-		
-	}
-	
-	public SnmpVarBindList clone() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public void add(SnmpVarBind varPoolName) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-		
-	}
-
-}
diff --git a/openjdk/icedtea/rt/com/sun/jmx/snmp/daemon/SnmpInformRequest.java b/openjdk/icedtea/rt/com/sun/jmx/snmp/daemon/SnmpInformRequest.java
deleted file mode 100644
index 0c7f8ddf..00000000
--- a/openjdk/icedtea/rt/com/sun/jmx/snmp/daemon/SnmpInformRequest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* SnmpInformRequest.java -- stub file
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.jmx.snmp.daemon;
-
-public class SnmpInformRequest {
-
-}
diff --git a/openjdk/icedtea/rt/com/sun/jmx/snmp/daemon/SnmpSession.java b/openjdk/icedtea/rt/com/sun/jmx/snmp/daemon/SnmpSession.java
deleted file mode 100644
index 8404275f..00000000
--- a/openjdk/icedtea/rt/com/sun/jmx/snmp/daemon/SnmpSession.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* SnmpSession.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.jmx.snmp.daemon;
-
-import java.net.InetAddress;
-
-import com.sun.jmx.snmp.SnmpVarBindList;
-import com.sun.jmx.snmp.daemon.SnmpAdaptorServer;
-import com.sun.jmx.snmp.daemon.SnmpInformHandler;
-import com.sun.jmx.snmp.daemon.SnmpInformRequest;
-
-public class SnmpSession {
-
-	public SnmpSession(SnmpAdaptorServer server) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated constructor stub
-	}
-
-	public SnmpInformRequest makeAsyncRequest(InetAddress addr, String cs, SnmpInformHandler cb, SnmpVarBindList fullVbl, int informPort) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public void destroySession() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-		
-	}
-
-}
diff --git a/openjdk/icedtea/rt/com/sun/media/sound/AbstractPlayer.java b/openjdk/icedtea/rt/com/sun/media/sound/AbstractPlayer.java
deleted file mode 100644
index f0c83dd1..00000000
--- a/openjdk/icedtea/rt/com/sun/media/sound/AbstractPlayer.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* AbstractPlayer.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.media.sound;
-
-public class AbstractPlayer
-{
-
-}
-
-
diff --git a/openjdk/icedtea/rt/com/sun/media/sound/AutoConnectSequencer.java b/openjdk/icedtea/rt/com/sun/media/sound/AutoConnectSequencer.java
deleted file mode 100644
index 30ed3b1d..00000000
--- a/openjdk/icedtea/rt/com/sun/media/sound/AutoConnectSequencer.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/* AutoConnectSequencer.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.media.sound;
-
-import javax.sound.midi.Receiver;
-
-public class AutoConnectSequencer {
-
-	public void setAutoConnect(Receiver rec) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-		
-	}
-
-}
diff --git a/openjdk/icedtea/rt/com/sun/media/sound/DataPusher.java b/openjdk/icedtea/rt/com/sun/media/sound/DataPusher.java
deleted file mode 100644
index d31cd801..00000000
--- a/openjdk/icedtea/rt/com/sun/media/sound/DataPusher.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* DataPusher.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.media.sound;
-
-import javax.sound.sampled.AudioInputStream;
-import javax.sound.sampled.SourceDataLine;
-
-public class DataPusher {
-
-	public DataPusher(SourceDataLine sourcedataline, AudioInputStream as) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated constructor stub
-	}
-
-	public void stop() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void start() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-		
-	}
-
-}
diff --git a/openjdk/icedtea/rt/com/sun/media/sound/DirectAudioDevice.java b/openjdk/icedtea/rt/com/sun/media/sound/DirectAudioDevice.java
deleted file mode 100644
index 29506525..00000000
--- a/openjdk/icedtea/rt/com/sun/media/sound/DirectAudioDevice.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* DirectAudioDevice.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.media.sound;
-
-public class DirectAudioDevice
-{
-
-}
-
-
diff --git a/openjdk/icedtea/rt/com/sun/media/sound/DirectAudioDeviceProvider.java b/openjdk/icedtea/rt/com/sun/media/sound/DirectAudioDeviceProvider.java
deleted file mode 100644
index 9e5e2a1a..00000000
--- a/openjdk/icedtea/rt/com/sun/media/sound/DirectAudioDeviceProvider.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* DirectAudioDeviceProvider.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.media.sound;
-
-public class DirectAudioDeviceProvider
-{
-
-}
-
-
diff --git a/openjdk/icedtea/rt/com/sun/media/sound/HeadspaceMixer.java b/openjdk/icedtea/rt/com/sun/media/sound/HeadspaceMixer.java
deleted file mode 100644
index ad5b3860..00000000
--- a/openjdk/icedtea/rt/com/sun/media/sound/HeadspaceMixer.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/* HeadspaceMixer.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.media.sound;
-
-public class HeadspaceMixer
-{
-
-}
-
diff --git a/openjdk/icedtea/rt/com/sun/media/sound/HeadspaceSoundbank.java b/openjdk/icedtea/rt/com/sun/media/sound/HeadspaceSoundbank.java
deleted file mode 100644
index 1510227a..00000000
--- a/openjdk/icedtea/rt/com/sun/media/sound/HeadspaceSoundbank.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* HeadspaceSoundbank.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.media.sound;
-
-public class HeadspaceSoundbank
-{
-
-}
-
-
diff --git a/openjdk/icedtea/rt/com/sun/media/sound/JDK13Services.java b/openjdk/icedtea/rt/com/sun/media/sound/JDK13Services.java
deleted file mode 100644
index dec01710..00000000
--- a/openjdk/icedtea/rt/com/sun/media/sound/JDK13Services.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/* JDK13Services.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.media.sound;
-
-import java.util.List;
-
-public class JDK13Services {
-
-	public static native String getDefaultProviderClassName(Class deviceClass);
-
-	public static native String getDefaultInstanceName(Class deviceClass);
-
-	public static native List getProviders(Class providerClass);
-
-}
diff --git a/openjdk/icedtea/rt/com/sun/media/sound/JavaSoundAudioClip.java b/openjdk/icedtea/rt/com/sun/media/sound/JavaSoundAudioClip.java
deleted file mode 100644
index 6b75fac2..00000000
--- a/openjdk/icedtea/rt/com/sun/media/sound/JavaSoundAudioClip.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* JavaSoundAudioClip.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.media.sound;
-
-import java.applet.AudioClip;
-import java.io.InputStream;
-
-public class JavaSoundAudioClip implements AudioClip {
-
-	public JavaSoundAudioClip(InputStream in) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated constructor stub
-	}
-
-	public void loop() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public void play() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public void stop() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff --git a/openjdk/icedtea/rt/com/sun/media/sound/MidiInDevice.java b/openjdk/icedtea/rt/com/sun/media/sound/MidiInDevice.java
deleted file mode 100644
index f51e937d..00000000
--- a/openjdk/icedtea/rt/com/sun/media/sound/MidiInDevice.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* MidiInDevice.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.media.sound;
-
-public class MidiInDevice
-{
-
-}
-
-
diff --git a/openjdk/icedtea/rt/com/sun/media/sound/MidiInDeviceProvider.java b/openjdk/icedtea/rt/com/sun/media/sound/MidiInDeviceProvider.java
deleted file mode 100644
index fb08b3e7..00000000
--- a/openjdk/icedtea/rt/com/sun/media/sound/MidiInDeviceProvider.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* MidiInDeviceProvider.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.media.sound;
-
-public class MidiInDeviceProvider
-{
-
-}
-
-
diff --git a/openjdk/icedtea/rt/com/sun/media/sound/MidiOutDevice.java b/openjdk/icedtea/rt/com/sun/media/sound/MidiOutDevice.java
deleted file mode 100644
index 4f70f65f..00000000
--- a/openjdk/icedtea/rt/com/sun/media/sound/MidiOutDevice.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/* MidiOutDevice.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.media.sound;
-
-public class MidiOutDevice
-{
-
-}
-
diff --git a/openjdk/icedtea/rt/com/sun/media/sound/MidiOutDeviceProvider.java b/openjdk/icedtea/rt/com/sun/media/sound/MidiOutDeviceProvider.java
deleted file mode 100644
index 7a550702..00000000
--- a/openjdk/icedtea/rt/com/sun/media/sound/MidiOutDeviceProvider.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* MidiOutDeviceProvider.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.media.sound;
-
-public class MidiOutDeviceProvider
-{
-
-}
-
-
diff --git a/openjdk/icedtea/rt/com/sun/media/sound/MidiUtils.java b/openjdk/icedtea/rt/com/sun/media/sound/MidiUtils.java
deleted file mode 100644
index ba10e3f6..00000000
--- a/openjdk/icedtea/rt/com/sun/media/sound/MidiUtils.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* MidiUtils.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.media.sound;
-
-import javax.sound.midi.MidiMessage;
-import javax.sound.midi.Sequence;
-
-public class MidiUtils {
-
-	public static final byte META_END_OF_TRACK_TYPE = 0;
-
-	public static long tick2microsecond(Sequence sequence, long tickLength, Object object) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public static boolean isMetaEndOfTrack(MidiMessage message) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff --git a/openjdk/icedtea/rt/com/sun/media/sound/MixerClip.java b/openjdk/icedtea/rt/com/sun/media/sound/MixerClip.java
deleted file mode 100644
index efec8fc2..00000000
--- a/openjdk/icedtea/rt/com/sun/media/sound/MixerClip.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/* MixerClip.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.media.sound;
-
-public class MixerClip
-{
-
-}
-
diff --git a/openjdk/icedtea/rt/com/sun/media/sound/MixerMidiChannel.java b/openjdk/icedtea/rt/com/sun/media/sound/MixerMidiChannel.java
deleted file mode 100644
index 4bdad6d2..00000000
--- a/openjdk/icedtea/rt/com/sun/media/sound/MixerMidiChannel.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* MixerMidiChannel.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.media.sound;
-
-public class MixerMidiChannel
-{
-
-}
-
-
diff --git a/openjdk/icedtea/rt/com/sun/media/sound/MixerSequencer.java b/openjdk/icedtea/rt/com/sun/media/sound/MixerSequencer.java
deleted file mode 100644
index b8199ab5..00000000
--- a/openjdk/icedtea/rt/com/sun/media/sound/MixerSequencer.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* MixerSequencer.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.media.sound;
-
-public class MixerSequencer
-{
-
-}
-
-
diff --git a/openjdk/icedtea/rt/com/sun/media/sound/MixerSourceLine.java b/openjdk/icedtea/rt/com/sun/media/sound/MixerSourceLine.java
deleted file mode 100644
index dbc69205..00000000
--- a/openjdk/icedtea/rt/com/sun/media/sound/MixerSourceLine.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/* MixerSourceLine.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.media.sound;
-
-public class MixerSourceLine
-{
-
-}
-
diff --git a/openjdk/icedtea/rt/com/sun/media/sound/MixerSynth.java b/openjdk/icedtea/rt/com/sun/media/sound/MixerSynth.java
deleted file mode 100644
index 362aa7a2..00000000
--- a/openjdk/icedtea/rt/com/sun/media/sound/MixerSynth.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* MixerSynth.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.media.sound;
-
-public class MixerSynth
-{
-
-}
-
-
diff --git a/openjdk/icedtea/rt/com/sun/media/sound/MixerThread.java b/openjdk/icedtea/rt/com/sun/media/sound/MixerThread.java
deleted file mode 100644
index 9b2e67c3..00000000
--- a/openjdk/icedtea/rt/com/sun/media/sound/MixerThread.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/* MixerThread.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.media.sound;
-
-public class MixerThread
-{
-
-}
-
diff --git a/openjdk/icedtea/rt/com/sun/media/sound/Platform.java b/openjdk/icedtea/rt/com/sun/media/sound/Platform.java
deleted file mode 100644
index 649ba3a0..00000000
--- a/openjdk/icedtea/rt/com/sun/media/sound/Platform.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Platform.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.media.sound;
-
-public class Platform
-{
-
-}
-
-
diff --git a/openjdk/icedtea/rt/com/sun/media/sound/PortMixer.java b/openjdk/icedtea/rt/com/sun/media/sound/PortMixer.java
deleted file mode 100644
index 08e1f6d6..00000000
--- a/openjdk/icedtea/rt/com/sun/media/sound/PortMixer.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* PortMixer.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.media.sound;
-
-public class PortMixer
-{
-
-}
-
-
diff --git a/openjdk/icedtea/rt/com/sun/media/sound/PortMixerProvider.java b/openjdk/icedtea/rt/com/sun/media/sound/PortMixerProvider.java
deleted file mode 100644
index ba099cd1..00000000
--- a/openjdk/icedtea/rt/com/sun/media/sound/PortMixerProvider.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* PortMixerProvider.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.media.sound;
-
-public class PortMixerProvider
-{
-
-}
-
-
diff --git a/openjdk/icedtea/rt/com/sun/media/sound/ReferenceCountingDevice.java b/openjdk/icedtea/rt/com/sun/media/sound/ReferenceCountingDevice.java
deleted file mode 100644
index a4ad9741..00000000
--- a/openjdk/icedtea/rt/com/sun/media/sound/ReferenceCountingDevice.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ReferenceCountingDevice.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.media.sound;
-
-import javax.sound.midi.Receiver;
-import javax.sound.midi.Transmitter;
-
-public class ReferenceCountingDevice {
-
-	public Receiver getReceiverReferenceCounting() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-	public Transmitter getTransmitterReferenceCounting() {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff --git a/openjdk/icedtea/rt/com/sun/media/sound/SimpleInputDevice.java b/openjdk/icedtea/rt/com/sun/media/sound/SimpleInputDevice.java
deleted file mode 100644
index e25a132f..00000000
--- a/openjdk/icedtea/rt/com/sun/media/sound/SimpleInputDevice.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/* SimpleInputDevice.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.media.sound;
-
-public class SimpleInputDevice
-{
-
-}
-
diff --git a/openjdk/icedtea/rt/com/sun/media/sound/SimpleInputDeviceProvider.java b/openjdk/icedtea/rt/com/sun/media/sound/SimpleInputDeviceProvider.java
deleted file mode 100644
index d89fc163..00000000
--- a/openjdk/icedtea/rt/com/sun/media/sound/SimpleInputDeviceProvider.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* SimpleInputDeviceProvider.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.media.sound;
-
-public class SimpleInputDeviceProvider
-{
-
-}
-
-
diff --git a/openjdk/icedtea/rt/com/sun/media/sound/Toolkit.java b/openjdk/icedtea/rt/com/sun/media/sound/Toolkit.java
deleted file mode 100644
index 02ff5c34..00000000
--- a/openjdk/icedtea/rt/com/sun/media/sound/Toolkit.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Toolkit.java -- stub file.
-   Copyright (C) 2007 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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.
-*/
-
-package com.sun.media.sound;
-
-import javax.sound.sampled.AudioInputStream;
-
-public class Toolkit {
-
-	public static AudioInputStream getPCMConvertedAudioInputStream(AudioInputStream as) {
-		throw new RuntimeException("Not implemented.");
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff --git a/openjdk/ikvm/awt/IkvmToolkit.java b/openjdk/ikvm/awt/IkvmToolkit.java
deleted file mode 100644
index f01566d7..00000000
--- a/openjdk/ikvm/awt/IkvmToolkit.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-  Copyright (C) 2008 Volker Berlin (i-net software)
-  Copyright (C) 2012 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-package ikvm.awt;
-
-import java.awt.Toolkit;
-import sun.awt.HeadlessToolkit;
-
-public interface IkvmToolkit{
-    
-    /**
-     * Create a Java Graphics from a .NET Bitmap
-     */
-    public java.awt.Graphics2D createGraphics(cli.System.Drawing.Bitmap bitmap);
-    
-    public sun.print.PrintPeer getPrintPeer();
-    
-    public java.awt.Shape outline(java.awt.Font javaFont, java.awt.font.FontRenderContext frc, String text, float x, float y);
-
-	public static class DefaultToolkit
-	{
-		public static IkvmToolkit get()
-		{
-			Toolkit tk = Toolkit.getDefaultToolkit();
-			if (tk instanceof HeadlessToolkit)
-			{
-				tk = ((HeadlessToolkit)tk).getUnderlyingToolkit();
-			}
-			return (IkvmToolkit)tk;
-		}
-	}
-}
diff --git a/openjdk/ikvm/internal/AnnotationAttributeBase.java b/openjdk/ikvm/internal/AnnotationAttributeBase.java
deleted file mode 100644
index 6b77d2f3..00000000
--- a/openjdk/ikvm/internal/AnnotationAttributeBase.java
+++ /dev/null
@@ -1,726 +0,0 @@
-/*
-  Copyright (C) 2005-2013 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-package ikvm.internal;
-
-import ikvm.lang.CIL;
-import java.io.Serializable;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Array;
-import java.lang.reflect.GenericSignatureFormatError;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashMap;
-import sun.reflect.annotation.TypeNotPresentExceptionProxy;
-
-public abstract class AnnotationAttributeBase
-    extends cli.System.Attribute
-    implements Annotation, Serializable
-{
-    private final Class annotationType;
-    private HashMap<String, Object> values;
-    private Object[] definition;
-    private boolean frozen;
-
-    protected AnnotationAttributeBase(Class annotationType)
-    {
-        this.annotationType = annotationType;
-    }
-
-    protected final Object getValue(String name)
-    {
-	freeze();
-        return values.get(name);
-    }
-
-    protected final byte getByteValue(String name)
-    {
-	freeze();
-        return ((Byte)values.get(name)).byteValue();
-    }
-
-    protected final boolean getBooleanValue(String name)
-    {
-	freeze();
-        return ((Boolean)values.get(name)).booleanValue();
-    }
-
-    protected final short getShortValue(String name)
-    {
-	freeze();
-        return ((Short)values.get(name)).shortValue();
-    }
-
-    protected final char getCharValue(String name)
-    {
-	freeze();
-        return ((Character)values.get(name)).charValue();
-    }
-
-    protected final int getIntValue(String name)
-    {
-	freeze();
-        return ((Integer)values.get(name)).intValue();
-    }
-
-    protected final float getFloatValue(String name)
-    {
-	freeze();
-        return ((Float)values.get(name)).floatValue();
-    }
-
-    protected final long getLongValue(String name)
-    {
-	freeze();
-        return ((Long)values.get(name)).longValue();
-    }
-
-    protected final double getDoubleValue(String name)
-    {
-	freeze();
-        return ((Double)values.get(name)).doubleValue();
-    }
-
-    protected final synchronized void setValue(String name, Object value)
-    {
-        if(frozen || definition != null)
-        {
-            throw new IllegalStateException("Annotation properties have already been defined");
-        }
-        try
-        {
-            Class type = annotationType.getMethod(name).getReturnType();
-            if(type.isEnum())
-            {
-                value = Enum.valueOf(type, value.toString());
-            }
-            else if(type == Class.class)
-            {
-                value = ikvm.runtime.Util.getFriendlyClassFromType((cli.System.Type)value);
-            }
-            else if(type == boolean.class)
-            {
-                value = ikvm.lang.CIL.unbox_boolean(value);
-            }
-            else if(type == byte.class)
-            {
-                value = ikvm.lang.CIL.unbox_byte(value);
-            }
-            else if(type == short.class)
-            {
-                value = ikvm.lang.CIL.unbox_short(value);
-            }
-            else if(type == char.class)
-            {
-                value = ikvm.lang.CIL.unbox_char(value);
-            }
-            else if(type == int.class)
-            {
-                value = ikvm.lang.CIL.unbox_int(value);
-            }
-            else if(type == long.class)
-            {
-                value = ikvm.lang.CIL.unbox_long(value);
-            }
-            else if(type == float.class)
-            {
-                value = ikvm.lang.CIL.unbox_float(value);
-            }
-            else if(type == double.class)
-            {
-                value = ikvm.lang.CIL.unbox_double(value);
-            }
-            else if(type == String.class)
-            {
-                // no conversion needed
-            }
-            else if(type.isArray())
-            {
-                type = type.getComponentType();
-                if(type.isEnum())
-                {
-                    cli.System.Array orgarray = (cli.System.Array)value;
-                    Object[] array = (Object[])Array.newInstance(type, orgarray.get_Length());
-                    for(int i = 0; i < array.length; i++)
-                    {
-                        array[i] = Enum.valueOf(type, orgarray.GetValue(i).toString());
-                    }
-                    value = array;
-                }
-                else if(type == Class.class)
-                {
-                    cli.System.Type[] orgarray = (cli.System.Type[])value;
-                    Class[] array = new Class[orgarray.length];
-                    for(int i = 0; i < array.length; i++)
-                    {
-                        array[i] = ikvm.runtime.Util.getFriendlyClassFromType(orgarray[i]);
-                    }
-                    value = array;
-                }
-                else
-                {
-                    // no conversion needed
-                }
-            }
-            else
-            {
-                throw new InternalError("Invalid annotation type: " + type);
-            }
-            if(values == null)
-            {
-                values = new HashMap<String, Object>();
-            }
-            values.put(name, value);
-        }
-        catch (NoSuchMethodException x)
-        {
-            throw (NoSuchMethodError)new NoSuchMethodError().initCause(x);
-        }
-    }
-
-    protected final synchronized void setDefinition(Object[] array)
-    {
-        if(frozen || definition != null)
-        {
-            throw new IllegalStateException("Annotation properties have already been defined");
-        }
-        definition = array;
-    }
-
-    @ikvm.lang.Internal
-    public final Map getValues()
-    {
-        return values;
-    }
-
-    @ikvm.lang.Internal
-    public final synchronized void freeze()
-    {
-        if(!frozen)
-        {
-            frozen = true;
-            if(values == null)
-            {
-                values = new HashMap<String, Object>();
-            }
-            if(definition == null)
-            {
-                setDefaults(values, annotationType);
-            }
-            else
-            {
-                // TODO consider checking that the type matches
-                // (or better yet (?), remove the first two redundant elements from the array)
-                decodeValues(values, annotationType, annotationType.getClassLoader(), unescapeInvalidSurrogates(definition));
-                definition = null;
-            }
-        }
-    }
-
-    private static native Object[] unescapeInvalidSurrogates(Object[] definition);
-
-    private static void decodeValues(HashMap map, Class annotationClass, ClassLoader loader, Object[] array)
-    {
-        for (int i = 2; i < array.length; i += 2)
-        {
-            String name = (String)array[i];
-            try
-            {
-                Method method = annotationClass.getDeclaredMethod(name, new Class[0]);
-                map.put(name, decodeElementValue(array[i + 1], method.getReturnType(), loader));
-            }
-            catch (IllegalAccessException x)
-            {
-                // TODO this probably isn't the right exception
-                throw new IncompatibleClassChangeError();
-            }
-            catch (NoSuchMethodException x)
-            {
-                // ignore values for members that are no longer present
-            }
-        }
-        setDefaults(map, annotationClass);
-    }
-
-    private static void setDefaults(HashMap map, Class annotationClass)
-    {
-        for (Method m : annotationClass.getDeclaredMethods())
-        {
-            Object defaultValue = m.getDefaultValue();
-            // TODO throw exception if default is missing for method that doesn't yet have a value
-            if (defaultValue != null && !map.containsKey(m.getName()))
-            {
-                map.put(m.getName(), defaultValue);
-            }
-        }
-    }
-
-    private static Class classFromSig(ClassLoader loader, String name)
-    {
-        if (name.length() == 1)
-        {
-            switch (name.charAt(0))
-            {
-                case 'Z':
-                    return Boolean.TYPE;
-                case 'B':
-                    return Byte.TYPE;
-                case 'C':
-                    return Character.TYPE;
-                case 'S':
-                    return Short.TYPE;
-                case 'I':
-                    return Integer.TYPE;
-                case 'F':
-                    return Float.TYPE;
-                case 'J':
-                    return Long.TYPE;
-                case 'D':
-                    return Double.TYPE;
-                case 'V':
-                    return Void.TYPE;
-                default:
-                    throw new GenericSignatureFormatError();
-            }
-        }
-
-        if (!isValidTypeSig(name, 0, name.length()))
-        {
-            throw new GenericSignatureFormatError();
-        }
-
-        if (name.charAt(0) == 'L')
-        {
-            name = name.substring(1, name.length() - 1).replace('/', '.');
-        }
-        else // must be an array then
-        {
-            name = name.replace('/', '.');
-        }
-        try
-        {
-            return Class.forName(name, false, loader);
-        }
-        catch (ClassNotFoundException x)
-        {
-            throw new TypeNotPresentException(name, x);
-        }
-    }
-
-    private static boolean isValidTypeSig(String sig, int start, int end)
-    {
-        if (start >= end)
-        {
-            return false;
-        }
-        switch (sig.charAt(start))
-        {
-            case 'L':
-                return sig.indexOf(';', start + 1) == end - 1;
-            case '[':
-                while (sig.charAt(start) == '[')
-                {
-                    start++;
-                    if (start == end)
-                    {
-                        return false;
-                    }
-                }
-                return isValidTypeSig(sig, start, end);
-            case 'B':
-            case 'Z':
-            case 'C':
-            case 'S':
-            case 'I':
-            case 'J':
-            case 'F':
-            case 'D':
-                return start == end - 1;
-            default:
-                return false;
-        }
-    }
-
-    @ikvm.lang.Internal
-    public static Object newAnnotation(ClassLoader loader, Object definition)
-    {
-        Object[] array = (Object[])definition;
-        byte tag = CIL.unbox_byte(array[0]);
-        if (tag != '@')
-            throw new ClassCastException();
-        Object classNameOrClass = array[1];
-        Class annotationClass;
-        if (classNameOrClass instanceof String)
-        {
-            annotationClass = classFromSig(loader, (String)classNameOrClass);
-            if (!annotationClass.isAnnotation())
-            {
-                return null;
-            }
-            array[1] = annotationClass;
-        }
-        else
-        {
-            annotationClass = (Class)classNameOrClass;
-        }
-        HashMap map = new HashMap();
-        decodeValues(map, annotationClass, loader, array);
-        return Proxy.newProxyInstance(annotationClass.getClassLoader(), new Class<?>[] { annotationClass }, newAnnotationInvocationHandler(annotationClass, map));
-    }
-
-    @ikvm.lang.Internal
-    public static Object decodeElementValue(Object obj, Class type, ClassLoader loader)
-        throws IllegalAccessException
-    {
-        if (obj instanceof Object[] && CIL.unbox_byte(((Object[])obj)[0]) == '?')
-        {
-            Throwable t;
-            try
-            {
-                Object[] error = (Object[])obj;
-                Class exception = Class.forName((String)error[1]);
-                t = (Throwable)(error.length == 2
-                    ? exception.newInstance()
-                    : exception.getConstructor(String.class).newInstance(error[2]));
-            }
-            catch (Exception x)
-            {
-                t = x;
-            }
-            sun.misc.Unsafe.getUnsafe().throwException(t);
-        }
-        if (type == Byte.TYPE)
-        {
-            return new Byte(CIL.unbox_byte(obj));
-        }
-        else if (type == Boolean.TYPE)
-        {
-            return new Boolean(CIL.unbox_boolean(obj));
-        }
-        else if (type == Short.TYPE)
-        {
-            return new Short(CIL.unbox_short(obj));
-        }
-        else if (type == Character.TYPE)
-        {
-            return new Character(CIL.unbox_char(obj));
-        }
-        else if (type == Integer.TYPE)
-        {
-            return new Integer(CIL.unbox_int(obj));
-        }
-        else if (type == Float.TYPE)
-        {
-            return new Float(CIL.unbox_float(obj));
-        }
-        else if (type == Long.TYPE)
-        {
-            return new Long(CIL.unbox_long(obj));
-        }
-        else if (type == Double.TYPE)
-        {
-            return new Double(CIL.unbox_double(obj));
-        }
-        else if (type == String.class)
-        {
-            return (String)obj;
-        }
-        else if (type == Class.class)
-        {
-            Object[] array = (Object[])obj;
-            byte tag = CIL.unbox_byte(array[0]);
-            if (tag != 'c')
-                throw new ClassCastException();
-            try
-            {
-                return classFromSig(loader, (String)array[1]);
-            }
-            catch (TypeNotPresentException x)
-            {
-                return new TypeNotPresentExceptionProxy(x.typeName(), x);
-            }
-        }
-        else if (type.isArray())
-        {
-            Object[] array = (Object[])obj;
-            byte tag = CIL.unbox_byte(array[0]);
-            if (tag != '[')
-                throw new ClassCastException();
-            type = type.getComponentType();
-            Object dst = Array.newInstance(type, array.length - 1);
-            for (int i = 0; i < array.length - 1; i++)
-            {
-                Object val = decodeElementValue(array[i + 1], type, loader);
-                try
-                {
-                    Array.set(dst, i, val);
-                }
-                catch (IllegalArgumentException _)
-                {
-                    // JDKBUG emulate JDK bug
-                    throw new ArrayStoreException(val.getClass().getName());
-                }
-            }
-            return dst;
-        }
-        else if (type.isEnum())
-        {
-            Object[] array = (Object[])obj;
-            byte tag = CIL.unbox_byte(array[0]);
-            if (tag != 'e')
-                throw new ClassCastException();
-            Class enumClass;
-            try
-            {
-                enumClass = classFromSig(loader, (String)array[1]);
-            }
-            catch (TypeNotPresentException x)
-            {
-                return new TypeNotPresentExceptionProxy(x.typeName(), x);
-            }
-            try
-            {
-                return Enum.valueOf(enumClass, (String)array[2]);
-            }
-            catch (IllegalArgumentException x)
-            {
-                throw new EnumConstantNotPresentException(enumClass, (String)array[2]);
-            }
-        }
-        else // must be an annotation then
-        {
-            Object ann = newAnnotation(loader, obj);
-            if (!type.isInstance(ann))
-            {
-                // JDKBUG if newAnnotation() returns null (because the class is not an annotation),
-                // the next line will throw a NullPointerException (similar to the JDK)
-                return newAnnotationTypeMismatchExceptionProxy(ann.getClass() + "[" + ann + "]");
-            }
-            return ann;
-        }
-    }
-
-    private final Object writeReplace()
-    {
-        freeze();
-	return Proxy.newProxyInstance(annotationType.getClassLoader(),
-	    new Class[] { annotationType },
-	    newAnnotationInvocationHandler(annotationType, values));
-    }
-
-    private static native InvocationHandler newAnnotationInvocationHandler(Class type, Map memberValues);
-    private static native Object newAnnotationTypeMismatchExceptionProxy(String msg);
-
-    public final Class<? extends Annotation> annotationType()
-    {
-        return annotationType;
-    }
-
-    public final boolean Equals(Object o)
-    {
-        freeze();
-        return equals(annotationType, values, o);
-    }
-
-    public final int GetHashCode()
-    {
-        freeze();
-        return hashCode(annotationType, values);
-    }
-
-    public final String ToString()
-    {
-        freeze();
-        return toString(annotationType, values);
-    }
-
-    private static boolean equals(Class type, Map memberValues, Object other)
-    {
-        if (type.isInstance(other))
-        {
-            try
-            {
-                Method[] methods = type.getDeclaredMethods();
-                if (methods.length == memberValues.size())
-                {
-                    for (int i = 0; i < methods.length; i++)
-                    {
-                        String key = methods[i].getName();
-                        Object val = methods[i].invoke(other, new Object[0]);
-                        if (! deepEquals(memberValues.get(key), val))
-                        {
-                            return false;
-                        }
-                    }
-                    return true;
-                }
-            }
-            catch (IllegalAccessException _)
-            {
-                // Ignore exception, like the JDK
-            }
-            catch (InvocationTargetException _)
-            {
-                // Ignore exception, like the JDK
-            }
-        }
-        return false;
-    }
-
-    private static boolean deepEquals(Object o1, Object o2)
-    {
-        if (o1 == o2)
-            return true;
-
-        if (o1 == null || o2 == null)
-            return false;
-
-        if (o1 instanceof boolean[] && o2 instanceof boolean[])
-            return Arrays.equals((boolean[]) o1, (boolean[]) o2);
-
-        if (o1 instanceof byte[] && o2 instanceof byte[])
-            return Arrays.equals((byte[]) o1, (byte[]) o2);
-
-        if (o1 instanceof char[] && o2 instanceof char[])
-            return Arrays.equals((char[]) o1, (char[]) o2);
-
-        if (o1 instanceof short[] && o2 instanceof short[])
-            return Arrays.equals((short[]) o1, (short[]) o2);
-
-        if (o1 instanceof int[] && o2 instanceof int[])
-            return Arrays.equals((int[]) o1, (int[]) o2);
-
-        if (o1 instanceof float[] && o2 instanceof float[])
-            return Arrays.equals((float[]) o1, (float[]) o2);
-
-        if (o1 instanceof long[] && o2 instanceof long[])
-            return Arrays.equals((long[]) o1, (long[]) o2);
-
-        if (o1 instanceof double[] && o2 instanceof double[])
-            return Arrays.equals((double[]) o1, (double[]) o2);
-
-        if (o1 instanceof Object[] && o2 instanceof Object[])
-            return Arrays.equals((Object[]) o1, (Object[]) o2);
-
-        return o1.equals(o2);
-    }
-
-    private static int deepHashCode(Object obj)
-    {
-        if (obj instanceof boolean[])
-            return Arrays.hashCode((boolean[]) obj);
-
-        if (obj instanceof byte[])
-            return Arrays.hashCode((byte[]) obj);
-
-        if (obj instanceof char[])
-            return Arrays.hashCode((char[]) obj);
-
-        if (obj instanceof short[])
-            return Arrays.hashCode((short[]) obj);
-
-        if (obj instanceof int[])
-            return Arrays.hashCode((int[]) obj);
-
-        if (obj instanceof float[])
-            return Arrays.hashCode((float[]) obj);
-
-        if (obj instanceof long[])
-            return Arrays.hashCode((long[]) obj);
-
-        if (obj instanceof double[])
-            return Arrays.hashCode((double[]) obj);
-
-        if (obj instanceof Object[])
-            return Arrays.hashCode((Object[]) obj);
-
-        return obj.hashCode();
-    }
-
-    private static int hashCode(Class type, Map memberValues)
-    {
-        int h = 0;
-        Iterator iter = memberValues.keySet().iterator();
-        while (iter.hasNext())
-        {
-            Object key = iter.next();
-            Object val = memberValues.get(key);
-            h += deepHashCode(val) ^ 127 * key.hashCode();
-        }
-        return h;
-    }
-
-    private static String deepToString(Object obj)
-    {
-        if (obj instanceof boolean[])
-            return Arrays.toString((boolean[]) obj);
-
-        if (obj instanceof byte[])
-            return Arrays.toString((byte[]) obj);
-
-        if (obj instanceof char[])
-            return Arrays.toString((char[]) obj);
-
-        if (obj instanceof short[])
-            return Arrays.toString((short[]) obj);
-
-        if (obj instanceof int[])
-            return Arrays.toString((int[]) obj);
-
-        if (obj instanceof float[])
-            return Arrays.toString((float[]) obj);
-
-        if (obj instanceof long[])
-            return Arrays.toString((long[]) obj);
-
-        if (obj instanceof double[])
-            return Arrays.toString((double[]) obj);
-
-        if (obj instanceof Object[])
-            return Arrays.toString((Object[]) obj);
-
-        return obj.toString();
-    }
-
-    private static String toString(Class type, Map memberValues)
-    {
-        StringBuffer sb = new StringBuffer();
-        sb.append('@').append(type.getName()).append('(');
-        String sep = "";
-        Iterator iter = memberValues.keySet().iterator();
-        while (iter.hasNext())
-        {
-            Object key = iter.next();
-            Object val = memberValues.get(key);
-            sb.append(sep).append(key).append('=').append(deepToString(val));
-            sep = ", ";
-        }
-        sb.append(')');
-        return sb.toString();
-    }
-}
diff --git a/openjdk/ikvm/internal/FieldReflectorBase.java b/openjdk/ikvm/internal/FieldReflectorBase.java
deleted file mode 100644
index f98931f0..00000000
--- a/openjdk/ikvm/internal/FieldReflectorBase.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-  Copyright (C) 2007 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-package ikvm.internal;
-
-import java.io.ObjectStreamField;
-
-public abstract class FieldReflectorBase
-{
-  public abstract ObjectStreamField[] getFields();
-  public abstract void getPrimFieldValues(Object obj, byte[] buf);
-  public abstract void setPrimFieldValues(Object obj, byte[] buf);
-  public abstract void getObjFieldValues(Object obj, Object[] vals);
-  public abstract void setObjFieldValues(Object obj, Object[] vals);
-}
diff --git a/openjdk/ikvm/internal/IntrinsicAtomicReferenceFieldUpdater.java b/openjdk/ikvm/internal/IntrinsicAtomicReferenceFieldUpdater.java
deleted file mode 100644
index 6a9ea196..00000000
--- a/openjdk/ikvm/internal/IntrinsicAtomicReferenceFieldUpdater.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-  Copyright (C) 2010 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-package ikvm.internal;
-
-import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
-
-// This is the base class for intrinsified AtomicReferenceFieldUpdater.
-// The real class of an intrinsic ARFU is a subclass of this, but since it
-// is not visible to Java code, this class serves as the class.
-
-public class IntrinsicAtomicReferenceFieldUpdater<T,V> extends AtomicReferenceFieldUpdater<T,V>
-{
-    protected IntrinsicAtomicReferenceFieldUpdater()
-    {
-    }
-
-    public boolean compareAndSet(T obj, V expect, V update)
-    {
-        throw new AbstractMethodError();
-    }
-    
-    public final boolean weakCompareAndSet(T obj, V expect, V update)
-    {
-        return compareAndSet(obj, expect, update);
-    }
-    
-    public void set(T obj, V newValue)
-    {
-        throw new AbstractMethodError();
-    }
-    
-    public final void lazySet(T obj, V newValue)
-    {
-        set(obj, newValue);
-    }
-    
-    public V get(T obj)
-    {
-        throw new AbstractMethodError();
-    }
-}
diff --git a/openjdk/ikvm/internal/IntrinsicThreadLocal.java b/openjdk/ikvm/internal/IntrinsicThreadLocal.java
deleted file mode 100644
index abfb4e98..00000000
--- a/openjdk/ikvm/internal/IntrinsicThreadLocal.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-  Copyright (C) 2010 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-package ikvm.internal;
-
-// This is the base class for intrinsified ThreadLocals, it's main purpose
-// is to avoid having to add a remove() method to every generated class,
-// but it also gives us some maneuvering room should a future JDK version
-// change ThreadLocal.
-// Note that because this class is abstract, getClass() on an intrinsified
-// ThreadLocal instance will return java.lang.ThreadLocal instead of this class.
-// We don't use HideFromJava for this, because that would make the life of
-// the runtime/ikvmc more difficult (because it needs a TypeWrapper for this class).
-
-public abstract class IntrinsicThreadLocal extends ThreadLocal
-{
-    public final void remove()
-    {
-        set(null);
-    }
-}
diff --git a/openjdk/ikvm/internal/JNI.java b/openjdk/ikvm/internal/JNI.java
deleted file mode 100644
index 2b7aa9d4..00000000
--- a/openjdk/ikvm/internal/JNI.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-  Copyright (C) 2010 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-
-*/
-
-package ikvm.internal;
-
-@ikvm.lang.Internal
-public final class JNI
-{
-    public static final Object NULL = null;
-    public static final boolean TRUE = true;
-    public static final boolean FALSE = false;
-    public static final boolean JNI_TRUE = true;
-    public static final boolean JNI_FALSE = false;
-
-    public static final String JNU_JAVAIOPKG = "java.io.";
-    public static final String JNU_JAVANETPKG = "java.net.";
-
-    public static long JVM_CurrentTimeMillis(JNIEnv env, int ignored)
-    {
-        return System.currentTimeMillis();
-    }
-
-    public static void JNU_ThrowNullPointerException(JNIEnv env, String message)
-    {
-        env.Throw(new NullPointerException(message));
-    }
-
-    public static void JNU_ThrowByName(JNIEnv env, String exceptionClass, String message)
-    {
-        if (exceptionClass.equals("java.net.SocketException"))
-        {
-            env.Throw(new java.net.SocketException(message));
-        }
-        else if (exceptionClass.equals("java.net.SocketTimeoutException"))
-        {
-            env.Throw(new java.net.SocketTimeoutException(message));
-        }
-        else if (exceptionClass.equals("java.net.PortUnreachableException"))
-        {
-            env.Throw(new java.net.PortUnreachableException(message));
-        }
-        else if (exceptionClass.equals("java.io.InterruptedIOException"))
-        {
-            env.Throw(new java.io.InterruptedIOException(message));
-        }
-        else
-        {
-            try
-            {
-                env.ThrowNew(Class.forName(exceptionClass), message);
-            }
-            catch (ClassNotFoundException x)
-            {
-                env.Throw(x);
-            }
-        }
-    }
-
-    public static final class JNIEnv
-    {
-        private Throwable pendingException;
-
-        public void Throw(Throwable t)
-        {
-            pendingException = t;
-        }
-
-        public void ThrowNew(Class c, String msg)
-        {
-            try
-            {
-                pendingException = (Throwable)c.getConstructor(String.class).newInstance(msg);
-            }
-            catch (Exception x)
-            {
-                pendingException = x;
-            }
-        }
-
-        public Throwable ExceptionOccurred()
-        {
-            return pendingException;
-        }
-
-        public void ThrowPendingException()
-        {
-            if (pendingException != null)
-            {
-                sun.misc.Unsafe.getUnsafe().throwException(pendingException);
-            }
-        }
-    }
-}
diff --git a/openjdk/ikvm/internal/NotYetImplementedError.java b/openjdk/ikvm/internal/NotYetImplementedError.java
deleted file mode 100644
index e2978bab..00000000
--- a/openjdk/ikvm/internal/NotYetImplementedError.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-  Copyright (C) 2011 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-package ikvm.internal;
-
-public final class NotYetImplementedError extends Error
-{
-    public NotYetImplementedError()
-    {
-        this("This method has not yet been implemented in IKVM.NET.");
-    }
-    
-    public NotYetImplementedError(String message)
-    {
-        super(message);
-    }
-}
diff --git a/openjdk/ikvm/internal/Serialization.java b/openjdk/ikvm/internal/Serialization.java
deleted file mode 100644
index 17475ce1..00000000
--- a/openjdk/ikvm/internal/Serialization.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-  Copyright (C) 2009-2010 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-package ikvm.internal;
-
-import cli.System.Runtime.Serialization.SerializationException;
-import cli.System.Runtime.Serialization.SerializationInfo;
-import cli.System.Security.Permissions.SecurityAction;
-import cli.System.Security.Permissions.SecurityPermissionAttribute;
-import com.sun.xml.internal.ws.developer.ServerSideException;
-import java.io.InteropObjectInputStream;
-import java.io.InteropObjectOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-public final class Serialization
-{
-    private Serialization() { }
-    
-    @SecurityPermissionAttribute.Annotation(value = SecurityAction.__Enum.Demand, SerializationFormatter = true)
-    public static void writeObject(Object obj, SerializationInfo info)
-    {
-        InteropObjectOutputStream.writeObject(obj, info);
-    }
-    
-    @SecurityPermissionAttribute.Annotation(value = SecurityAction.__Enum.Demand, SerializationFormatter = true)
-    public static void readObject(Object obj, SerializationInfo info)
-    {
-        InteropObjectInputStream.readObject(obj, info);
-    }
-
-    public static Object writeReplace(cli.System.Exception x)
-    {
-        ServerSideException sse = new ServerSideException(x.getClass().getName(), x.get_Message());
-        sse.initCause(x.get_InnerException());
-        sse.setStackTrace(x.getStackTrace());
-        return sse;
-    }
-}
diff --git a/openjdk/ikvm/internal/Winsock.java b/openjdk/ikvm/internal/Winsock.java
deleted file mode 100644
index ce05de03..00000000
--- a/openjdk/ikvm/internal/Winsock.java
+++ /dev/null
@@ -1,979 +0,0 @@
-/*
-  Copyright (C) 2010-2011 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-
-*/
-
-package ikvm.internal;
-
-import cli.System.Net.EndPoint;
-import cli.System.Net.IPAddress;
-import cli.System.Net.IPEndPoint;
-import cli.System.Net.Sockets.AddressFamily;
-import cli.System.Net.Sockets.IOControlCode;
-import cli.System.Net.Sockets.IPv6MulticastOption;
-import cli.System.Net.Sockets.LingerOption;
-import cli.System.Net.Sockets.MulticastOption;
-import cli.System.Net.Sockets.ProtocolType;
-import cli.System.Net.Sockets.SocketFlags;
-import cli.System.Net.Sockets.SocketOptionName;
-import cli.System.Net.Sockets.SocketOptionLevel;
-import cli.System.Net.Sockets.SocketShutdown;
-import cli.System.Net.Sockets.SocketType;
-import ikvm.lang.CIL;
-
-@ikvm.lang.Internal
-public final class Winsock
-{
-    private Winsock() { }
-
-    // remember the last error code
-    @cli.System.ThreadStaticAttribute.Annotation
-    private static int lastError;
-
-    // Error Codes
-    public static final int WSA_NOT_ENOUGH_MEMORY = 8;
-    public static final int WSA_OPERATION_ABORTED = 995;
-    public static final int WSAEINTR = 10004;
-    public static final int WSAEACCES = 10013;
-    public static final int WSAEFAULT = 10014;
-    public static final int WSAEINVAL = 10022;
-    public static final int WSAEMFILE = 10024;
-    public static final int WSAEWOULDBLOCK = 10035;
-    public static final int WSAEINPROGRESS = 10036;
-    public static final int WSAEALREADY = 10037;
-    public static final int WSAENOTSOCK = 10038;
-    public static final int WSAEDESTADDRREQ = 10039;
-    public static final int WSAEMSGSIZE = 10040;
-    public static final int WSAEPROTOTYPE = 10041;
-    public static final int WSAENOPROTOOPT = 10042;
-    public static final int WSAEPROTONOSUPPORT = 10043;
-    public static final int WSAESOCKTNOSUPPORT = 10044;
-    public static final int WSAEOPNOTSUPP = 10045;
-    public static final int WSAEPFNOSUPPORT = 10046;
-    public static final int WSAEAFNOSUPPORT = 10047;
-    public static final int WSAEADDRINUSE = 10048;
-    public static final int WSAEADDRNOTAVAIL = 10049;
-    public static final int WSAENETDOWN = 10050;
-    public static final int WSAENETUNREACH = 10051;
-    public static final int WSAENETRESET = 10052;
-    public static final int WSAECONNABORTED = 10053;
-    public static final int WSAECONNRESET = 10054;
-    public static final int WSAENOBUFS = 10055;
-    public static final int WSAEISCONN = 10056;
-    public static final int WSAENOTCONN = 10057;
-    public static final int WSAESHUTDOWN = 10058;
-    public static final int WSAETIMEDOUT = 10060;
-    public static final int WSAECONNREFUSED = 10061;
-    public static final int WSAEHOSTDOWN = 10064;
-    public static final int WSAEHOSTUNREACH = 10065;
-    public static final int WSAEPROCLIM = 10067;
-    public static final int WSASYSNOTREADY = 10091;
-    public static final int WSAVERNOTSUPPORTED = 10092;
-    public static final int WSANOTINITIALISED = 10093;
-    public static final int WSAEDISCON = 10101;
-    public static final int WSATYPE_NOT_FOUND = 10109;
-    public static final int WSAHOST_NOT_FOUND = 11001;
-    public static final int WSATRY_AGAIN = 11002;
-    public static final int WSANO_RECOVERY = 11003;
-    public static final int WSANO_DATA = 11004;
-
-    // Other constants
-    public static final int SOCKET_ERROR = -1;
-    public static final cli.System.Net.Sockets.Socket INVALID_SOCKET = null;
-
-    public static final int AF_INET = AddressFamily.InterNetwork;
-    public static final int AF_INET6 = AddressFamily.InterNetworkV6;
-
-    public static final int SOCK_STREAM = SocketType.Stream;
-    public static final int SOCK_DGRAM = SocketType.Dgram;
-
-    public static final int SD_RECEIVE = SocketShutdown.Receive;
-    public static final int SD_SEND = SocketShutdown.Send;
-    public static final int SD_BOTH = SocketShutdown.Both;
-
-    public static final int SOL_SOCKET = SocketOptionLevel.Socket;
-    public static final int IPPROTO_TCP = SocketOptionLevel.Tcp;
-    public static final int IPPROTO_IP = SocketOptionLevel.IP;
-    public static final int IPPROTO_IPV6 = SocketOptionLevel.IPv6;
-
-    public static final int TCP_NODELAY = SocketOptionName.NoDelay;
-    public static final int SO_OOBINLINE = SocketOptionName.OutOfBandInline;
-    public static final int SO_LINGER = SocketOptionName.Linger;
-    public static final int SO_SNDBUF = SocketOptionName.SendBuffer;
-    public static final int SO_RCVBUF = SocketOptionName.ReceiveBuffer;
-    public static final int SO_KEEPALIVE = SocketOptionName.KeepAlive;
-    public static final int SO_REUSEADDR = SocketOptionName.ReuseAddress;
-    public static final int SO_EXCLUSIVEADDRUSE = SocketOptionName.ExclusiveAddressUse;
-    public static final int SO_BROADCAST = SocketOptionName.Broadcast;
-    public static final int SO_RCVTIMEO = SocketOptionName.ReceiveTimeout;
-    public static final int SO_ERROR = SocketOptionName.Error;
-    public static final int IP_MULTICAST_IF = SocketOptionName.MulticastInterface;
-    public static final int IP_MULTICAST_LOOP = SocketOptionName.MulticastLoopback;
-    public static final int IP_TOS = SocketOptionName.TypeOfService;
-    public static final int IP_MULTICAST_TTL = SocketOptionName.MulticastTimeToLive;
-    public static final int IP_ADD_MEMBERSHIP = SocketOptionName.AddMembership;
-    public static final int IP_DROP_MEMBERSHIP = SocketOptionName.DropMembership;
-    public static final int IPV6_MULTICAST_IF = SocketOptionName.MulticastInterface;
-    public static final int IPV6_MULTICAST_LOOP = SocketOptionName.MulticastLoopback;
-    public static final int IPV6_MULTICAST_HOPS = SocketOptionName.MulticastTimeToLive;
-    public static final int IPV6_ADD_MEMBERSHIP = SocketOptionName.AddMembership;
-    public static final int IPV6_DROP_MEMBERSHIP = SocketOptionName.DropMembership;
-    public static final int IPV6_V6ONLY = 27;
-
-    public static final int SIO_UDP_CONNRESET = 0x9800000C;
-
-    public static final int MSG_PEEK = SocketFlags.Peek;
-    public static final int MSG_OOB = SocketFlags.OutOfBand;
-
-    public static final int FIONREAD = (int)IOControlCode.DataToRead;
-    public static final int FIONBIO = (int)IOControlCode.NonBlockingIO;
-
-    public static int WSAGetLastError()
-    {
-        return lastError;
-    }
-
-    public static void WSASetLastError(int err)
-    {
-        lastError = err;
-    }
-
-    public static int WSASendDisconnect(cli.System.Net.Sockets.Socket socket)
-    {
-        if (socket == null)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-        try
-        {
-            if (false) throw new cli.System.Net.Sockets.SocketException();
-            if (false) throw new cli.System.ObjectDisposedException("");
-            socket.Shutdown(SocketShutdown.wrap(SocketShutdown.Send));
-            return 0;
-        }
-        catch (cli.System.Net.Sockets.SocketException x)
-        {
-            lastError = x.get_ErrorCode();
-            return SOCKET_ERROR;
-        }
-        catch (cli.System.ObjectDisposedException _)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-    }
-
-    public static int WSAIoctl(cli.System.Net.Sockets.Socket socket, int ioControlCode, boolean optionInValue)
-    {
-        byte[] in = new byte[4];
-        in[0] = optionInValue ? (byte)1 : (byte)0;
-        byte[] out = new byte[4];
-        return WSAIoctl(socket, ioControlCode, in, out);
-    }
-
-    public static int WSAIoctl(cli.System.Net.Sockets.Socket socket, int ioControlCode, byte[] optionInValue, byte[] optionOutValue)
-    {
-        if (socket == null)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-        try
-        {
-            if (false) throw new cli.System.Net.Sockets.SocketException();
-            if (false) throw new cli.System.ObjectDisposedException("");
-            if (false) throw new cli.System.InvalidOperationException();
-            if (ioControlCode == FIONBIO)
-            {
-                // it's illegal to meddle with the blocking mode via IOControl
-                socket.set_Blocking(optionInValue[0] == 0);
-            }
-            else if (ioControlCode == FIONREAD)
-            {
-                int avail = socket.get_Available();
-                optionOutValue[0] = (byte)(avail >> 0);
-                optionOutValue[1] = (byte)(avail >> 8);
-                optionOutValue[2] = (byte)(avail >> 16);
-                optionOutValue[3] = (byte)(avail >> 24);
-            }
-            else
-            {
-                socket.IOControl(ioControlCode, optionInValue, optionOutValue);
-            }
-            return 0;
-        }
-        catch (cli.System.Net.Sockets.SocketException x)
-        {
-            lastError = x.get_ErrorCode();
-            return SOCKET_ERROR;
-        }
-        catch (cli.System.ObjectDisposedException _)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-        catch (cli.System.InvalidOperationException _)
-        {
-            lastError = WSAEINVAL;
-            return SOCKET_ERROR;
-        }
-    }
-
-    public static int ioctlsocket(cli.System.Net.Sockets.Socket s, int cmd, int[] argp)
-    {
-        byte[] in = cli.System.BitConverter.GetBytes(argp[0]);
-        byte[] out = new byte[4];
-        int ret = WSAIoctl(s, cmd, in, out);
-        argp[0] = cli.System.BitConverter.ToInt32(out, 0);
-        return ret;
-    }
-
-    public static int ioctlsocket(cli.System.Net.Sockets.Socket s, int cmd, int arg)
-    {
-        byte[] in = cli.System.BitConverter.GetBytes(arg);
-        return WSAIoctl(s, cmd, in, in);
-    }
-
-    public static cli.System.Net.Sockets.Socket socket(int af, int type, int protocol)
-    {
-        try
-        {
-            if (false) throw new cli.System.Net.Sockets.SocketException();
-            if (false) throw new cli.System.ObjectDisposedException("");
-            return new cli.System.Net.Sockets.Socket(AddressFamily.wrap(af), SocketType.wrap(type), ProtocolType.wrap(protocol));
-        }
-        catch (cli.System.Net.Sockets.SocketException x)
-        {
-            lastError = x.get_ErrorCode();
-            return INVALID_SOCKET;
-        }
-        catch (cli.System.ObjectDisposedException _)
-        {
-            lastError = WSAENOTSOCK;
-            return INVALID_SOCKET;
-        }
-    }
-
-    public static int closesocket(cli.System.Net.Sockets.Socket socket)
-    {
-        if (socket == null)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-        socket.Close();
-        return 0;
-    }
-
-    public static final class linger
-    {
-        public int l_onoff;
-        public int l_linger;
-
-        LingerOption ToLingerOption()
-        {
-            return new LingerOption(l_onoff != 0, l_linger);
-        }
-    }
-
-    public static final class ip_mreq
-    {
-        public final in_addr imr_multiaddr = new in_addr();
-        public final in_addr imr_interface = new in_addr();
-
-        MulticastOption ToMulticastOption()
-        {
-            return new MulticastOption(imr_multiaddr.ToIPAddress(), imr_interface.ToIPAddress());
-        }
-    }
-
-    public static final class in_addr
-    {
-        public int s_addr;
-
-        IPAddress ToIPAddress()
-        {
-            return new IPAddress(s_addr & 0xFFFFFFFFL);
-        }
-    }
-
-    public static final class ipv6_mreq
-    {
-        public in6_addr ipv6mr_multiaddr;
-        public int ipv6mr_interface;
-
-        IPv6MulticastOption ToIPv6MulticastOption()
-        {
-            return new IPv6MulticastOption(ipv6mr_multiaddr.addr, ipv6mr_interface & 0xFFFFFFFFL);
-        }
-    }
-
-    public static final class in6_addr
-    {
-        IPAddress addr;
-
-        public byte[] s6_bytes()
-        {
-            return addr == null ? new byte[16] : addr.GetAddressBytes();
-        }
-
-        public static in6_addr FromSockAddr(IIPEndPointWrapper ep)
-        {
-            in6_addr addr = new in6_addr();
-            addr.addr = ep.get().get_Address();
-            return addr;
-        }
-    }
-
-    public static int getsockopt(cli.System.Net.Sockets.Socket socket, int level, int optname, Object optval)
-    {
-        if (socket == null)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-        try
-        {
-            if (false) throw new cli.System.Net.Sockets.SocketException();
-            if (false) throw new cli.System.ObjectDisposedException("");
-            Object val = socket.GetSocketOption(SocketOptionLevel.wrap(level), SocketOptionName.wrap(optname));
-            if (val instanceof cli.System.Int32)
-            {
-                if (optval instanceof in_addr)
-                {
-                    ((in_addr)optval).s_addr = CIL.unbox_int(val);
-                }
-                else
-                {
-                    ((cli.System.Array)optval).SetValue(val, 0);
-                }
-            }
-            else if (val instanceof LingerOption)
-            {
-                LingerOption lo = (LingerOption)val;
-                linger ling = (linger)optval;
-                ling.l_onoff = lo.get_Enabled() ? 1 : 0;
-                // FXBUG the linger time is treated as a signed short instead of an unsiged short
-                ling.l_linger = lo.get_LingerTime() & 0xFFFF;
-            }
-            else
-            {
-                lastError = WSAEINVAL;
-                return SOCKET_ERROR;
-            }
-            return 0;
-        }
-        catch (cli.System.Net.Sockets.SocketException x)
-        {
-            lastError = x.get_ErrorCode();
-            return SOCKET_ERROR;
-        }
-        catch (cli.System.ObjectDisposedException _)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-    }
-
-    public static int connect(cli.System.Net.Sockets.Socket socket, IIPEndPointWrapper epw)
-    {
-        if (socket == null)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-        try
-        {
-            if (false) throw new cli.System.Net.Sockets.SocketException();
-            if (false) throw new cli.System.ObjectDisposedException("");
-            IPEndPoint ep = epw.get();
-            if (ep == null)
-            {
-                // it is a disconnect request, we must connect to the Any address
-                if (socket.get_AddressFamily().Value == AddressFamily.InterNetwork)
-                {
-                    ep = new IPEndPoint(cli.System.Net.IPAddress.Any, 0);
-                }
-                else
-                {
-                    ep = new IPEndPoint(cli.System.Net.IPAddress.IPv6Any, 0);
-                }
-            }
-            else
-            {
-                ep = v4mapped(socket, ep);
-            }
-            if (socket.get_SocketType().Value == SocketType.Dgram)
-            {
-                // NOTE we use async connect to work around the issue that the .NET Socket class disallows sync Connect after the socket has received WSAECONNRESET
-                socket.EndConnect(socket.BeginConnect(ep, null, null));
-            }
-            else
-            {
-                socket.Connect(ep);
-            }
-            return 0;
-        }
-        catch (cli.System.Net.Sockets.SocketException x)
-        {
-            lastError = x.get_ErrorCode();
-            return SOCKET_ERROR;
-        }
-        catch (cli.System.ObjectDisposedException _)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-    }
-
-    private static IPEndPoint v4mapped(cli.System.Net.Sockets.Socket socket, IPEndPoint ep)
-    {
-        // when binding an IPv6 socket to an IPv4 address, we need to use a mapped v4 address
-        if (socket.get_AddressFamily().Value == AF_INET6 && ep.get_AddressFamily().Value == AF_INET)
-        {
-            byte[] v4 = ep.get_Address().GetAddressBytes();
-            if (v4[0] == 0 && v4[1] == 0 && v4[2] == 0 && v4[3] == 0)
-            {
-                return new IPEndPoint(IPAddress.IPv6Any, ep.get_Port());
-            }
-            else
-            {
-                byte[] v6 = new byte[16];
-                v6[10] = -1;
-                v6[11] = -1;
-                v6[12] = v4[0];
-                v6[13] = v4[1];
-                v6[14] = v4[2];
-                v6[15] = v4[3];
-                return new IPEndPoint(new IPAddress(v6), ep.get_Port());
-            }
-        }
-        return ep;
-    }
-
-    public static int bind(cli.System.Net.Sockets.Socket socket, IIPEndPointWrapper ep)
-    {
-        if (socket == null)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-        try
-        {
-            if (false) throw new cli.System.Net.Sockets.SocketException();
-            if (false) throw new cli.System.ObjectDisposedException("");
-            socket.Bind(v4mapped(socket, ep.get()));
-            return 0;
-        }
-        catch (cli.System.Net.Sockets.SocketException x)
-        {
-            lastError = x.get_ErrorCode();
-            return SOCKET_ERROR;
-        }
-        catch (cli.System.ObjectDisposedException _)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-    }
-
-    public static int listen(cli.System.Net.Sockets.Socket socket, int count)
-    {
-        if (socket == null)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-        try
-        {
-            if (false) throw new cli.System.Net.Sockets.SocketException();
-            if (false) throw new cli.System.ObjectDisposedException("");
-            socket.Listen(count);
-            return 0;
-        }
-        catch (cli.System.Net.Sockets.SocketException x)
-        {
-            lastError = x.get_ErrorCode();
-            return SOCKET_ERROR;
-        }
-        catch (cli.System.ObjectDisposedException _)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-    }
-
-    public static int shutdown(cli.System.Net.Sockets.Socket socket, int how)
-    {
-        if (socket == null)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-        try
-        {
-            if (false) throw new cli.System.Net.Sockets.SocketException();
-            if (false) throw new cli.System.ObjectDisposedException("");
-            socket.Shutdown(SocketShutdown.wrap(how));
-            return 0;
-        }
-        catch (cli.System.Net.Sockets.SocketException x)
-        {
-            lastError = x.get_ErrorCode();
-            return SOCKET_ERROR;
-        }
-        catch (cli.System.ObjectDisposedException _)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-    }
-
-    public static final class fd_set
-    {
-        cli.System.Collections.ArrayList list = new cli.System.Collections.ArrayList();
-    }
-
-    public static final class timeval
-    {
-        public long tv_sec;
-        public long tv_usec;
-    }
-
-    public static void FD_ZERO(fd_set set)
-    {
-        set.list.Clear();
-    }
-
-    public static void FD_SET(cli.System.Net.Sockets.Socket socket, fd_set set)
-    {
-        set.list.Add(socket);
-    }
-
-    public static boolean FD_ISSET(cli.System.Net.Sockets.Socket socket, fd_set set)
-    {
-        return set.list.Contains(socket);
-    }
-
-    private static cli.System.Collections.ArrayList copy(fd_set set)
-    {
-        return set == null ? null : (cli.System.Collections.ArrayList)set.list.Clone();
-    }
-
-    public static int select(fd_set readfds, fd_set writefds, fd_set exceptfds, timeval timeout)
-    {
-        long expiration;
-        long current = cli.System.DateTime.get_UtcNow().get_Ticks();
-        if (timeout == null)
-        {
-            // FXBUG documentation says that -1 will block forever, but in fact it returns immediately,
-            // so we simulate timeout with a large expiration
-            expiration = Long.MAX_VALUE;
-        }
-        else
-        {
-            long timeout100nanos = Math.min(Long.MAX_VALUE / 10, timeout.tv_usec) * 10 + Math.min(Long.MAX_VALUE / 10000000, timeout.tv_sec) * 10000000;
-            expiration = current + Math.min(Long.MAX_VALUE - current, timeout100nanos);
-        }
-        try
-        {
-            if (false) throw new cli.System.ArgumentNullException();
-            if (false) throw new cli.System.Net.Sockets.SocketException();
-            if (false) throw new cli.System.ObjectDisposedException("");
-            for (; ; )
-            {
-                cli.System.Collections.ArrayList checkRead = copy(readfds);
-                cli.System.Collections.ArrayList checkWrite = copy(writefds);
-                cli.System.Collections.ArrayList checkError = copy(exceptfds);
-                int microSeconds = (int)Math.min(Integer.MAX_VALUE, (expiration - current) / 10);
-                cli.System.Net.Sockets.Socket.Select(checkRead, checkWrite, checkError, microSeconds);
-                int count = 0;
-                if (checkRead != null)
-                {
-                    count += checkRead.get_Count();
-                }
-                if (checkWrite != null)
-                {
-                    count += checkWrite.get_Count();
-                }
-                if (checkError != null)
-                {
-                    count += checkError.get_Count();
-                }
-                current = cli.System.DateTime.get_UtcNow().get_Ticks();
-                if (count != 0 || current >= expiration)
-                {
-                    if (readfds != null)
-                    {
-                        readfds.list = checkRead;
-                    }
-                    if (writefds != null)
-                    {
-                        writefds.list = checkWrite;
-                    }
-                    if (exceptfds != null)
-                    {
-                        exceptfds.list = checkError;
-                    }
-                    return count;
-                }
-            }
-        }
-        catch (cli.System.ArgumentNullException _)
-        {
-            lastError = WSAEINVAL;
-            return SOCKET_ERROR;
-        }
-        catch (cli.System.Net.Sockets.SocketException x)
-        {
-            lastError = x.get_ErrorCode();
-            return SOCKET_ERROR;
-        }
-        catch (cli.System.ObjectDisposedException _)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-    }
-
-    public static int send(cli.System.Net.Sockets.Socket socket, byte[] buf, int len, int flags)
-    {
-        return send(socket, buf, 0, len, flags);
-    }
-
-    public static int send(cli.System.Net.Sockets.Socket socket, byte[] buf, int off, int len, int flags)
-    {
-        if (socket == null)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-        try
-        {
-            if (false) throw new cli.System.ArgumentException();
-            if (false) throw new cli.System.Net.Sockets.SocketException();
-            if (false) throw new cli.System.ObjectDisposedException("");
-            return socket.Send(buf, off, len, SocketFlags.wrap(flags));
-        }
-        catch (cli.System.ArgumentException _)
-        {
-            lastError = WSAEINVAL;
-            return SOCKET_ERROR;
-        }
-        catch (cli.System.Net.Sockets.SocketException x)
-        {
-            lastError = x.get_ErrorCode();
-            return SOCKET_ERROR;
-        }
-        catch (cli.System.ObjectDisposedException _)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-    }
-
-    public static int recv(cli.System.Net.Sockets.Socket socket, byte[] buf, int len, int flags)
-    {
-        return recv(socket, buf, 0, len, flags);
-    }
-
-    public static int recv(cli.System.Net.Sockets.Socket socket, byte[] buf, int off, int len, int flags)
-    {
-        if (socket == null)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-        try
-        {
-            if (false) throw new cli.System.ArgumentException();
-            if (false) throw new cli.System.Net.Sockets.SocketException();
-            if (false) throw new cli.System.ObjectDisposedException("");
-            return socket.Receive(buf, off, len, SocketFlags.wrap(flags));
-        }
-        catch (cli.System.ArgumentException _)
-        {
-            lastError = WSAEINVAL;
-            return SOCKET_ERROR;
-        }
-        catch (cli.System.Net.Sockets.SocketException x)
-        {
-            lastError = x.get_ErrorCode();
-            return SOCKET_ERROR;
-        }
-        catch (cli.System.ObjectDisposedException _)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-    }
-
-    public static int sendto(cli.System.Net.Sockets.Socket socket, byte[] buf, int off, int len, int flags, IIPEndPointWrapper to)
-    {
-        if (socket == null)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-        try
-        {
-            if (false) throw new cli.System.ArgumentException();
-            if (false) throw new cli.System.Net.Sockets.SocketException();
-            if (false) throw new cli.System.ObjectDisposedException("");
-            if (to == null)
-            {
-                return socket.Send(buf, off, len, SocketFlags.wrap(flags));
-            }
-            else
-            {
-                return socket.SendTo(buf, off, len, SocketFlags.wrap(flags), v4mapped(socket, to.get()));
-            }
-        }
-        catch (cli.System.ArgumentException _)
-        {
-            lastError = WSAEINVAL;
-            return SOCKET_ERROR;
-        }
-        catch (cli.System.Net.Sockets.SocketException x)
-        {
-            // on Linux we get a WSAECONNREFUSED when sending to an unreachable port/destination, so ignore that
-            if (x.get_ErrorCode() == WSAECONNREFUSED)
-            {
-                return 0;
-            }
-            lastError = x.get_ErrorCode();
-            return SOCKET_ERROR;
-        }
-        catch (cli.System.ObjectDisposedException _)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-    }
-
-    public static int recvfrom(cli.System.Net.Sockets.Socket socket, byte[] buf, int len, int flags, IIPEndPointWrapper from)
-    {
-        return recvfrom(socket, buf, 0, len, flags, from);
-    }
-
-    public static int recvfrom(cli.System.Net.Sockets.Socket socket, byte[] buf, int off, int len, int flags, IIPEndPointWrapper from)
-    {
-        if (socket == null)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-        try
-        {
-            if (false) throw new cli.System.ArgumentException();
-            if (false) throw new cli.System.Net.Sockets.SocketException();
-            if (false) throw new cli.System.ObjectDisposedException("");
-            EndPoint[] ep = new EndPoint[] { socket.get_AddressFamily().Value == AF_INET6 ? new IPEndPoint(IPAddress.IPv6Any, 0) : new IPEndPoint(0, 0) };
-            try
-            {
-                return socket.ReceiveFrom(buf, off, len, SocketFlags.wrap(flags), ep);
-            }
-            finally
-            {
-                if (from != null)
-                {
-                    from.set((IPEndPoint)ep[0]);
-                }
-            }
-        }
-        catch (cli.System.ArgumentException _)
-        {
-            lastError = WSAEINVAL;
-            return SOCKET_ERROR;
-        }
-        catch (cli.System.Net.Sockets.SocketException x)
-        {
-            lastError = x.get_ErrorCode();
-            return SOCKET_ERROR;
-        }
-        catch (cli.System.ObjectDisposedException _)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-    }
-
-    public static int setsockopt(cli.System.Net.Sockets.Socket s, int level, int optname, Object optval)
-    {
-        if (s == null)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-        try
-        {
-            if (false) throw new cli.System.ArgumentException();
-            if (false) throw new cli.System.Net.Sockets.SocketException();
-            if (false) throw new cli.System.ObjectDisposedException("");
-            if (optval instanceof Boolean)
-            {
-                s.SetSocketOption(SocketOptionLevel.wrap(level), SocketOptionName.wrap(optname), ((Boolean)optval).booleanValue());
-            }
-            else if (optval instanceof Integer)
-            {
-                s.SetSocketOption(SocketOptionLevel.wrap(level), SocketOptionName.wrap(optname), ((Integer)optval).intValue());
-            }
-            else if (optval instanceof linger)
-            {
-                s.set_LingerState(((linger)optval).ToLingerOption());
-            }
-            else if (optval instanceof ip_mreq)
-            {
-                s.SetSocketOption(SocketOptionLevel.wrap(level), SocketOptionName.wrap(optname), ((ip_mreq)optval).ToMulticastOption());
-            }
-            else if (optval instanceof ipv6_mreq)
-            {
-                s.SetSocketOption(SocketOptionLevel.wrap(level), SocketOptionName.wrap(optname), ((ipv6_mreq)optval).ToIPv6MulticastOption());
-            }
-            else if (optval instanceof in_addr)
-            {
-                s.SetSocketOption(SocketOptionLevel.wrap(level), SocketOptionName.wrap(optname), ((in_addr)optval).s_addr);
-            }
-            else
-            {
-                lastError = WSAEINVAL;
-                return SOCKET_ERROR;
-            }
-            return 0;
-        }
-        catch (cli.System.ArgumentException _)
-        {
-            lastError = WSAEINVAL;
-            return SOCKET_ERROR;
-        }
-        catch (cli.System.Net.Sockets.SocketException x)
-        {
-            lastError = x.get_ErrorCode();
-            return SOCKET_ERROR;
-        }
-        catch (cli.System.ObjectDisposedException _)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-    }
-
-    public static cli.System.Net.Sockets.Socket accept(cli.System.Net.Sockets.Socket s, IIPEndPointWrapper ep)
-    {
-        if (s == null)
-        {
-            lastError = WSAENOTSOCK;
-            return INVALID_SOCKET;
-        }
-        try
-        {
-            if (false) throw new cli.System.InvalidOperationException();
-            if (false) throw new cli.System.Net.Sockets.SocketException();
-            if (false) throw new cli.System.ObjectDisposedException("");
-            cli.System.Net.Sockets.Socket remote = s.Accept();
-            if (ep != null)
-            {
-                ep.set((IPEndPoint)remote.get_RemoteEndPoint());
-            }
-            return remote;
-        }
-        catch (cli.System.ObjectDisposedException _)
-        {
-            lastError = WSAENOTSOCK;
-            return INVALID_SOCKET;
-        }
-        catch (cli.System.InvalidOperationException _)
-        {
-            lastError = WSAEINVAL;
-            return INVALID_SOCKET;
-        }
-        catch (cli.System.Net.Sockets.SocketException x)
-        {
-            lastError = x.get_ErrorCode();
-            return INVALID_SOCKET;
-        }
-    }
-
-    public interface IIPEndPointWrapper
-    {
-        void set(IPEndPoint value);
-        IPEndPoint get();
-    }
-
-    public static int getsockname(cli.System.Net.Sockets.Socket s, IIPEndPointWrapper name)
-    {
-        if (s == null)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-        try
-        {
-            if (false) throw new cli.System.Net.Sockets.SocketException();
-            if (false) throw new cli.System.ObjectDisposedException("");
-            IPEndPoint ep = (IPEndPoint)s.get_LocalEndPoint();
-            if (ep == null)
-            {
-                lastError = WSAEINVAL;
-                return SOCKET_ERROR;
-            }
-            name.set(ep);
-            return 0;
-        }
-        catch (ClassCastException _)
-        {
-            lastError = WSAEOPNOTSUPP;
-            return SOCKET_ERROR;
-        }
-        catch (cli.System.ObjectDisposedException _)
-        {
-            lastError = WSAENOTSOCK;
-            return SOCKET_ERROR;
-        }
-        catch (cli.System.Net.Sockets.SocketException x)
-        {
-            lastError = x.get_ErrorCode();
-            return SOCKET_ERROR;
-        }
-    }
-
-    public static int ntohl(int address)
-    {
-        return Integer.reverseBytes(address);
-    }
-
-    public static int htonl(int address)
-    {
-        return Integer.reverseBytes(address);
-    }
-
-    public static int ntohs(int port)
-    {
-        return Short.reverseBytes((short)port) & 0xFFFF;
-    }
-
-    public static int htons(int port)
-    {
-        return Short.reverseBytes((short)port) & 0xFFFF;
-    }
-}
diff --git a/openjdk/java/awt/Font.java b/openjdk/java/awt/Font.java
deleted file mode 100644
index d99c6757..00000000
--- a/openjdk/java/awt/Font.java
+++ /dev/null
@@ -1,2640 +0,0 @@
-/*
- * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.awt;
-
-import java.awt.font.FontRenderContext;
-import java.awt.font.GlyphVector;
-import java.awt.font.LineMetrics;
-import java.awt.font.TextAttribute;
-import java.awt.font.TextLayout;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.awt.peer.FontPeer;
-import java.io.*;
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.SoftReference;
-import java.lang.ref.WeakReference;
-import java.nio.file.Files;
-import java.nio.file.StandardCopyOption;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.text.AttributedCharacterIterator.Attribute;
-import java.text.CharacterIterator;
-import java.text.StringCharacterIterator;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import sun.font.StandardGlyphVector;
-
-import cli.System.IntPtr;
-import cli.System.Drawing.FontFamily;
-import cli.System.Drawing.GraphicsUnit;
-import cli.System.Drawing.Text.PrivateFontCollection;
-import cli.System.Runtime.InteropServices.DllImportAttribute;
-
-import sun.font.AttributeMap;
-import sun.font.AttributeValues;
-import sun.font.CompositeFont;
-import sun.font.CreatedFontTracker;
-import sun.font.Font2D;
-import sun.font.Font2DHandle;
-import sun.font.FontAccess;
-import sun.font.FontManager;
-import sun.font.FontManagerFactory;
-import sun.font.FontUtilities;
-import sun.font.GlyphLayout;
-import sun.font.FontLineMetrics;
-import sun.font.CoreMetrics;
-import sun.font.SunFontManager;
-
-import static sun.font.EAttribute.*;
-
-/**
- * The <code>Font</code> class represents fonts, which are used to
- * render text in a visible way.
- * A font provides the information needed to map sequences of
- * <em>characters</em> to sequences of <em>glyphs</em>
- * and to render sequences of glyphs on <code>Graphics</code> and
- * <code>Component</code> objects.
- *
- * <h3>Characters and Glyphs</h3>
- *
- * A <em>character</em> is a symbol that represents an item such as a letter,
- * a digit, or punctuation in an abstract way. For example, <code>'g'</code>,
- * LATIN SMALL LETTER G, is a character.
- * <p>
- * A <em>glyph</em> is a shape used to render a character or a sequence of
- * characters. In simple writing systems, such as Latin, typically one glyph
- * represents one character. In general, however, characters and glyphs do not
- * have one-to-one correspondence. For example, the character '&aacute;'
- * LATIN SMALL LETTER A WITH ACUTE, can be represented by
- * two glyphs: one for 'a' and one for '&acute;'. On the other hand, the
- * two-character string "fi" can be represented by a single glyph, an
- * "fi" ligature. In complex writing systems, such as Arabic or the South
- * and South-East Asian writing systems, the relationship between characters
- * and glyphs can be more complicated and involve context-dependent selection
- * of glyphs as well as glyph reordering.
- *
- * A font encapsulates the collection of glyphs needed to render a selected set
- * of characters as well as the tables needed to map sequences of characters to
- * corresponding sequences of glyphs.
- *
- * <h3>Physical and Logical Fonts</h3>
- *
- * The Java Platform distinguishes between two kinds of fonts:
- * <em>physical</em> fonts and <em>logical</em> fonts.
- * <p>
- * <em>Physical</em> fonts are the actual font libraries containing glyph data
- * and tables to map from character sequences to glyph sequences, using a font
- * technology such as TrueType or PostScript Type 1.
- * All implementations of the Java Platform must support TrueType fonts;
- * support for other font technologies is implementation dependent.
- * Physical fonts may use names such as Helvetica, Palatino, HonMincho, or
- * any number of other font names.
- * Typically, each physical font supports only a limited set of writing
- * systems, for example, only Latin characters or only Japanese and Basic
- * Latin.
- * The set of available physical fonts varies between configurations.
- * Applications that require specific fonts can bundle them and instantiate
- * them using the {@link #createFont createFont} method.
- * <p>
- * <em>Logical</em> fonts are the five font families defined by the Java
- * platform which must be supported by any Java runtime environment:
- * Serif, SansSerif, Monospaced, Dialog, and DialogInput.
- * These logical fonts are not actual font libraries. Instead, the logical
- * font names are mapped to physical fonts by the Java runtime environment.
- * The mapping is implementation and usually locale dependent, so the look
- * and the metrics provided by them vary.
- * Typically, each logical font name maps to several physical fonts in order to
- * cover a large range of characters.
- * <p>
- * Peered AWT components, such as {@link Label Label} and
- * {@link TextField TextField}, can only use logical fonts.
- * <p>
- * For a discussion of the relative advantages and disadvantages of using
- * physical or logical fonts, see the
- * <a href="http://www.oracle.com/technetwork/java/javase/tech/faq-jsp-138165.html">Internationalization FAQ</a>
- * document.
- *
- * <h3>Font Faces and Names</h3>
- *
- * A <code>Font</code>
- * can have many faces, such as heavy, medium, oblique, gothic and
- * regular. All of these faces have similar typographic design.
- * <p>
- * There are three different names that you can get from a
- * <code>Font</code> object.  The <em>logical font name</em> is simply the
- * name that was used to construct the font.
- * The <em>font face name</em>, or just <em>font name</em> for
- * short, is the name of a particular font face, like Helvetica Bold. The
- * <em>family name</em> is the name of the font family that determines the
- * typographic design across several faces, like Helvetica.
- * <p>
- * The <code>Font</code> class represents an instance of a font face from
- * a collection of  font faces that are present in the system resources
- * of the host system.  As examples, Arial Bold and Courier Bold Italic
- * are font faces.  There can be several <code>Font</code> objects
- * associated with a font face, each differing in size, style, transform
- * and font features.
- * <p>
- * The {@link GraphicsEnvironment#getAllFonts() getAllFonts} method
- * of the <code>GraphicsEnvironment</code> class returns an
- * array of all font faces available in the system. These font faces are
- * returned as <code>Font</code> objects with a size of 1, identity
- * transform and default font features. These
- * base fonts can then be used to derive new <code>Font</code> objects
- * with varying sizes, styles, transforms and font features via the
- * <code>deriveFont</code> methods in this class.
- *
- * <h3>Font and TextAttribute</h3>
- *
- * <p><code>Font</code> supports most
- * <code>TextAttribute</code>s.  This makes some operations, such as
- * rendering underlined text, convenient since it is not
- * necessary to explicitly construct a <code>TextLayout</code> object.
- * Attributes can be set on a Font by constructing or deriving it
- * using a <code>Map</code> of <code>TextAttribute</code> values.
- *
- * <p>The values of some <code>TextAttributes</code> are not
- * serializable, and therefore attempting to serialize an instance of
- * <code>Font</code> that has such values will not serialize them.
- * This means a Font deserialized from such a stream will not compare
- * equal to the original Font that contained the non-serializable
- * attributes.  This should very rarely pose a problem
- * since these attributes are typically used only in special
- * circumstances and are unlikely to be serialized.
- *
- * <ul>
- * <li><code>FOREGROUND</code> and <code>BACKGROUND</code> use
- * <code>Paint</code> values. The subclass <code>Color</code> is
- * serializable, while <code>GradientPaint</code> and
- * <code>TexturePaint</code> are not.</li>
- * <li><code>CHAR_REPLACEMENT</code> uses
- * <code>GraphicAttribute</code> values.  The subclasses
- * <code>ShapeGraphicAttribute</code> and
- * <code>ImageGraphicAttribute</code> are not serializable.</li>
- * <li><code>INPUT_METHOD_HIGHLIGHT</code> uses
- * <code>InputMethodHighlight</code> values, which are
- * not serializable.  See {@link java.awt.im.InputMethodHighlight}.</li>
- * </ul>
- *
- * <p>Clients who create custom subclasses of <code>Paint</code> and
- * <code>GraphicAttribute</code> can make them serializable and
- * avoid this problem.  Clients who use input method highlights can
- * convert these to the platform-specific attributes for that
- * highlight on the current platform and set them on the Font as
- * a workaround.
- *
- * <p>The <code>Map</code>-based constructor and
- * <code>deriveFont</code> APIs ignore the FONT attribute, and it is
- * not retained by the Font; the static {@link #getFont} method should
- * be used if the FONT attribute might be present.  See {@link
- * java.awt.font.TextAttribute#FONT} for more information.</p>
- *
- * <p>Several attributes will cause additional rendering overhead
- * and potentially invoke layout.  If a <code>Font</code> has such
- * attributes, the <code>{@link #hasLayoutAttributes()}</code> method
- * will return true.</p>
- *
- * <p>Note: Font rotations can cause text baselines to be rotated.  In
- * order to account for this (rare) possibility, font APIs are
- * specified to return metrics and take parameters 'in
- * baseline-relative coordinates'.  This maps the 'x' coordinate to
- * the advance along the baseline, (positive x is forward along the
- * baseline), and the 'y' coordinate to a distance along the
- * perpendicular to the baseline at 'x' (positive y is 90 degrees
- * clockwise from the baseline vector).  APIs for which this is
- * especially important are called out as having 'baseline-relative
- * coordinates.'
- */
-public class Font implements java.io.Serializable
-{
-    private static class FontAccessImpl extends FontAccess {
-        public Font2D getFont2D(Font font) {
-            return font.getFont2D();
-        }
-
-        public void setFont2D(Font font, Font2DHandle handle) {
-            font.font2DHandle = handle;
-        }
-
-        public void setCreatedFont(Font font) {
-            font.createdFont = true;
-        }
-
-        public boolean isCreatedFont(Font font) {
-            return font.createdFont;
-        }
-    }
-
-    static {
-        FontAccess.setFontAccess(new FontAccessImpl());
-    }
-
-    /**
-     * This is now only used during serialization.  Typically
-     * it is null.
-     *
-     * @serial
-     * @see #getAttributes()
-     */
-    private Hashtable<Object, Object> fRequestedAttributes;
-
-    /*
-     * Constants to be used for logical font family names.
-     */
-
-    /**
-     * A String constant for the canonical family name of the
-     * logical font "Dialog". It is useful in Font construction
-     * to provide compile-time verification of the name.
-     * @since 1.6
-     */
-    public static final String DIALOG = "Dialog";
-
-    /**
-     * A String constant for the canonical family name of the
-     * logical font "DialogInput". It is useful in Font construction
-     * to provide compile-time verification of the name.
-     * @since 1.6
-     */
-    public static final String DIALOG_INPUT = "DialogInput";
-
-    /**
-     * A String constant for the canonical family name of the
-     * logical font "SansSerif". It is useful in Font construction
-     * to provide compile-time verification of the name.
-     * @since 1.6
-     */
-    public static final String SANS_SERIF = "SansSerif";
-
-    /**
-     * A String constant for the canonical family name of the
-     * logical font "Serif". It is useful in Font construction
-     * to provide compile-time verification of the name.
-     * @since 1.6
-     */
-    public static final String SERIF = "Serif";
-
-    /**
-     * A String constant for the canonical family name of the
-     * logical font "Monospaced". It is useful in Font construction
-     * to provide compile-time verification of the name.
-     * @since 1.6
-     */
-    public static final String MONOSPACED = "Monospaced";
-
-    /*
-     * Constants to be used for styles. Can be combined to mix
-     * styles.
-     */
-
-    /**
-     * The plain style constant.
-     */
-    public static final int PLAIN       = 0;
-
-    /**
-     * The bold style constant.  This can be combined with the other style
-     * constants (except PLAIN) for mixed styles.
-     */
-    public static final int BOLD        = 1;
-
-    /**
-     * The italicized style constant.  This can be combined with the other
-     * style constants (except PLAIN) for mixed styles.
-     */
-    public static final int ITALIC      = 2;
-
-    /**
-     * The baseline used in most Roman scripts when laying out text.
-     */
-    public static final int ROMAN_BASELINE = 0;
-
-    /**
-     * The baseline used in ideographic scripts like Chinese, Japanese,
-     * and Korean when laying out text.
-     */
-    public static final int CENTER_BASELINE = 1;
-
-    /**
-     * The baseline used in Devanigiri and similar scripts when laying
-     * out text.
-     */
-    public static final int HANGING_BASELINE = 2;
-
-    /**
-     * Identify a font resource of type TRUETYPE.
-     * Used to specify a TrueType font resource to the
-     * {@link #createFont} method.
-     * The TrueType format was extended to become the OpenType
-     * format, which adds support for fonts with Postscript outlines,
-     * this tag therefore references these fonts, as well as those
-     * with TrueType outlines.
-     * @since 1.3
-     */
-
-    public static final int TRUETYPE_FONT = 0;
-
-    /**
-     * Identify a font resource of type TYPE1.
-     * Used to specify a Type1 font resource to the
-     * {@link #createFont} method.
-     * @since 1.5
-     */
-    public static final int TYPE1_FONT = 1;
-
-    /**
-     * The logical name of this <code>Font</code>, as passed to the
-     * constructor.
-     * @since JDK1.0
-     *
-     * @serial
-     * @see #getName
-     */
-    protected String name;
-
-    /**
-     * The style of this <code>Font</code>, as passed to the constructor.
-     * This style can be PLAIN, BOLD, ITALIC, or BOLD+ITALIC.
-     * @since JDK1.0
-     *
-     * @serial
-     * @see #getStyle()
-     */
-    protected int style;
-
-    /**
-     * The point size of this <code>Font</code>, rounded to integer.
-     * @since JDK1.0
-     *
-     * @serial
-     * @see #getSize()
-     */
-    protected int size;
-
-    /**
-     * The point size of this <code>Font</code> in <code>float</code>.
-     *
-     * @serial
-     * @see #getSize()
-     * @see #getSize2D()
-     */
-    protected float pointSize;
-
-    /**
-     * The platform specific font information.
-     */
-    private transient FontPeer peer;
-    private transient cli.System.Drawing.Font netFont;
-    private transient Font2DHandle font2DHandle;
-
-    private transient AttributeValues values;
-    private transient boolean hasLayoutAttributes;
-
-    /*
-     * If the origin of a Font is a created font then this attribute
-     * must be set on all derived fonts too.
-     */
-    private transient boolean createdFont = false;
-
-    /*
-     * This is true if the font transform is not identity.  It
-     * is used to avoid unnecessary instantiation of an AffineTransform.
-     */
-    private transient boolean nonIdentityTx;
-
-    /*
-     * A cached value used when a transform is required for internal
-     * use.  This must not be exposed to callers since AffineTransform
-     * is mutable.
-     */
-    private static final AffineTransform identityTx = new AffineTransform();
-
-    /*
-     * JDK 1.1 serialVersionUID
-     */
-    private static final long serialVersionUID = -4206021311591459213L;
-
-    /**
-     * Gets the peer of this <code>Font</code>.
-     * @return  the peer of the <code>Font</code>.
-     * @since JDK1.1
-     * @deprecated Font rendering is now platform independent.
-     */
-    @Deprecated
-    public FontPeer getPeer(){
-        return getPeer_NoClientCode();
-    }
-    // NOTE: This method is called by privileged threads.
-    //       We implement this functionality in a package-private method
-    //       to insure that it cannot be overridden by client subclasses.
-    //       DO NOT INVOKE CLIENT CODE ON THIS THREAD!
-    @SuppressWarnings("deprecation")
-    final FontPeer getPeer_NoClientCode() {
-        if(peer == null) {
-            Toolkit tk = Toolkit.getDefaultToolkit();
-            this.peer = tk.getFontPeer(name, style);
-        }
-        return peer;
-    }
-
-    /**
-     * Return the AttributeValues object associated with this
-     * font.  Most of the time, the internal object is null.
-     * If required, it will be created from the 'standard'
-     * state on the font.  Only non-default values will be
-     * set in the AttributeValues object.
-     *
-     * <p>Since the AttributeValues object is mutable, and it
-     * is cached in the font, care must be taken to ensure that
-     * it is not mutated.
-     */
-    private AttributeValues getAttributeValues() {
-        if (values == null) {
-            AttributeValues valuesTmp = new AttributeValues();
-            valuesTmp.setFamily(name);
-            valuesTmp.setSize(pointSize); // expects the float value.
-
-            if ((style & BOLD) != 0) {
-                valuesTmp.setWeight(2); // WEIGHT_BOLD
-            }
-
-            if ((style & ITALIC) != 0) {
-                valuesTmp.setPosture(.2f); // POSTURE_OBLIQUE
-            }
-            valuesTmp.defineAll(PRIMARY_MASK); // for streaming compatibility
-            values = valuesTmp;
-        }
-
-        return values;
-    }
-
-    private Font2D getFont2D() {
-        FontManager fm = FontManagerFactory.getInstance();
-        if (fm.usingPerAppContextComposites() &&
-            font2DHandle != null &&
-            font2DHandle.font2D instanceof CompositeFont &&
-            ((CompositeFont)(font2DHandle.font2D)).isStdComposite()) {
-            return fm.findFont2D(name, style,
-                                          FontManager.LOGICAL_FALLBACK);
-        } else if (font2DHandle == null) {
-            font2DHandle =
-                fm.findFont2D(name, style,
-                              FontManager.LOGICAL_FALLBACK).handle;
-        }
-        /* Do not cache the de-referenced font2D. It must be explicitly
-         * de-referenced to pick up a valid font in the event that the
-         * original one is marked invalid
-         */
-        return font2DHandle.font2D;
-    }
-
-    @cli.IKVM.Attributes.HideFromJavaAttribute.Annotation
-    public cli.System.Drawing.Font getNetFont(){
-        if(netFont == null){
-            netFont = getFont2D().createNetFont(this);
-        }
-        return netFont;
-    }
-    /**
-     * Creates a new <code>Font</code> from the specified name, style and
-     * point size.
-     * <p>
-     * The font name can be a font face name or a font family name.
-     * It is used together with the style to find an appropriate font face.
-     * When a font family name is specified, the style argument is used to
-     * select the most appropriate face from the family. When a font face
-     * name is specified, the face's style and the style argument are
-     * merged to locate the best matching font from the same family.
-     * For example if face name "Arial Bold" is specified with style
-     * <code>Font.ITALIC</code>, the font system looks for a face in the
-     * "Arial" family that is bold and italic, and may associate the font
-     * instance with the physical font face "Arial Bold Italic".
-     * The style argument is merged with the specified face's style, not
-     * added or subtracted.
-     * This means, specifying a bold face and a bold style does not
-     * double-embolden the font, and specifying a bold face and a plain
-     * style does not lighten the font.
-     * <p>
-     * If no face for the requested style can be found, the font system
-     * may apply algorithmic styling to achieve the desired style.
-     * For example, if <code>ITALIC</code> is requested, but no italic
-     * face is available, glyphs from the plain face may be algorithmically
-     * obliqued (slanted).
-     * <p>
-     * Font name lookup is case insensitive, using the case folding
-     * rules of the US locale.
-     * <p>
-     * If the <code>name</code> parameter represents something other than a
-     * logical font, i.e. is interpreted as a physical font face or family, and
-     * this cannot be mapped by the implementation to a physical font or a
-     * compatible alternative, then the font system will map the Font
-     * instance to "Dialog", such that for example, the family as reported
-     * by {@link #getFamily() getFamily} will be "Dialog".
-     * <p>
-     *
-     * @param name the font name.  This can be a font face name or a font
-     * family name, and may represent either a logical font or a physical
-     * font found in this {@code GraphicsEnvironment}.
-     * The family names for logical fonts are: Dialog, DialogInput,
-     * Monospaced, Serif, or SansSerif. Pre-defined String constants exist
-     * for all of these names, for example, {@code DIALOG}. If {@code name} is
-     * {@code null}, the <em>logical font name</em> of the new
-     * {@code Font} as returned by {@code getName()} is set to
-     * the name "Default".
-     * @param style the style constant for the {@code Font}
-     * The style argument is an integer bitmask that may
-     * be {@code PLAIN}, or a bitwise union of {@code BOLD} and/or
-     * {@code ITALIC} (for example, {@code ITALIC} or {@code BOLD|ITALIC}).
-     * If the style argument does not conform to one of the expected
-     * integer bitmasks then the style is set to {@code PLAIN}.
-     * @param size the point size of the {@code Font}
-     * @see GraphicsEnvironment#getAllFonts
-     * @see GraphicsEnvironment#getAvailableFontFamilyNames
-     * @since JDK1.0
-     */
-    public Font(String name, int style, int size) {
-        this.name = (name != null) ? name : "Default";
-        this.style = (style & ~0x03) == 0 ? style : 0;
-        this.size = size;
-        this.pointSize = size;
-    }
-
-    private Font(String name, int style, float sizePts) {
-        this.name = (name != null) ? name : "Default";
-        this.style = (style & ~0x03) == 0 ? style : 0;
-        this.size = (int)(sizePts + 0.5);
-        this.pointSize = sizePts;
-    }
-
-    /* This constructor is used by deriveFont when attributes is null */
-    private Font(String name, int style, float sizePts,
-                 boolean created, Font2DHandle handle) {
-        this(name, style, sizePts);
-        this.createdFont = created;
-        /* Fonts created from a stream will use the same font2D instance
-         * as the parent.
-         * One exception is that if the derived font is requested to be
-         * in a different style, then also check if its a CompositeFont
-         * and if so build a new CompositeFont from components of that style.
-         * CompositeFonts can only be marked as "created" if they are used
-         * to add fall backs to a physical font. And non-composites are
-         * always from "Font.createFont()" and shouldn't get this treatment.
-         */
-        if (created) {
-            if (handle.font2D instanceof CompositeFont &&
-                handle.font2D.getStyle() != style) {
-                FontManager fm = FontManagerFactory.getInstance();
-                this.font2DHandle = fm.getNewComposite(null, style, handle);
-            } else {
-                this.font2DHandle = handle;
-            }
-        }
-    }
-
-    /* This constructor is used when one font is derived from another.
-     * Fonts created from a stream will use the same font2D instance as the
-     * parent. They can be distinguished because the "created" argument
-     * will be "true". Since there is no way to recreate these fonts they
-     * need to have the handle to the underlying font2D passed in.
-     * "created" is also true when a special composite is referenced by the
-     * handle for essentially the same reasons.
-     * But when deriving a font in these cases two particular attributes
-     * need special attention: family/face and style.
-     * The "composites" in these cases need to be recreated with optimal
-     * fonts for the new values of family and style.
-     * For fonts created with createFont() these are treated differently.
-     * JDK can often synthesise a different style (bold from plain
-     * for example). For fonts created with "createFont" this is a reasonable
-     * solution but its also possible (although rare) to derive a font with a
-     * different family attribute. In this case JDK needs
-     * to break the tie with the original Font2D and find a new Font.
-     * The oldName and oldStyle are supplied so they can be compared with
-     * what the Font2D and the values. To speed things along :
-     * oldName == null will be interpreted as the name is unchanged.
-     * oldStyle = -1 will be interpreted as the style is unchanged.
-     * In these cases there is no need to interrogate "values".
-     */
-    private Font(AttributeValues values, String oldName, int oldStyle,
-                 boolean created, Font2DHandle handle) {
-
-        this.createdFont = created;
-        if (created) {
-            this.font2DHandle = handle;
-
-            String newName = null;
-            if (oldName != null) {
-                newName = values.getFamily();
-                if (oldName.equals(newName)) newName = null;
-            }
-            int newStyle = 0;
-            if (oldStyle == -1) {
-                newStyle = -1;
-            } else {
-                if (values.getWeight() >= 2f)   newStyle  = BOLD;
-                if (values.getPosture() >= .2f) newStyle |= ITALIC;
-                if (oldStyle == newStyle)       newStyle  = -1;
-            }
-            if (handle.font2D instanceof CompositeFont) {
-                if (newStyle != -1 || newName != null) {
-                    FontManager fm = FontManagerFactory.getInstance();
-                    this.font2DHandle =
-                        fm.getNewComposite(newName, newStyle, handle);
-                }
-            } else if (newName != null) {
-                this.createdFont = false;
-                this.font2DHandle = null;
-            }
-        }
-        initFromValues(values);
-    }
-
-    /**
-     * Creates a new <code>Font</code> with the specified attributes.
-     * Only keys defined in {@link java.awt.font.TextAttribute TextAttribute}
-     * are recognized.  In addition the FONT attribute is
-     *  not recognized by this constructor
-     * (see {@link #getAvailableAttributes}). Only attributes that have
-     * values of valid types will affect the new <code>Font</code>.
-     * <p>
-     * If <code>attributes</code> is <code>null</code>, a new
-     * <code>Font</code> is initialized with default values.
-     * @see java.awt.font.TextAttribute
-     * @param attributes the attributes to assign to the new
-     *          <code>Font</code>, or <code>null</code>
-     */
-    public Font(Map<? extends Attribute, ?> attributes) {
-        initFromValues(AttributeValues.fromMap(attributes, RECOGNIZED_MASK));
-    }
-
-    /**
-     * Creates a new <code>Font</code> from the specified <code>font</code>.
-     * This constructor is intended for use by subclasses.
-     * @param font from which to create this <code>Font</code>.
-     * @throws NullPointerException if <code>font</code> is null
-     * @since 1.6
-     */
-    protected Font(Font font) {
-        if (font.values != null) {
-            initFromValues(font.getAttributeValues().clone());
-        } else {
-            this.name = font.name;
-            this.style = font.style;
-            this.size = font.size;
-            this.pointSize = font.pointSize;
-        }
-        this.font2DHandle = font.font2DHandle;
-        this.createdFont = font.createdFont;
-    }
-
-    /**
-     * Font recognizes all attributes except FONT.
-     */
-    private static final int RECOGNIZED_MASK = AttributeValues.MASK_ALL
-        & ~AttributeValues.getMask(EFONT);
-
-    /**
-     * These attributes are considered primary by the FONT attribute.
-     */
-    private static final int PRIMARY_MASK =
-        AttributeValues.getMask(EFAMILY, EWEIGHT, EWIDTH, EPOSTURE, ESIZE,
-                                ETRANSFORM, ESUPERSCRIPT, ETRACKING);
-
-    /**
-     * These attributes are considered secondary by the FONT attribute.
-     */
-    private static final int SECONDARY_MASK =
-        RECOGNIZED_MASK & ~PRIMARY_MASK;
-
-    /**
-     * These attributes are handled by layout.
-     */
-    private static final int LAYOUT_MASK =
-        AttributeValues.getMask(ECHAR_REPLACEMENT, EFOREGROUND, EBACKGROUND,
-                                EUNDERLINE, ESTRIKETHROUGH, ERUN_DIRECTION,
-                                EBIDI_EMBEDDING, EJUSTIFICATION,
-                                EINPUT_METHOD_HIGHLIGHT, EINPUT_METHOD_UNDERLINE,
-                                ESWAP_COLORS, ENUMERIC_SHAPING, EKERNING,
-                                ELIGATURES, ETRACKING, ESUPERSCRIPT);
-
-    private static final int EXTRA_MASK =
-            AttributeValues.getMask(ETRANSFORM, ESUPERSCRIPT, EWIDTH);
-
-    /**
-     * Initialize the standard Font fields from the values object.
-     */
-    private void initFromValues(AttributeValues values) {
-        this.values = values;
-        values.defineAll(PRIMARY_MASK); // for 1.5 streaming compatibility
-
-        this.name = values.getFamily();
-        this.pointSize = values.getSize();
-        this.size = (int)(values.getSize() + 0.5);
-        if (values.getWeight() >= 2f) this.style |= BOLD; // not == 2f
-        if (values.getPosture() >= .2f) this.style |= ITALIC; // not  == .2f
-
-        this.nonIdentityTx = values.anyNonDefault(EXTRA_MASK);
-        this.hasLayoutAttributes =  values.anyNonDefault(LAYOUT_MASK);
-    }
-
-    /**
-     * Returns a <code>Font</code> appropriate to the attributes.
-     * If <code>attributes</code>contains a <code>FONT</code> attribute
-     * with a valid <code>Font</code> as its value, it will be
-     * merged with any remaining attributes.  See
-     * {@link java.awt.font.TextAttribute#FONT} for more
-     * information.
-     *
-     * @param attributes the attributes to assign to the new
-     *          <code>Font</code>
-     * @return a new <code>Font</code> created with the specified
-     *          attributes
-     * @throws NullPointerException if <code>attributes</code> is null.
-     * @since 1.2
-     * @see java.awt.font.TextAttribute
-     */
-    public static Font getFont(Map<? extends Attribute, ?> attributes) {
-        // optimize for two cases:
-        // 1) FONT attribute, and nothing else
-        // 2) attributes, but no FONT
-
-        // avoid turning the attributemap into a regular map for no reason
-        if (attributes instanceof AttributeMap &&
-            ((AttributeMap)attributes).getValues() != null) {
-            AttributeValues values = ((AttributeMap)attributes).getValues();
-            if (values.isNonDefault(EFONT)) {
-                Font font = values.getFont();
-                if (!values.anyDefined(SECONDARY_MASK)) {
-                    return font;
-                }
-                // merge
-                values = font.getAttributeValues().clone();
-                values.merge(attributes, SECONDARY_MASK);
-                return new Font(values, font.name, font.style,
-                                font.createdFont, font.font2DHandle);
-            }
-            return new Font(attributes);
-        }
-
-        Font font = (Font)attributes.get(TextAttribute.FONT);
-        if (font != null) {
-            if (attributes.size() > 1) { // oh well, check for anything else
-                AttributeValues values = font.getAttributeValues().clone();
-                values.merge(attributes, SECONDARY_MASK);
-                return new Font(values, font.name, font.style,
-                                font.createdFont, font.font2DHandle);
-            }
-
-            return font;
-        }
-
-        return new Font(attributes);
-    }
-
-    private static class FontFamilyReference extends WeakReference<FontFamily> {
-        
-        private static final ReferenceQueue<FontFamily> fontFamilyQueue = new ReferenceQueue<>();
-        private static final Set<FontFamilyReference> refs = Collections.synchronizedSet( new HashSet<FontFamilyReference>() );
-        static {
-            sun.misc.SharedSecrets.getJavaLangAccess().registerShutdownHook( 5, // Shutdown hook invocation order 
-            true, // register even if shutdown in progress 
-            new Runnable() {
-                public void run() {
-                    for( FontFamilyReference ref : refs ) {
-                        ref.delete( false );
-                    }
-                }
-            } );
-        }
-        private File fontFile;
-
-        private FontFamilyReference( FontFamily family, File fontFile ) {
-            super( family, fontFamilyQueue );
-            this.fontFile = fontFile;
-            refs.add( this );
-            
-            do {
-                FontFamilyReference ref = (FontFamilyReference)fontFamilyQueue.poll();
-                if( ref == null ) {
-                    break;
-                }
-                ref.delete( true );
-            } while(true);
-        }
-        
-        private void delete( boolean isQueue ) {
-            FontFamily family = get();
-            if( family != null ) {
-                family.Dispose();
-            }
-            
-            if( fontFile.delete() && isQueue) {
-                refs.remove( this );
-            }
-        }
-    }
-
-    /**
-     * Returns a new <code>Font</code> using the specified font type
-     * and input data.  The new <code>Font</code> is
-     * created with a point size of 1 and style {@link #PLAIN PLAIN}.
-     * This base font can then be used with the <code>deriveFont</code>
-     * methods in this class to derive new <code>Font</code> objects with
-     * varying sizes, styles, transforms and font features.  This
-     * method does not close the {@link InputStream}.
-     * <p>
-     * To make the <code>Font</code> available to Font constructors the
-     * returned <code>Font</code> must be registered in the
-     * <code>GraphicsEnviroment</code> by calling
-     * {@link GraphicsEnvironment#registerFont(Font) registerFont(Font)}.
-     * @param fontFormat the type of the <code>Font</code>, which is
-     * {@link #TRUETYPE_FONT TRUETYPE_FONT} if a TrueType resource is specified.
-     * or {@link #TYPE1_FONT TYPE1_FONT} if a Type 1 resource is specified.
-     * @param fontStream an <code>InputStream</code> object representing the
-     * input data for the font.
-     * @return a new <code>Font</code> created with the specified font type.
-     * @throws IllegalArgumentException if <code>fontFormat</code> is not
-     *     <code>TRUETYPE_FONT</code>or<code>TYPE1_FONT</code>.
-     * @throws FontFormatException if the <code>fontStream</code> data does
-     *     not contain the required font tables for the specified format.
-     * @throws IOException if the <code>fontStream</code>
-     *     cannot be completely read.
-     * @see GraphicsEnvironment#registerFont(Font)
-     * @since 1.3
-     */
-    public static Font createFont(int fontFormat, InputStream fontStream)
-        throws java.awt.FontFormatException, java.io.IOException {
-
-        if (fontFormat != Font.TRUETYPE_FONT &&
-            fontFormat != Font.TYPE1_FONT) {
-            throw new IllegalArgumentException ("font format not recognized");
-        }
-
-        File fontFile;
-        try {
-            fontFile = AccessController.doPrivileged(
-                            new PrivilegedExceptionAction<File>() {
-                                public File run() throws IOException {
-                                    return Files.createTempFile("+~JF", ".tmp").toFile();
-                                }
-                            }
-                        );
-        } catch( PrivilegedActionException ex ) {
-            throw (IOException)ex.getException();
-        }
-        Files.copy( fontStream, fontFile.toPath(), StandardCopyOption.REPLACE_EXISTING );
-
-        // create a private Font Collection and add the font data
-        PrivateFontCollection pfc = new PrivateFontCollection();
-        try {
-            String fileName = fontFile.getPath();
-            pfc.AddFontFile( fileName );
-            RemoveFontResourceEx( fileName ); // hack for bug http://stackoverflow.com/questions/26671026/how-to-delete-the-file-of-a-privatefontcollection-addfontfile
-            if (false) throw new cli.System.IO.FileNotFoundException();
-        } catch( cli.System.IO.FileNotFoundException x ) {
-            FontFormatException ffe = new FontFormatException(x.getMessage());
-            ffe.initCause(x);
-            fontFile.delete();
-            throw ffe;
-        }
-        
-        FontFamily family = pfc.get_Families()[0]; 
-        new FontFamilyReference( family, fontFile );
-
-        // create the font object
-        Font2D font2D = SunFontManager.createFont2D( family, 0 );
-        Font2DHandle font2DHandle = font2D.handle;
-        Font font = new Font( font2D.getFontName( Locale.getDefault() ), PLAIN, 1, true, font2DHandle );
-        return font;
-    }
-
-    @DllImportAttribute.Annotation(value="gdi32")
-    private static native int RemoveFontResourceEx(String filename, int fl, IntPtr pdv);    
-
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    private static void RemoveFontResourceEx(String filename) {
-        if( ikvm.internal.Util.WINDOWS ) {
-            RemoveFontResourceEx( filename, 16, IntPtr.Zero );
-        }
-    }
-
-    /**
-     * Returns a new <code>Font</code> using the specified font type
-     * and the specified font file.  The new <code>Font</code> is
-     * created with a point size of 1 and style {@link #PLAIN PLAIN}.
-     * This base font can then be used with the <code>deriveFont</code>
-     * methods in this class to derive new <code>Font</code> objects with
-     * varying sizes, styles, transforms and font features.
-     * @param fontFormat the type of the <code>Font</code>, which is
-     * {@link #TRUETYPE_FONT TRUETYPE_FONT} if a TrueType resource is
-     * specified or {@link #TYPE1_FONT TYPE1_FONT} if a Type 1 resource is
-     * specified.
-     * So long as the returned font, or its derived fonts are referenced
-     * the implementation may continue to access <code>fontFile</code>
-     * to retrieve font data. Thus the results are undefined if the file
-     * is changed, or becomes inaccessible.
-     * <p>
-     * To make the <code>Font</code> available to Font constructors the
-     * returned <code>Font</code> must be registered in the
-     * <code>GraphicsEnviroment</code> by calling
-     * {@link GraphicsEnvironment#registerFont(Font) registerFont(Font)}.
-     * @param fontFile a <code>File</code> object representing the
-     * input data for the font.
-     * @return a new <code>Font</code> created with the specified font type.
-     * @throws IllegalArgumentException if <code>fontFormat</code> is not
-     *     <code>TRUETYPE_FONT</code>or<code>TYPE1_FONT</code>.
-     * @throws NullPointerException if <code>fontFile</code> is null.
-     * @throws IOException if the <code>fontFile</code> cannot be read.
-     * @throws FontFormatException if <code>fontFile</code> does
-     *     not contain the required font tables for the specified format.
-     * @throws SecurityException if the executing code does not have
-     * permission to read from the file.
-     * @see GraphicsEnvironment#registerFont(Font)
-     * @since 1.5
-     */
-    public static Font createFont(int fontFormat, File fontFile)
-        throws java.awt.FontFormatException, java.io.IOException {
-
-        fontFile = new File(fontFile.getPath());
-
-        if (fontFormat != Font.TRUETYPE_FONT &&
-            fontFormat != Font.TYPE1_FONT) {
-            throw new IllegalArgumentException ("font format not recognized");
-        }
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            FilePermission filePermission =
-                new FilePermission(fontFile.getPath(), "read");
-            sm.checkPermission(filePermission);
-        }
-        if (!fontFile.canRead()) {
-            throw new IOException("Can't read " + fontFile);
-        }
-        // create a private Font Collection and add the font data
-        PrivateFontCollection pfc = new PrivateFontCollection();
-        try {
-            String fileName = fontFile.getPath();
-            pfc.AddFontFile( fileName );
-            RemoveFontResourceEx( fileName );// hack for bug http://stackoverflow.com/questions/26671026/how-to-delete-the-file-of-a-privatefontcollection-addfontfile
-            if (false) throw new cli.System.IO.FileNotFoundException();
-        } catch( cli.System.IO.FileNotFoundException fnfe ) {
-            FileNotFoundException ex = new FileNotFoundException(fnfe.getMessage());
-            ex.initCause( fnfe );
-            throw ex;
-        }
-        // create the font object
-        Font2D font2D = SunFontManager.createFont2D( pfc.get_Families()[0], 0 );
-        Font2DHandle font2DHandle = font2D.handle;
-        Font font = new Font( font2D.getFontName( Locale.getDefault() ), PLAIN, 1, true, font2DHandle );
-        return font;
-    }
-
-    /**
-     * Returns a copy of the transform associated with this
-     * <code>Font</code>.  This transform is not necessarily the one
-     * used to construct the font.  If the font has algorithmic
-     * superscripting or width adjustment, this will be incorporated
-     * into the returned <code>AffineTransform</code>.
-     * <p>
-     * Typically, fonts will not be transformed.  Clients generally
-     * should call {@link #isTransformed} first, and only call this
-     * method if <code>isTransformed</code> returns true.
-     *
-     * @return an {@link AffineTransform} object representing the
-     *          transform attribute of this <code>Font</code> object.
-     */
-    public AffineTransform getTransform() {
-        /* The most common case is the identity transform.  Most callers
-         * should call isTransformed() first, to decide if they need to
-         * get the transform, but some may not.  Here we check to see
-         * if we have a nonidentity transform, and only do the work to
-         * fetch and/or compute it if so, otherwise we return a new
-         * identity transform.
-         *
-         * Note that the transform is _not_ necessarily the same as
-         * the transform passed in as an Attribute in a Map, as the
-         * transform returned will also reflect the effects of WIDTH and
-         * SUPERSCRIPT attributes.  Clients who want the actual transform
-         * need to call getRequestedAttributes.
-         */
-        if (nonIdentityTx) {
-            AttributeValues values = getAttributeValues();
-
-            AffineTransform at = values.isNonDefault(ETRANSFORM)
-                ? new AffineTransform(values.getTransform())
-                : new AffineTransform();
-
-            if (values.getSuperscript() != 0) {
-                // can't get ascent and descent here, recursive call to this fn,
-                // so use pointsize
-                // let users combine super- and sub-scripting
-
-                int superscript = values.getSuperscript();
-
-                double trans = 0;
-                int n = 0;
-                boolean up = superscript > 0;
-                int sign = up ? -1 : 1;
-                int ss = up ? superscript : -superscript;
-
-                while ((ss & 7) > n) {
-                    int newn = ss & 7;
-                    trans += sign * (ssinfo[newn] - ssinfo[n]);
-                    ss >>= 3;
-                    sign = -sign;
-                    n = newn;
-                }
-                trans *= pointSize;
-                double scale = Math.pow(2./3., n);
-
-                at.preConcatenate(AffineTransform.getTranslateInstance(0, trans));
-                at.scale(scale, scale);
-
-                // note on placement and italics
-                // We preconcatenate the transform because we don't want to translate along
-                // the italic angle, but purely perpendicular to the baseline.  While this
-                // looks ok for superscripts, it can lead subscripts to stack on each other
-                // and bring the following text too close.  The way we deal with potential
-                // collisions that can occur in the case of italics is by adjusting the
-                // horizontal spacing of the adjacent glyphvectors.  Examine the italic
-                // angle of both vectors, if one is non-zero, compute the minimum ascent
-                // and descent, and then the x position at each for each vector along its
-                // italic angle starting from its (offset) baseline.  Compute the difference
-                // between the x positions and use the maximum difference to adjust the
-                // position of the right gv.
-            }
-
-            if (values.isNonDefault(EWIDTH)) {
-                at.scale(values.getWidth(), 1f);
-            }
-
-            return at;
-        }
-
-        return new AffineTransform();
-    }
-
-    // x = r^0 + r^1 + r^2... r^n
-    // rx = r^1 + r^2 + r^3... r^(n+1)
-    // x - rx = r^0 - r^(n+1)
-    // x (1 - r) = r^0 - r^(n+1)
-    // x = (r^0 - r^(n+1)) / (1 - r)
-    // x = (1 - r^(n+1)) / (1 - r)
-
-    // scale ratio is 2/3
-    // trans = 1/2 of ascent * x
-    // assume ascent is 3/4 of point size
-
-    private static final float[] ssinfo = {
-        0.0f,
-        0.375f,
-        0.625f,
-        0.7916667f,
-        0.9027778f,
-        0.9768519f,
-        1.0262346f,
-        1.0591564f,
-    };
-
-    /**
-     * Returns the family name of this <code>Font</code>.
-     *
-     * <p>The family name of a font is font specific. Two fonts such as
-     * Helvetica Italic and Helvetica Bold have the same family name,
-     * <i>Helvetica</i>, whereas their font face names are
-     * <i>Helvetica Bold</i> and <i>Helvetica Italic</i>. The list of
-     * available family names may be obtained by using the
-     * {@link GraphicsEnvironment#getAvailableFontFamilyNames()} method.
-     *
-     * <p>Use <code>getName</code> to get the logical name of the font.
-     * Use <code>getFontName</code> to get the font face name of the font.
-     * @return a <code>String</code> that is the family name of this
-     *          <code>Font</code>.
-     *
-     * @see #getName
-     * @see #getFontName
-     * @since JDK1.1
-     */
-    public String getFamily() {
-        return getFamily_NoClientCode();
-    }
-    // NOTE: This method is called by privileged threads.
-    //       We implement this functionality in a package-private
-    //       method to insure that it cannot be overridden by client
-    //       subclasses.
-    //       DO NOT INVOKE CLIENT CODE ON THIS THREAD!
-    final String getFamily_NoClientCode() {
-        return getFamily(Locale.getDefault());
-    }
-
-    /**
-     * Returns the family name of this <code>Font</code>, localized for
-     * the specified locale.
-     *
-     * <p>The family name of a font is font specific. Two fonts such as
-     * Helvetica Italic and Helvetica Bold have the same family name,
-     * <i>Helvetica</i>, whereas their font face names are
-     * <i>Helvetica Bold</i> and <i>Helvetica Italic</i>. The list of
-     * available family names may be obtained by using the
-     * {@link GraphicsEnvironment#getAvailableFontFamilyNames()} method.
-     *
-     * <p>Use <code>getFontName</code> to get the font face name of the font.
-     * @param l locale for which to get the family name
-     * @return a <code>String</code> representing the family name of the
-     *          font, localized for the specified locale.
-     * @see #getFontName
-     * @see java.util.Locale
-     * @since 1.2
-     */
-    public String getFamily(Locale l) {
-        if (l == null) {
-            throw new NullPointerException("null locale doesn't mean default");
-        }
-        return getFont2D().getFamilyName(l);
-    }
-
-    /**
-     * Returns the postscript name of this <code>Font</code>.
-     * Use <code>getFamily</code> to get the family name of the font.
-     * Use <code>getFontName</code> to get the font face name of the font.
-     * @return a <code>String</code> representing the postscript name of
-     *          this <code>Font</code>.
-     * @since 1.2
-     */
-    public String getPSName() {
-        return getFont2D().getPostscriptName();
-    }
-
-    /**
-     * Returns the logical name of this <code>Font</code>.
-     * Use <code>getFamily</code> to get the family name of the font.
-     * Use <code>getFontName</code> to get the font face name of the font.
-     * @return a <code>String</code> representing the logical name of
-     *          this <code>Font</code>.
-     * @see #getFamily
-     * @see #getFontName
-     * @since JDK1.0
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Returns the font face name of this <code>Font</code>.  For example,
-     * Helvetica Bold could be returned as a font face name.
-     * Use <code>getFamily</code> to get the family name of the font.
-     * Use <code>getName</code> to get the logical name of the font.
-     * @return a <code>String</code> representing the font face name of
-     *          this <code>Font</code>.
-     * @see #getFamily
-     * @see #getName
-     * @since 1.2
-     */
-    public String getFontName() {
-      return getFontName(Locale.getDefault());
-    }
-
-    /**
-     * Returns the font face name of the <code>Font</code>, localized
-     * for the specified locale. For example, Helvetica Fett could be
-     * returned as the font face name.
-     * Use <code>getFamily</code> to get the family name of the font.
-     * @param l a locale for which to get the font face name
-     * @return a <code>String</code> representing the font face name,
-     *          localized for the specified locale.
-     * @see #getFamily
-     * @see java.util.Locale
-     */
-    public String getFontName(Locale l) {
-        if (l == null) {
-            throw new NullPointerException("null locale doesn't mean default");
-        }
-        return getFont2D().getFontName(l);
-    }
-
-    /**
-     * Returns the style of this <code>Font</code>.  The style can be
-     * PLAIN, BOLD, ITALIC, or BOLD+ITALIC.
-     * @return the style of this <code>Font</code>
-     * @see #isPlain
-     * @see #isBold
-     * @see #isItalic
-     * @since JDK1.0
-     */
-    public int getStyle() {
-        return style;
-    }
-
-    /**
-     * Returns the point size of this <code>Font</code>, rounded to
-     * an integer.
-     * Most users are familiar with the idea of using <i>point size</i> to
-     * specify the size of glyphs in a font. This point size defines a
-     * measurement between the baseline of one line to the baseline of the
-     * following line in a single spaced text document. The point size is
-     * based on <i>typographic points</i>, approximately 1/72 of an inch.
-     * <p>
-     * The Java(tm)2D API adopts the convention that one point is
-     * equivalent to one unit in user coordinates.  When using a
-     * normalized transform for converting user space coordinates to
-     * device space coordinates 72 user
-     * space units equal 1 inch in device space.  In this case one point
-     * is 1/72 of an inch.
-     * @return the point size of this <code>Font</code> in 1/72 of an
-     *          inch units.
-     * @see #getSize2D
-     * @see GraphicsConfiguration#getDefaultTransform
-     * @see GraphicsConfiguration#getNormalizingTransform
-     * @since JDK1.0
-     */
-    public int getSize() {
-        return size;
-    }
-
-    /**
-     * Returns the point size of this <code>Font</code> in
-     * <code>float</code> value.
-     * @return the point size of this <code>Font</code> as a
-     * <code>float</code> value.
-     * @see #getSize
-     * @since 1.2
-     */
-    public float getSize2D() {
-        return pointSize;
-    }
-
-    /**
-     * Indicates whether or not this <code>Font</code> object's style is
-     * PLAIN.
-     * @return    <code>true</code> if this <code>Font</code> has a
-     *            PLAIN style;
-     *            <code>false</code> otherwise.
-     * @see       java.awt.Font#getStyle
-     * @since     JDK1.0
-     */
-    public boolean isPlain() {
-        return style == 0;
-    }
-
-    /**
-     * Indicates whether or not this <code>Font</code> object's style is
-     * BOLD.
-     * @return    <code>true</code> if this <code>Font</code> object's
-     *            style is BOLD;
-     *            <code>false</code> otherwise.
-     * @see       java.awt.Font#getStyle
-     * @since     JDK1.0
-     */
-    public boolean isBold() {
-        return (style & BOLD) != 0;
-    }
-
-    /**
-     * Indicates whether or not this <code>Font</code> object's style is
-     * ITALIC.
-     * @return    <code>true</code> if this <code>Font</code> object's
-     *            style is ITALIC;
-     *            <code>false</code> otherwise.
-     * @see       java.awt.Font#getStyle
-     * @since     JDK1.0
-     */
-    public boolean isItalic() {
-        return (style & ITALIC) != 0;
-    }
-
-    /**
-     * Indicates whether or not this <code>Font</code> object has a
-     * transform that affects its size in addition to the Size
-     * attribute.
-     * @return  <code>true</code> if this <code>Font</code> object
-     *          has a non-identity AffineTransform attribute.
-     *          <code>false</code> otherwise.
-     * @see     java.awt.Font#getTransform
-     * @since   1.4
-     */
-    public boolean isTransformed() {
-        return nonIdentityTx;
-    }
-
-    /**
-     * Return true if this Font contains attributes that require extra
-     * layout processing.
-     * @return true if the font has layout attributes
-     * @since 1.6
-     */
-    public boolean hasLayoutAttributes() {
-        return hasLayoutAttributes;
-    }
-
-    /**
-     * Returns a <code>Font</code> object from the system properties list.
-     * <code>nm</code> is treated as the name of a system property to be
-     * obtained.  The <code>String</code> value of this property is then
-     * interpreted as a <code>Font</code> object according to the
-     * specification of <code>Font.decode(String)</code>
-     * If the specified property is not found, or the executing code does
-     * not have permission to read the property, null is returned instead.
-     *
-     * @param nm the property name
-     * @return a <code>Font</code> object that the property name
-     *          describes, or null if no such property exists.
-     * @throws NullPointerException if nm is null.
-     * @since 1.2
-     * @see #decode(String)
-     */
-    public static Font getFont(String nm) {
-        return getFont(nm, null);
-    }
-
-    /**
-     * Returns the <code>Font</code> that the <code>str</code>
-     * argument describes.
-     * To ensure that this method returns the desired Font,
-     * format the <code>str</code> parameter in
-     * one of these ways
-     *
-     * <ul>
-     * <li><em>fontname-style-pointsize</em>
-     * <li><em>fontname-pointsize</em>
-     * <li><em>fontname-style</em>
-     * <li><em>fontname</em>
-     * <li><em>fontname style pointsize</em>
-     * <li><em>fontname pointsize</em>
-     * <li><em>fontname style</em>
-     * <li><em>fontname</em>
-     * </ul>
-     * in which <i>style</i> is one of the four
-     * case-insensitive strings:
-     * <code>"PLAIN"</code>, <code>"BOLD"</code>, <code>"BOLDITALIC"</code>, or
-     * <code>"ITALIC"</code>, and pointsize is a positive decimal integer
-     * representation of the point size.
-     * For example, if you want a font that is Arial, bold, with
-     * a point size of 18, you would call this method with:
-     * "Arial-BOLD-18".
-     * This is equivalent to calling the Font constructor :
-     * <code>new Font("Arial", Font.BOLD, 18);</code>
-     * and the values are interpreted as specified by that constructor.
-     * <p>
-     * A valid trailing decimal field is always interpreted as the pointsize.
-     * Therefore a fontname containing a trailing decimal value should not
-     * be used in the fontname only form.
-     * <p>
-     * If a style name field is not one of the valid style strings, it is
-     * interpreted as part of the font name, and the default style is used.
-     * <p>
-     * Only one of ' ' or '-' may be used to separate fields in the input.
-     * The identified separator is the one closest to the end of the string
-     * which separates a valid pointsize, or a valid style name from
-     * the rest of the string.
-     * Null (empty) pointsize and style fields are treated
-     * as valid fields with the default value for that field.
-     *<p>
-     * Some font names may include the separator characters ' ' or '-'.
-     * If <code>str</code> is not formed with 3 components, e.g. such that
-     * <code>style</code> or <code>pointsize</code> fields are not present in
-     * <code>str</code>, and <code>fontname</code> also contains a
-     * character determined to be the separator character
-     * then these characters where they appear as intended to be part of
-     * <code>fontname</code> may instead be interpreted as separators
-     * so the font name may not be properly recognised.
-     *
-     * <p>
-     * The default size is 12 and the default style is PLAIN.
-     * If <code>str</code> does not specify a valid size, the returned
-     * <code>Font</code> has a size of 12.  If <code>str</code> does not
-     * specify a valid style, the returned Font has a style of PLAIN.
-     * If you do not specify a valid font name in
-     * the <code>str</code> argument, this method will return
-     * a font with the family name "Dialog".
-     * To determine what font family names are available on
-     * your system, use the
-     * {@link GraphicsEnvironment#getAvailableFontFamilyNames()} method.
-     * If <code>str</code> is <code>null</code>, a new <code>Font</code>
-     * is returned with the family name "Dialog", a size of 12 and a
-     * PLAIN style.
-     * @param str the name of the font, or <code>null</code>
-     * @return the <code>Font</code> object that <code>str</code>
-     *          describes, or a new default <code>Font</code> if
-     *          <code>str</code> is <code>null</code>.
-     * @see #getFamily
-     * @since JDK1.1
-     */
-    public static Font decode(String str) {
-        String fontName = str;
-        String styleName = "";
-        int fontSize = 12;
-        int fontStyle = Font.PLAIN;
-
-        if (str == null) {
-            return new Font(DIALOG, fontStyle, fontSize);
-        }
-
-        int lastHyphen = str.lastIndexOf('-');
-        int lastSpace = str.lastIndexOf(' ');
-        char sepChar = (lastHyphen > lastSpace) ? '-' : ' ';
-        int sizeIndex = str.lastIndexOf(sepChar);
-        int styleIndex = str.lastIndexOf(sepChar, sizeIndex-1);
-        int strlen = str.length();
-
-        if (sizeIndex > 0 && sizeIndex+1 < strlen) {
-            try {
-                fontSize =
-                    Integer.valueOf(str.substring(sizeIndex+1)).intValue();
-                if (fontSize <= 0) {
-                    fontSize = 12;
-                }
-            } catch (NumberFormatException e) {
-                /* It wasn't a valid size, if we didn't also find the
-                 * start of the style string perhaps this is the style */
-                styleIndex = sizeIndex;
-                sizeIndex = strlen;
-                if (str.charAt(sizeIndex-1) == sepChar) {
-                    sizeIndex--;
-                }
-            }
-        }
-
-        if (styleIndex >= 0 && styleIndex+1 < strlen) {
-            styleName = str.substring(styleIndex+1, sizeIndex);
-            styleName = styleName.toLowerCase(Locale.ENGLISH);
-            if (styleName.equals("bolditalic")) {
-                fontStyle = Font.BOLD | Font.ITALIC;
-            } else if (styleName.equals("italic")) {
-                fontStyle = Font.ITALIC;
-            } else if (styleName.equals("bold")) {
-                fontStyle = Font.BOLD;
-            } else if (styleName.equals("plain")) {
-                fontStyle = Font.PLAIN;
-            } else {
-                /* this string isn't any of the expected styles, so
-                 * assume its part of the font name
-                 */
-                styleIndex = sizeIndex;
-                if (str.charAt(styleIndex-1) == sepChar) {
-                    styleIndex--;
-                }
-            }
-            fontName = str.substring(0, styleIndex);
-
-        } else {
-            int fontEnd = strlen;
-            if (styleIndex > 0) {
-                fontEnd = styleIndex;
-            } else if (sizeIndex > 0) {
-                fontEnd = sizeIndex;
-            }
-            if (fontEnd > 0 && str.charAt(fontEnd-1) == sepChar) {
-                fontEnd--;
-            }
-            fontName = str.substring(0, fontEnd);
-        }
-
-        return new Font(fontName, fontStyle, fontSize);
-    }
-
-    /**
-     * Gets the specified <code>Font</code> from the system properties
-     * list.  As in the <code>getProperty</code> method of
-     * <code>System</code>, the first
-     * argument is treated as the name of a system property to be
-     * obtained.  The <code>String</code> value of this property is then
-     * interpreted as a <code>Font</code> object.
-     * <p>
-     * The property value should be one of the forms accepted by
-     * <code>Font.decode(String)</code>
-     * If the specified property is not found, or the executing code does not
-     * have permission to read the property, the <code>font</code>
-     * argument is returned instead.
-     * @param nm the case-insensitive property name
-     * @param font a default <code>Font</code> to return if property
-     *          <code>nm</code> is not defined
-     * @return    the <code>Font</code> value of the property.
-     * @throws NullPointerException if nm is null.
-     * @see #decode(String)
-     */
-    public static Font getFont(String nm, Font font) {
-        String str = null;
-        try {
-            str =System.getProperty(nm);
-        } catch(SecurityException e) {
-        }
-        if (str == null) {
-            return font;
-        }
-        return decode ( str );
-    }
-
-    transient int hash;
-    /**
-     * Returns a hashcode for this <code>Font</code>.
-     * @return     a hashcode value for this <code>Font</code>.
-     * @since      JDK1.0
-     */
-    public int hashCode() {
-        if (hash == 0) {
-            hash = name.hashCode() ^ style ^ size;
-            /* It is possible many fonts differ only in transform.
-             * So include the transform in the hash calculation.
-             * nonIdentityTx is set whenever there is a transform in
-             * 'values'. The tests for null are required because it can
-             * also be set for other reasons.
-             */
-            if (nonIdentityTx &&
-                values != null && values.getTransform() != null) {
-                hash ^= values.getTransform().hashCode();
-            }
-        }
-        return hash;
-    }
-
-    /**
-     * Compares this <code>Font</code> object to the specified
-     * <code>Object</code>.
-     * @param obj the <code>Object</code> to compare
-     * @return <code>true</code> if the objects are the same
-     *          or if the argument is a <code>Font</code> object
-     *          describing the same font as this object;
-     *          <code>false</code> otherwise.
-     * @since JDK1.0
-     */
-    public boolean equals(Object obj) {
-        if (obj == this) {
-            return true;
-        }
-
-        if (obj != null) {
-            try {
-                Font font = (Font)obj;
-                if (size == font.size &&
-                    style == font.style &&
-                    nonIdentityTx == font.nonIdentityTx &&
-                    hasLayoutAttributes == font.hasLayoutAttributes &&
-                    pointSize == font.pointSize &&
-                    name.equals(font.name)) {
-
-                    /* 'values' is usually initialized lazily, except when
-                     * the font is constructed from a Map, or derived using
-                     * a Map or other values. So if only one font has
-                     * the field initialized we need to initialize it in
-                     * the other instance and compare.
-                     */
-                    if (values == null) {
-                        if (font.values == null) {
-                            return true;
-                        } else {
-                            return getAttributeValues().equals(font.values);
-                        }
-                    } else {
-                        return values.equals(font.getAttributeValues());
-                    }
-                }
-            }
-            catch (ClassCastException e) {
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Converts this <code>Font</code> object to a <code>String</code>
-     * representation.
-     * @return     a <code>String</code> representation of this
-     *          <code>Font</code> object.
-     * @since      JDK1.0
-     */
-    // NOTE: This method may be called by privileged threads.
-    //       DO NOT INVOKE CLIENT CODE ON THIS THREAD!
-    public String toString() {
-        String  strStyle;
-
-        if (isBold()) {
-            strStyle = isItalic() ? "bolditalic" : "bold";
-        } else {
-            strStyle = isItalic() ? "italic" : "plain";
-        }
-
-        return getClass().getName() + "[family=" + getFamily() + ",name=" + name + ",style=" +
-            strStyle + ",size=" + size + "]";
-    } // toString()
-
-
-    /** Serialization support.  A <code>readObject</code>
-     *  method is neccessary because the constructor creates
-     *  the font's peer, and we can't serialize the peer.
-     *  Similarly the computed font "family" may be different
-     *  at <code>readObject</code> time than at
-     *  <code>writeObject</code> time.  An integer version is
-     *  written so that future versions of this class will be
-     *  able to recognize serialized output from this one.
-     */
-    /**
-     * The <code>Font</code> Serializable Data Form.
-     *
-     * @serial
-     */
-    private int fontSerializedDataVersion = 1;
-
-    /**
-     * Writes default serializable fields to a stream.
-     *
-     * @param s the <code>ObjectOutputStream</code> to write
-     * @see AWTEventMulticaster#save(ObjectOutputStream, String, EventListener)
-     * @see #readObject(java.io.ObjectInputStream)
-     */
-    private void writeObject(java.io.ObjectOutputStream s)
-      throws java.lang.ClassNotFoundException,
-             java.io.IOException
-    {
-        if (values != null) {
-          synchronized(values) {
-            // transient
-            fRequestedAttributes = values.toSerializableHashtable();
-            s.defaultWriteObject();
-            fRequestedAttributes = null;
-          }
-        } else {
-          s.defaultWriteObject();
-        }
-    }
-
-    /**
-     * Reads the <code>ObjectInputStream</code>.
-     * Unrecognized keys or values will be ignored.
-     *
-     * @param s the <code>ObjectInputStream</code> to read
-     * @serial
-     * @see #writeObject(java.io.ObjectOutputStream)
-     */
-    private void readObject(java.io.ObjectInputStream s)
-      throws java.lang.ClassNotFoundException,
-             java.io.IOException
-    {
-        s.defaultReadObject();
-        if (pointSize == 0) {
-            pointSize = (float)size;
-        }
-
-        // Handle fRequestedAttributes.
-        // in 1.5, we always streamed out the font values plus
-        // TRANSFORM, SUPERSCRIPT, and WIDTH, regardless of whether the
-        // values were default or not.  In 1.6 we only stream out
-        // defined values.  So, 1.6 streams in from a 1.5 stream,
-        // it check each of these values and 'undefines' it if the
-        // value is the default.
-
-        if (fRequestedAttributes != null) {
-            values = getAttributeValues(); // init
-            AttributeValues extras =
-                AttributeValues.fromSerializableHashtable(fRequestedAttributes);
-            if (!AttributeValues.is16Hashtable(fRequestedAttributes)) {
-                extras.unsetDefault(); // if legacy stream, undefine these
-            }
-            values = getAttributeValues().merge(extras);
-            this.nonIdentityTx = values.anyNonDefault(EXTRA_MASK);
-            this.hasLayoutAttributes =  values.anyNonDefault(LAYOUT_MASK);
-
-            fRequestedAttributes = null; // don't need it any more
-        }
-    }
-
-    /**
-     * Returns the number of glyphs in this <code>Font</code>. Glyph codes
-     * for this <code>Font</code> range from 0 to
-     * <code>getNumGlyphs()</code> - 1.
-     * @return the number of glyphs in this <code>Font</code>.
-     * @since 1.2
-     */
-    public int getNumGlyphs() {
-        return  getFont2D().getNumGlyphs();
-    }
-
-    /**
-     * Returns the glyphCode which is used when this <code>Font</code>
-     * does not have a glyph for a specified unicode code point.
-     * @return the glyphCode of this <code>Font</code>.
-     * @since 1.2
-     */
-    public int getMissingGlyphCode() {
-        return getFont2D().getMissingGlyphCode();
-    }
-
-    /**
-     * Returns the baseline appropriate for displaying this character.
-     * <p>
-     * Large fonts can support different writing systems, and each system can
-     * use a different baseline.
-     * The character argument determines the writing system to use. Clients
-     * should not assume all characters use the same baseline.
-     *
-     * @param c a character used to identify the writing system
-     * @return the baseline appropriate for the specified character.
-     * @see LineMetrics#getBaselineOffsets
-     * @see #ROMAN_BASELINE
-     * @see #CENTER_BASELINE
-     * @see #HANGING_BASELINE
-     * @since 1.2
-     */
-    public byte getBaselineFor(char c) {
-        return getFont2D().getBaselineFor(c);
-    }
-
-    /**
-     * Returns a map of font attributes available in this
-     * <code>Font</code>.  Attributes include things like ligatures and
-     * glyph substitution.
-     * @return the attributes map of this <code>Font</code>.
-     */
-    public Map<TextAttribute,?> getAttributes(){
-        return new AttributeMap(getAttributeValues());
-    }
-
-    /**
-     * Returns the keys of all the attributes supported by this
-     * <code>Font</code>.  These attributes can be used to derive other
-     * fonts.
-     * @return an array containing the keys of all the attributes
-     *          supported by this <code>Font</code>.
-     * @since 1.2
-     */
-    public Attribute[] getAvailableAttributes() {
-        // FONT is not supported by Font
-
-        Attribute attributes[] = {
-            TextAttribute.FAMILY,
-            TextAttribute.WEIGHT,
-            TextAttribute.WIDTH,
-            TextAttribute.POSTURE,
-            TextAttribute.SIZE,
-            TextAttribute.TRANSFORM,
-            TextAttribute.SUPERSCRIPT,
-            TextAttribute.CHAR_REPLACEMENT,
-            TextAttribute.FOREGROUND,
-            TextAttribute.BACKGROUND,
-            TextAttribute.UNDERLINE,
-            TextAttribute.STRIKETHROUGH,
-            TextAttribute.RUN_DIRECTION,
-            TextAttribute.BIDI_EMBEDDING,
-            TextAttribute.JUSTIFICATION,
-            TextAttribute.INPUT_METHOD_HIGHLIGHT,
-            TextAttribute.INPUT_METHOD_UNDERLINE,
-            TextAttribute.SWAP_COLORS,
-            TextAttribute.NUMERIC_SHAPING,
-            TextAttribute.KERNING,
-            TextAttribute.LIGATURES,
-            TextAttribute.TRACKING,
-        };
-
-        return attributes;
-    }
-
-    /**
-     * Creates a new <code>Font</code> object by replicating this
-     * <code>Font</code> object and applying a new style and size.
-     * @param style the style for the new <code>Font</code>
-     * @param size the size for the new <code>Font</code>
-     * @return a new <code>Font</code> object.
-     * @since 1.2
-     */
-    public Font deriveFont(int style, float size){
-        if (values == null) {
-            return new Font(name, style, size, createdFont, font2DHandle);
-        }
-        AttributeValues newValues = getAttributeValues().clone();
-        int oldStyle = (this.style != style) ? this.style : -1;
-        applyStyle(style, newValues);
-        newValues.setSize(size);
-        return new Font(newValues, null, oldStyle, createdFont, font2DHandle);
-    }
-
-    /**
-     * Creates a new <code>Font</code> object by replicating this
-     * <code>Font</code> object and applying a new style and transform.
-     * @param style the style for the new <code>Font</code>
-     * @param trans the <code>AffineTransform</code> associated with the
-     * new <code>Font</code>
-     * @return a new <code>Font</code> object.
-     * @throws IllegalArgumentException if <code>trans</code> is
-     *         <code>null</code>
-     * @since 1.2
-     */
-    public Font deriveFont(int style, AffineTransform trans){
-        AttributeValues newValues = getAttributeValues().clone();
-        int oldStyle = (this.style != style) ? this.style : -1;
-        applyStyle(style, newValues);
-        applyTransform(trans, newValues);
-        return new Font(newValues, null, oldStyle, createdFont, font2DHandle);
-    }
-
-    /**
-     * Creates a new <code>Font</code> object by replicating the current
-     * <code>Font</code> object and applying a new size to it.
-     * @param size the size for the new <code>Font</code>.
-     * @return a new <code>Font</code> object.
-     * @since 1.2
-     */
-    public Font deriveFont(float size){
-        if (values == null) {
-            return new Font(name, style, size, createdFont, font2DHandle);
-        }
-        AttributeValues newValues = getAttributeValues().clone();
-        newValues.setSize(size);
-        return new Font(newValues, null, -1, createdFont, font2DHandle);
-    }
-
-    /**
-     * Creates a new <code>Font</code> object by replicating the current
-     * <code>Font</code> object and applying a new transform to it.
-     * @param trans the <code>AffineTransform</code> associated with the
-     * new <code>Font</code>
-     * @return a new <code>Font</code> object.
-     * @throws IllegalArgumentException if <code>trans</code> is
-     *         <code>null</code>
-     * @since 1.2
-     */
-    public Font deriveFont(AffineTransform trans){
-        AttributeValues newValues = getAttributeValues().clone();
-        applyTransform(trans, newValues);
-        return new Font(newValues, null, -1, createdFont, font2DHandle);
-    }
-
-    /**
-     * Creates a new <code>Font</code> object by replicating the current
-     * <code>Font</code> object and applying a new style to it.
-     * @param style the style for the new <code>Font</code>
-     * @return a new <code>Font</code> object.
-     * @since 1.2
-     */
-    public Font deriveFont(int style){
-        if (values == null) {
-           return new Font(name, style, size, createdFont, font2DHandle);
-        }
-        AttributeValues newValues = getAttributeValues().clone();
-        int oldStyle = (this.style != style) ? this.style : -1;
-        applyStyle(style, newValues);
-        return new Font(newValues, null, oldStyle, createdFont, font2DHandle);
-    }
-
-    /**
-     * Creates a new <code>Font</code> object by replicating the current
-     * <code>Font</code> object and applying a new set of font attributes
-     * to it.
-     *
-     * @param attributes a map of attributes enabled for the new
-     * <code>Font</code>
-     * @return a new <code>Font</code> object.
-     * @since 1.2
-     */
-    public Font deriveFont(Map<? extends Attribute, ?> attributes) {
-        if (attributes == null) {
-            return this;
-        }
-        AttributeValues newValues = getAttributeValues().clone();
-        newValues.merge(attributes, RECOGNIZED_MASK);
-
-        return new Font(newValues, name, style, createdFont, font2DHandle);
-    }
-
-    /**
-     * Checks if this <code>Font</code> has a glyph for the specified
-     * character.
-     *
-     * <p> <b>Note:</b> This method cannot handle <a
-     * href="../../java/lang/Character.html#supplementary"> supplementary
-     * characters</a>. To support all Unicode characters, including
-     * supplementary characters, use the {@link #canDisplay(int)}
-     * method or <code>canDisplayUpTo</code> methods.
-     *
-     * @param c the character for which a glyph is needed
-     * @return <code>true</code> if this <code>Font</code> has a glyph for this
-     *          character; <code>false</code> otherwise.
-     * @since 1.2
-     */
-    public boolean canDisplay(char c){
-        return getFont2D().canDisplay(c);
-    }
-
-    /**
-     * Checks if this <code>Font</code> has a glyph for the specified
-     * character.
-     *
-     * @param codePoint the character (Unicode code point) for which a glyph
-     *        is needed.
-     * @return <code>true</code> if this <code>Font</code> has a glyph for the
-     *          character; <code>false</code> otherwise.
-     * @throws IllegalArgumentException if the code point is not a valid Unicode
-     *          code point.
-     * @see Character#isValidCodePoint(int)
-     * @since 1.5
-     */
-    public boolean canDisplay(int codePoint) {
-        if (!Character.isValidCodePoint(codePoint)) {
-            throw new IllegalArgumentException("invalid code point: " +
-                                               Integer.toHexString(codePoint));
-        }
-        return getFont2D().canDisplay(codePoint);
-    }
-
-    /**
-     * Indicates whether or not this <code>Font</code> can display a
-     * specified <code>String</code>.  For strings with Unicode encoding,
-     * it is important to know if a particular font can display the
-     * string. This method returns an offset into the <code>String</code>
-     * <code>str</code> which is the first character this
-     * <code>Font</code> cannot display without using the missing glyph
-     * code. If the <code>Font</code> can display all characters, -1 is
-     * returned.
-     * @param str a <code>String</code> object
-     * @return an offset into <code>str</code> that points
-     *          to the first character in <code>str</code> that this
-     *          <code>Font</code> cannot display; or <code>-1</code> if
-     *          this <code>Font</code> can display all characters in
-     *          <code>str</code>.
-     * @since 1.2
-     */
-    public int canDisplayUpTo(String str) {
-        Font2D font2d = getFont2D();
-        int len = str.length();
-        for (int i = 0; i < len; i++) {
-            char c = str.charAt(i);
-            if (font2d.canDisplay(c)) {
-                continue;
-            }
-            if (!Character.isHighSurrogate(c)) {
-                return i;
-            }
-            if (!font2d.canDisplay(str.codePointAt(i))) {
-                return i;
-            }
-            i++;
-        }
-        return -1;
-    }
-
-    /**
-     * Indicates whether or not this <code>Font</code> can display
-     * the characters in the specified <code>text</code>
-     * starting at <code>start</code> and ending at
-     * <code>limit</code>.  This method is a convenience overload.
-     * @param text the specified array of <code>char</code> values
-     * @param start the specified starting offset (in
-     *              <code>char</code>s) into the specified array of
-     *              <code>char</code> values
-     * @param limit the specified ending offset (in
-     *              <code>char</code>s) into the specified array of
-     *              <code>char</code> values
-     * @return an offset into <code>text</code> that points
-     *          to the first character in <code>text</code> that this
-     *          <code>Font</code> cannot display; or <code>-1</code> if
-     *          this <code>Font</code> can display all characters in
-     *          <code>text</code>.
-     * @since 1.2
-     */
-    public int canDisplayUpTo(char[] text, int start, int limit) {
-        Font2D font2d = getFont2D();
-        for (int i = start; i < limit; i++) {
-            char c = text[i];
-            if (font2d.canDisplay(c)) {
-                continue;
-            }
-            if (!Character.isHighSurrogate(c)) {
-                return i;
-            }
-            if (!font2d.canDisplay(Character.codePointAt(text, i, limit))) {
-                return i;
-            }
-            i++;
-        }
-        return -1;
-    }
-
-    /**
-     * Indicates whether or not this <code>Font</code> can display the
-     * text specified by the <code>iter</code> starting at
-     * <code>start</code> and ending at <code>limit</code>.
-     *
-     * @param iter  a {@link CharacterIterator} object
-     * @param start the specified starting offset into the specified
-     *              <code>CharacterIterator</code>.
-     * @param limit the specified ending offset into the specified
-     *              <code>CharacterIterator</code>.
-     * @return an offset into <code>iter</code> that points
-     *          to the first character in <code>iter</code> that this
-     *          <code>Font</code> cannot display; or <code>-1</code> if
-     *          this <code>Font</code> can display all characters in
-     *          <code>iter</code>.
-     * @since 1.2
-     */
-    public int canDisplayUpTo(CharacterIterator iter, int start, int limit) {
-        Font2D font2d = getFont2D();
-        char c = iter.setIndex(start);
-        for (int i = start; i < limit; i++, c = iter.next()) {
-            if (font2d.canDisplay(c)) {
-                continue;
-            }
-            if (!Character.isHighSurrogate(c)) {
-                return i;
-            }
-            char c2 = iter.next();
-            // c2 could be CharacterIterator.DONE which is not a low surrogate.
-            if (!Character.isLowSurrogate(c2)) {
-                return i;
-            }
-            if (!font2d.canDisplay(Character.toCodePoint(c, c2))) {
-                return i;
-            }
-            i++;
-        }
-        return -1;
-    }
-
-    /**
-     * Returns the italic angle of this <code>Font</code>.  The italic angle
-     * is the inverse slope of the caret which best matches the posture of this
-     * <code>Font</code>.
-     * @see TextAttribute#POSTURE
-     * @return the angle of the ITALIC style of this <code>Font</code>.
-     */
-    public float getItalicAngle() {
-        return getItalicAngle(null);
-    }
-
-    /* The FRC hints don't affect the value of the italic angle but
-     * we need to pass them in to look up a strike.
-     * If we can pass in ones already being used it can prevent an extra
-     * strike from being allocated. Note that since italic angle is
-     * a property of the font, the font transform is needed not the
-     * device transform. Finally, this is private but the only caller of this
-     * in the JDK - and the only likely caller - is in this same class.
-     */
-    private float getItalicAngle(FontRenderContext frc) {
-        Object aa, fm;
-        if (frc == null) {
-            aa = RenderingHints.VALUE_TEXT_ANTIALIAS_OFF;
-            fm = RenderingHints.VALUE_FRACTIONALMETRICS_OFF;
-        } else {
-            aa = frc.getAntiAliasingHint();
-            fm = frc.getFractionalMetricsHint();
-        }
-        return getFont2D().getItalicAngle(this, identityTx, aa, fm);
-    }
-
-    /**
-     * Checks whether or not this <code>Font</code> has uniform
-     * line metrics.  A logical <code>Font</code> might be a
-     * composite font, which means that it is composed of different
-     * physical fonts to cover different code ranges.  Each of these
-     * fonts might have different <code>LineMetrics</code>.  If the
-     * logical <code>Font</code> is a single
-     * font then the metrics would be uniform.
-     * @return <code>true</code> if this <code>Font</code> has
-     * uniform line metrics; <code>false</code> otherwise.
-     */
-    public boolean hasUniformLineMetrics() {
-        return false;   // REMIND always safe, but prevents caller optimize
-    }
-
-    private transient SoftReference<FontLineMetrics> flmref;
-    private FontLineMetrics defaultLineMetrics(FontRenderContext frc) {
-        FontLineMetrics flm = null;
-        if (flmref == null
-            || (flm = flmref.get()) == null
-            || !flm.frc.equals(frc)) {
-
-            /* The device transform in the frc is not used in obtaining line
-             * metrics, although it probably should be: REMIND find why not?
-             * The font transform is used but its applied in getFontMetrics, so
-             * just pass identity here
-             */
-            float [] metrics = new float[8];
-            getFont2D().getFontMetrics(this, identityTx,
-                                       frc.getAntiAliasingHint(),
-                                       frc.getFractionalMetricsHint(),
-                                       metrics);
-            float ascent  = metrics[0];
-            float descent = metrics[1];
-            float leading = metrics[2];
-            float ssOffset = 0;
-            if (values != null && values.getSuperscript() != 0) {
-                ssOffset = (float)getTransform().getTranslateY();
-                ascent -= ssOffset;
-                descent += ssOffset;
-            }
-            float height = ascent + descent + leading;
-
-            int baselineIndex = 0; // need real index, assumes roman for everything
-            // need real baselines eventually
-            float[] baselineOffsets = { 0, (descent/2f - ascent) / 2f, -ascent };
-
-            float strikethroughOffset = metrics[4];
-            float strikethroughThickness = metrics[5];
-
-            float underlineOffset = metrics[6];
-            float underlineThickness = metrics[7];
-
-            float italicAngle = getItalicAngle(frc);
-
-            if (isTransformed()) {
-                AffineTransform ctx = values.getCharTransform(); // extract rotation
-                if (ctx != null) {
-                    Point2D.Float pt = new Point2D.Float();
-                    pt.setLocation(0, strikethroughOffset);
-                    ctx.deltaTransform(pt, pt);
-                    strikethroughOffset = pt.y;
-                    pt.setLocation(0, strikethroughThickness);
-                    ctx.deltaTransform(pt, pt);
-                    strikethroughThickness = pt.y;
-                    pt.setLocation(0, underlineOffset);
-                    ctx.deltaTransform(pt, pt);
-                    underlineOffset = pt.y;
-                    pt.setLocation(0, underlineThickness);
-                    ctx.deltaTransform(pt, pt);
-                    underlineThickness = pt.y;
-                }
-            }
-            strikethroughOffset += ssOffset;
-            underlineOffset += ssOffset;
-
-            CoreMetrics cm = new CoreMetrics(ascent, descent, leading, height,
-                                             baselineIndex, baselineOffsets,
-                                             strikethroughOffset, strikethroughThickness,
-                                             underlineOffset, underlineThickness,
-                                             ssOffset, italicAngle);
-
-            flm = new FontLineMetrics(0, cm, frc);
-            flmref = new SoftReference<FontLineMetrics>(flm);
-        }
-
-        return (FontLineMetrics)flm.clone();
-    }
-
-    /**
-     * Returns a {@link LineMetrics} object created with the specified
-     * <code>String</code> and {@link FontRenderContext}.
-     * @param str the specified <code>String</code>
-     * @param frc the specified <code>FontRenderContext</code>
-     * @return a <code>LineMetrics</code> object created with the
-     * specified <code>String</code> and {@link FontRenderContext}.
-     */
-    public LineMetrics getLineMetrics( String str, FontRenderContext frc) {
-        FontLineMetrics flm = defaultLineMetrics(frc);
-        flm.numchars = str.length();
-        return flm;
-    }
-
-    /**
-     * Returns a <code>LineMetrics</code> object created with the
-     * specified arguments.
-     * @param str the specified <code>String</code>
-     * @param beginIndex the initial offset of <code>str</code>
-     * @param limit the end offset of <code>str</code>
-     * @param frc the specified <code>FontRenderContext</code>
-     * @return a <code>LineMetrics</code> object created with the
-     * specified arguments.
-     */
-    public LineMetrics getLineMetrics( String str,
-                                    int beginIndex, int limit,
-                                    FontRenderContext frc) {
-        FontLineMetrics flm = defaultLineMetrics(frc);
-        int numChars = limit - beginIndex;
-        flm.numchars = (numChars < 0)? 0: numChars;
-        return flm;
-    }
-
-    /**
-     * Returns a <code>LineMetrics</code> object created with the
-     * specified arguments.
-     * @param chars an array of characters
-     * @param beginIndex the initial offset of <code>chars</code>
-     * @param limit the end offset of <code>chars</code>
-     * @param frc the specified <code>FontRenderContext</code>
-     * @return a <code>LineMetrics</code> object created with the
-     * specified arguments.
-     */
-    public LineMetrics getLineMetrics(char [] chars,
-                                    int beginIndex, int limit,
-                                    FontRenderContext frc) {
-        FontLineMetrics flm = defaultLineMetrics(frc);
-        int numChars = limit - beginIndex;
-        flm.numchars = (numChars < 0)? 0: numChars;
-        return flm;
-    }
-
-    /**
-     * Returns a <code>LineMetrics</code> object created with the
-     * specified arguments.
-     * @param ci the specified <code>CharacterIterator</code>
-     * @param beginIndex the initial offset in <code>ci</code>
-     * @param limit the end offset of <code>ci</code>
-     * @param frc the specified <code>FontRenderContext</code>
-     * @return a <code>LineMetrics</code> object created with the
-     * specified arguments.
-     */
-    public LineMetrics getLineMetrics(CharacterIterator ci,
-                                    int beginIndex, int limit,
-                                    FontRenderContext frc) {
-        FontLineMetrics flm = defaultLineMetrics(frc);
-        int numChars = limit - beginIndex;
-        flm.numchars = (numChars < 0)? 0: numChars;
-        return flm;
-    }
-
-    /**
-     * Returns the logical bounds of the specified <code>String</code> in
-     * the specified <code>FontRenderContext</code>.  The logical bounds
-     * contains the origin, ascent, advance, and height, which includes
-     * the leading.  The logical bounds does not always enclose all the
-     * text.  For example, in some languages and in some fonts, accent
-     * marks can be positioned above the ascent or below the descent.
-     * To obtain a visual bounding box, which encloses all the text,
-     * use the {@link TextLayout#getBounds() getBounds} method of
-     * <code>TextLayout</code>.
-     * <p>Note: The returned bounds is in baseline-relative coordinates
-     * (see {@link java.awt.Font class notes}).
-     * @param str the specified <code>String</code>
-     * @param frc the specified <code>FontRenderContext</code>
-     * @return a {@link Rectangle2D} that is the bounding box of the
-     * specified <code>String</code> in the specified
-     * <code>FontRenderContext</code>.
-     * @see FontRenderContext
-     * @see Font#createGlyphVector
-     * @since 1.2
-     */
-    public Rectangle2D getStringBounds( String str, FontRenderContext frc) {
-        char[] array = str.toCharArray();
-        return getStringBounds(array, 0, array.length, frc);
-    }
-
-   /**
-     * Returns the logical bounds of the specified <code>String</code> in
-     * the specified <code>FontRenderContext</code>.  The logical bounds
-     * contains the origin, ascent, advance, and height, which includes
-     * the leading.  The logical bounds does not always enclose all the
-     * text.  For example, in some languages and in some fonts, accent
-     * marks can be positioned above the ascent or below the descent.
-     * To obtain a visual bounding box, which encloses all the text,
-     * use the {@link TextLayout#getBounds() getBounds} method of
-     * <code>TextLayout</code>.
-     * <p>Note: The returned bounds is in baseline-relative coordinates
-     * (see {@link java.awt.Font class notes}).
-     * @param str the specified <code>String</code>
-     * @param beginIndex the initial offset of <code>str</code>
-     * @param limit the end offset of <code>str</code>
-     * @param frc the specified <code>FontRenderContext</code>
-     * @return a <code>Rectangle2D</code> that is the bounding box of the
-     * specified <code>String</code> in the specified
-     * <code>FontRenderContext</code>.
-     * @throws IndexOutOfBoundsException if <code>beginIndex</code> is
-     *         less than zero, or <code>limit</code> is greater than the
-     *         length of <code>str</code>, or <code>beginIndex</code>
-     *         is greater than <code>limit</code>.
-     * @see FontRenderContext
-     * @see Font#createGlyphVector
-     * @since 1.2
-     */
-    public Rectangle2D getStringBounds( String str,
-                                    int beginIndex, int limit,
-                                        FontRenderContext frc) {
-        String substr = str.substring(beginIndex, limit);
-        return getStringBounds(substr, frc);
-    }
-
-   /**
-     * Returns the logical bounds of the specified array of characters
-     * in the specified <code>FontRenderContext</code>.  The logical
-     * bounds contains the origin, ascent, advance, and height, which
-     * includes the leading.  The logical bounds does not always enclose
-     * all the text.  For example, in some languages and in some fonts,
-     * accent marks can be positioned above the ascent or below the
-     * descent.  To obtain a visual bounding box, which encloses all the
-     * text, use the {@link TextLayout#getBounds() getBounds} method of
-     * <code>TextLayout</code>.
-     * <p>Note: The returned bounds is in baseline-relative coordinates
-     * (see {@link java.awt.Font class notes}).
-     * @param chars an array of characters
-     * @param beginIndex the initial offset in the array of
-     * characters
-     * @param limit the end offset in the array of characters
-     * @param frc the specified <code>FontRenderContext</code>
-     * @return a <code>Rectangle2D</code> that is the bounding box of the
-     * specified array of characters in the specified
-     * <code>FontRenderContext</code>.
-     * @throws IndexOutOfBoundsException if <code>beginIndex</code> is
-     *         less than zero, or <code>limit</code> is greater than the
-     *         length of <code>chars</code>, or <code>beginIndex</code>
-     *         is greater than <code>limit</code>.
-     * @see FontRenderContext
-     * @see Font#createGlyphVector
-     * @since 1.2
-     */
-    public Rectangle2D getStringBounds(char [] chars,
-                                    int beginIndex, int limit,
-                                       FontRenderContext frc) {
-        if (beginIndex < 0) {
-            throw new IndexOutOfBoundsException("beginIndex: " + beginIndex);
-        }
-        if (limit > chars.length) {
-            throw new IndexOutOfBoundsException("limit: " + limit);
-        }
-        if (beginIndex > limit) {
-            throw new IndexOutOfBoundsException("range length: " +
-                                                (limit - beginIndex));
-        }
-
-        // this code should be in textlayout
-        // quick check for simple text, assume GV ok to use if simple
-
-        boolean simple = values == null ||
-            (values.getKerning() == 0 && values.getLigatures() == 0 &&
-              values.getBaselineTransform() == null);
-        if (simple) {
-            simple = ! FontUtilities.isComplexText(chars, beginIndex, limit);
-        }
-
-        if (simple) {
-            GlyphVector gv = new StandardGlyphVector(this, chars, beginIndex,
-                                                     limit - beginIndex, frc);
-            return gv.getLogicalBounds();
-        } else {
-            // need char array constructor on textlayout
-            String str = new String(chars, beginIndex, limit - beginIndex);
-            TextLayout tl = new TextLayout(str, this, frc);
-            return new Rectangle2D.Float(0, -tl.getAscent(), tl.getAdvance(),
-                                         tl.getAscent() + tl.getDescent() +
-                                         tl.getLeading());
-        }
-    }
-
-   /**
-     * Returns the logical bounds of the characters indexed in the
-     * specified {@link CharacterIterator} in the
-     * specified <code>FontRenderContext</code>.  The logical bounds
-     * contains the origin, ascent, advance, and height, which includes
-     * the leading.  The logical bounds does not always enclose all the
-     * text.  For example, in some languages and in some fonts, accent
-     * marks can be positioned above the ascent or below the descent.
-     * To obtain a visual bounding box, which encloses all the text,
-     * use the {@link TextLayout#getBounds() getBounds} method of
-     * <code>TextLayout</code>.
-     * <p>Note: The returned bounds is in baseline-relative coordinates
-     * (see {@link java.awt.Font class notes}).
-     * @param ci the specified <code>CharacterIterator</code>
-     * @param beginIndex the initial offset in <code>ci</code>
-     * @param limit the end offset in <code>ci</code>
-     * @param frc the specified <code>FontRenderContext</code>
-     * @return a <code>Rectangle2D</code> that is the bounding box of the
-     * characters indexed in the specified <code>CharacterIterator</code>
-     * in the specified <code>FontRenderContext</code>.
-     * @see FontRenderContext
-     * @see Font#createGlyphVector
-     * @since 1.2
-     * @throws IndexOutOfBoundsException if <code>beginIndex</code> is
-     *         less than the start index of <code>ci</code>, or
-     *         <code>limit</code> is greater than the end index of
-     *         <code>ci</code>, or <code>beginIndex</code> is greater
-     *         than <code>limit</code>
-     */
-    public Rectangle2D getStringBounds(CharacterIterator ci,
-                                    int beginIndex, int limit,
-                                       FontRenderContext frc) {
-        int start = ci.getBeginIndex();
-        int end = ci.getEndIndex();
-
-        if (beginIndex < start) {
-            throw new IndexOutOfBoundsException("beginIndex: " + beginIndex);
-        }
-        if (limit > end) {
-            throw new IndexOutOfBoundsException("limit: " + limit);
-        }
-        if (beginIndex > limit) {
-            throw new IndexOutOfBoundsException("range length: " +
-                                                (limit - beginIndex));
-        }
-
-        char[]  arr = new char[limit - beginIndex];
-
-        ci.setIndex(beginIndex);
-        for(int idx = 0; idx < arr.length; idx++) {
-            arr[idx] = ci.current();
-            ci.next();
-        }
-
-        return getStringBounds(arr,0,arr.length,frc);
-    }
-
-    /**
-     * Returns the bounds for the character with the maximum
-     * bounds as defined in the specified <code>FontRenderContext</code>.
-     * <p>Note: The returned bounds is in baseline-relative coordinates
-     * (see {@link java.awt.Font class notes}).
-     * @param frc the specified <code>FontRenderContext</code>
-     * @return a <code>Rectangle2D</code> that is the bounding box
-     * for the character with the maximum bounds.
-     */
-    public Rectangle2D getMaxCharBounds(FontRenderContext frc) {
-        float [] metrics = new float[4];
-
-        getFont2D().getFontMetrics(this, frc, metrics);
-
-        return new Rectangle2D.Float(0, -metrics[0],
-                                metrics[3],
-                                metrics[0] + metrics[1] + metrics[2]);
-    }
-
-    /**
-     * Creates a {@link java.awt.font.GlyphVector GlyphVector} by
-     * mapping characters to glyphs one-to-one based on the
-     * Unicode cmap in this <code>Font</code>.  This method does no other
-     * processing besides the mapping of glyphs to characters.  This
-     * means that this method is not useful for some scripts, such
-     * as Arabic, Hebrew, Thai, and Indic, that require reordering,
-     * shaping, or ligature substitution.
-     * @param frc the specified <code>FontRenderContext</code>
-     * @param str the specified <code>String</code>
-     * @return a new <code>GlyphVector</code> created with the
-     * specified <code>String</code> and the specified
-     * <code>FontRenderContext</code>.
-     */
-    public GlyphVector createGlyphVector(FontRenderContext frc, String str)
-    {
-        return (GlyphVector)new StandardGlyphVector(this, str, frc);
-    }
-
-    /**
-     * Creates a {@link java.awt.font.GlyphVector GlyphVector} by
-     * mapping characters to glyphs one-to-one based on the
-     * Unicode cmap in this <code>Font</code>.  This method does no other
-     * processing besides the mapping of glyphs to characters.  This
-     * means that this method is not useful for some scripts, such
-     * as Arabic, Hebrew, Thai, and Indic, that require reordering,
-     * shaping, or ligature substitution.
-     * @param frc the specified <code>FontRenderContext</code>
-     * @param chars the specified array of characters
-     * @return a new <code>GlyphVector</code> created with the
-     * specified array of characters and the specified
-     * <code>FontRenderContext</code>.
-     */
-    public GlyphVector createGlyphVector(FontRenderContext frc, char[] chars)
-    {
-        return (GlyphVector)new StandardGlyphVector(this, chars, frc);
-    }
-
-    /**
-     * Creates a {@link java.awt.font.GlyphVector GlyphVector} by
-     * mapping the specified characters to glyphs one-to-one based on the
-     * Unicode cmap in this <code>Font</code>.  This method does no other
-     * processing besides the mapping of glyphs to characters.  This
-     * means that this method is not useful for some scripts, such
-     * as Arabic, Hebrew, Thai, and Indic, that require reordering,
-     * shaping, or ligature substitution.
-     * @param frc the specified <code>FontRenderContext</code>
-     * @param ci the specified <code>CharacterIterator</code>
-     * @return a new <code>GlyphVector</code> created with the
-     * specified <code>CharacterIterator</code> and the specified
-     * <code>FontRenderContext</code>.
-     */
-    public GlyphVector createGlyphVector(   FontRenderContext frc,
-                                            CharacterIterator ci)
-    {
-        return (GlyphVector)new StandardGlyphVector(this, ci, frc);
-    }
-
-    /**
-     * Creates a {@link java.awt.font.GlyphVector GlyphVector} by
-     * mapping characters to glyphs one-to-one based on the
-     * Unicode cmap in this <code>Font</code>.  This method does no other
-     * processing besides the mapping of glyphs to characters.  This
-     * means that this method is not useful for some scripts, such
-     * as Arabic, Hebrew, Thai, and Indic, that require reordering,
-     * shaping, or ligature substitution.
-     * @param frc the specified <code>FontRenderContext</code>
-     * @param glyphCodes the specified integer array
-     * @return a new <code>GlyphVector</code> created with the
-     * specified integer array and the specified
-     * <code>FontRenderContext</code>.
-     */
-    public GlyphVector createGlyphVector(   FontRenderContext frc,
-                                            int [] glyphCodes)
-    {
-        return (GlyphVector)new StandardGlyphVector(this, glyphCodes, frc);
-    }
-
-    /**
-     * Returns a new <code>GlyphVector</code> object, performing full
-     * layout of the text if possible.  Full layout is required for
-     * complex text, such as Arabic or Hindi.  Support for different
-     * scripts depends on the font and implementation.
-     * <p>
-     * Layout requires bidi analysis, as performed by
-     * <code>Bidi</code>, and should only be performed on text that
-     * has a uniform direction.  The direction is indicated in the
-     * flags parameter,by using LAYOUT_RIGHT_TO_LEFT to indicate a
-     * right-to-left (Arabic and Hebrew) run direction, or
-     * LAYOUT_LEFT_TO_RIGHT to indicate a left-to-right (English)
-     * run direction.
-     * <p>
-     * In addition, some operations, such as Arabic shaping, require
-     * context, so that the characters at the start and limit can have
-     * the proper shapes.  Sometimes the data in the buffer outside
-     * the provided range does not have valid data.  The values
-     * LAYOUT_NO_START_CONTEXT and LAYOUT_NO_LIMIT_CONTEXT can be
-     * added to the flags parameter to indicate that the text before
-     * start, or after limit, respectively, should not be examined
-     * for context.
-     * <p>
-     * All other values for the flags parameter are reserved.
-     *
-     * @param frc the specified <code>FontRenderContext</code>
-     * @param text the text to layout
-     * @param start the start of the text to use for the <code>GlyphVector</code>
-     * @param limit the limit of the text to use for the <code>GlyphVector</code>
-     * @param flags control flags as described above
-     * @return a new <code>GlyphVector</code> representing the text between
-     * start and limit, with glyphs chosen and positioned so as to best represent
-     * the text
-     * @throws ArrayIndexOutOfBoundsException if start or limit is
-     * out of bounds
-     * @see java.text.Bidi
-     * @see #LAYOUT_LEFT_TO_RIGHT
-     * @see #LAYOUT_RIGHT_TO_LEFT
-     * @see #LAYOUT_NO_START_CONTEXT
-     * @see #LAYOUT_NO_LIMIT_CONTEXT
-     * @since 1.4
-     */
-    public GlyphVector layoutGlyphVector(FontRenderContext frc,
-                                         char[] text,
-                                         int start,
-                                         int limit,
-                                         int flags) {
-
-        return new StandardGlyphVector(this,text,start, limit-start, frc);
-    }
-
-    /**
-     * A flag to layoutGlyphVector indicating that text is left-to-right as
-     * determined by Bidi analysis.
-     */
-    public static final int LAYOUT_LEFT_TO_RIGHT = 0;
-
-    /**
-     * A flag to layoutGlyphVector indicating that text is right-to-left as
-     * determined by Bidi analysis.
-     */
-    public static final int LAYOUT_RIGHT_TO_LEFT = 1;
-
-    /**
-     * A flag to layoutGlyphVector indicating that text in the char array
-     * before the indicated start should not be examined.
-     */
-    public static final int LAYOUT_NO_START_CONTEXT = 2;
-
-    /**
-     * A flag to layoutGlyphVector indicating that text in the char array
-     * after the indicated limit should not be examined.
-     */
-    public static final int LAYOUT_NO_LIMIT_CONTEXT = 4;
-
-
-    private static void applyTransform(AffineTransform trans, AttributeValues values) {
-        if (trans == null) {
-            throw new IllegalArgumentException("transform must not be null");
-        }
-        values.setTransform(trans);
-    }
-
-    private static void applyStyle(int style, AttributeValues values) {
-        // WEIGHT_BOLD, WEIGHT_REGULAR
-        values.setWeight((style & BOLD) != 0 ? 2f : 1f);
-        // POSTURE_OBLIQUE, POSTURE_REGULAR
-        values.setPosture((style & ITALIC) != 0 ? .2f : 0f);
-    }
-
-}
diff --git a/openjdk/java/awt/GraphicsConfiguration.java b/openjdk/java/awt/GraphicsConfiguration.java
deleted file mode 100644
index 429ddc02..00000000
--- a/openjdk/java/awt/GraphicsConfiguration.java
+++ /dev/null
@@ -1,452 +0,0 @@
-/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.awt;
-
-import java.awt.geom.AffineTransform;
-import java.awt.image.BufferedImage;
-import java.awt.image.ColorModel;
-import java.awt.image.VolatileImage;
-import java.awt.image.WritableRaster;
-
-/**
- * The <code>GraphicsConfiguration</code> class describes the
- * characteristics of a graphics destination such as a printer or monitor.
- * There can be many <code>GraphicsConfiguration</code> objects associated
- * with a single graphics device, representing different drawing modes or
- * capabilities.  The corresponding native structure will vary from platform
- * to platform.  For example, on X11 windowing systems,
- * each visual is a different <code>GraphicsConfiguration</code>.
- * On Microsoft Windows, <code>GraphicsConfiguration</code>s represent
- * PixelFormats available in the current resolution and color depth.
- * <p>
- * In a virtual device multi-screen environment in which the desktop
- * area could span multiple physical screen devices, the bounds of the
- * <code>GraphicsConfiguration</code> objects are relative to the
- * virtual coordinate system.  When setting the location of a
- * component, use {@link #getBounds() getBounds} to get the bounds of
- * the desired <code>GraphicsConfiguration</code> and offset the location
- * with the coordinates of the <code>GraphicsConfiguration</code>,
- * as the following code sample illustrates:
- * </p>
- *
- * <pre>
- *      Frame f = new Frame(gc);  // where gc is a GraphicsConfiguration
- *      Rectangle bounds = gc.getBounds();
- *      f.setLocation(10 + bounds.x, 10 + bounds.y); </pre>
- *
- * <p>
- * To determine if your environment is a virtual device
- * environment, call <code>getBounds</code> on all of the
- * <code>GraphicsConfiguration</code> objects in your system.  If
- * any of the origins of the returned bounds is not (0,&nbsp;0),
- * your environment is a virtual device environment.
- *
- * <p>
- * You can also use <code>getBounds</code> to determine the bounds
- * of the virtual device.  To do this, first call <code>getBounds</code> on all
- * of the <code>GraphicsConfiguration</code> objects in your
- * system.  Then calculate the union of all of the bounds returned
- * from the calls to <code>getBounds</code>.  The union is the
- * bounds of the virtual device.  The following code sample
- * calculates the bounds of the virtual device.
- *
- * <pre>
- *      Rectangle virtualBounds = new Rectangle();
- *      GraphicsEnvironment ge = GraphicsEnvironment.
- *              getLocalGraphicsEnvironment();
- *      GraphicsDevice[] gs =
- *              ge.getScreenDevices();
- *      for (int j = 0; j < gs.length; j++) {
- *          GraphicsDevice gd = gs[j];
- *          GraphicsConfiguration[] gc =
- *              gd.getConfigurations();
- *          for (int i=0; i < gc.length; i++) {
- *              virtualBounds =
- *                  virtualBounds.union(gc[i].getBounds());
- *          }
- *      } </pre>
- *
- * @see Window
- * @see Frame
- * @see GraphicsEnvironment
- * @see GraphicsDevice
- */
-/*
- * REMIND:  What to do about capabilities?
- * The
- * capabilities of the device can be determined by enumerating the possible
- * capabilities and checking if the GraphicsConfiguration
- * implements the interface for that capability.
- *
- */
-
-
-public abstract class GraphicsConfiguration {
-
-    private static BufferCapabilities defaultBufferCaps;
-    private static ImageCapabilities defaultImageCaps;
-
-    /**
-     * This is an abstract class that cannot be instantiated directly.
-     * Instances must be obtained from a suitable factory or query method.
-     *
-     * @see GraphicsDevice#getConfigurations
-     * @see GraphicsDevice#getDefaultConfiguration
-     * @see GraphicsDevice#getBestConfiguration
-     * @see Graphics2D#getDeviceConfiguration
-     */
-    protected GraphicsConfiguration() {
-    }
-
-    /**
-     * Returns the {@link GraphicsDevice} associated with this
-     * <code>GraphicsConfiguration</code>.
-     * @return a <code>GraphicsDevice</code> object that is
-     * associated with this <code>GraphicsConfiguration</code>.
-     */
-    public abstract GraphicsDevice getDevice();
-
-    /**
-     * Returns a {@link BufferedImage} with a data layout and color model
-     * compatible with this <code>GraphicsConfiguration</code>.  This
-     * method has nothing to do with memory-mapping
-     * a device.  The returned <code>BufferedImage</code> has
-     * a layout and color model that is closest to this native device
-     * configuration and can therefore be optimally blitted to this
-     * device.
-     * @param width the width of the returned <code>BufferedImage</code>
-     * @param height the height of the returned <code>BufferedImage</code>
-     * @return a <code>BufferedImage</code> whose data layout and color
-     * model is compatible with this <code>GraphicsConfiguration</code>.
-     */
-    public BufferedImage createCompatibleImage(int width, int height) {
-        ColorModel model = getColorModel();
-        WritableRaster raster =
-            model.createCompatibleWritableRaster(width, height);
-        return new BufferedImage(model, raster,
-                                 model.isAlphaPremultiplied(), null);
-    }
-
-    /**
-     * Returns a <code>BufferedImage</code> that supports the specified
-     * transparency and has a data layout and color model
-     * compatible with this <code>GraphicsConfiguration</code>.  This
-     * method has nothing to do with memory-mapping
-     * a device. The returned <code>BufferedImage</code> has a layout and
-     * color model that can be optimally blitted to a device
-     * with this <code>GraphicsConfiguration</code>.
-     * @param width the width of the returned <code>BufferedImage</code>
-     * @param height the height of the returned <code>BufferedImage</code>
-     * @param transparency the specified transparency mode
-     * @return a <code>BufferedImage</code> whose data layout and color
-     * model is compatible with this <code>GraphicsConfiguration</code>
-     * and also supports the specified transparency.
-     * @throws IllegalArgumentException if the transparency is not a valid value
-     * @see Transparency#OPAQUE
-     * @see Transparency#BITMASK
-     * @see Transparency#TRANSLUCENT
-     */
-    public BufferedImage createCompatibleImage(int width, int height,
-                                               int transparency)
-    {
-        if (getColorModel().getTransparency() == transparency) {
-            return createCompatibleImage(width, height);
-        }
-
-        ColorModel cm = getColorModel(transparency);
-        if (cm == null) {
-            throw new IllegalArgumentException("Unknown transparency: " +
-                                               transparency);
-        }
-        WritableRaster wr = cm.createCompatibleWritableRaster(width, height);
-        return new BufferedImage(cm, wr, cm.isAlphaPremultiplied(), null);
-    }
-
-
-    /**
-     * Returns a {@link VolatileImage} with a data layout and color model
-     * compatible with this <code>GraphicsConfiguration</code>.
-     * The returned <code>VolatileImage</code>
-     * may have data that is stored optimally for the underlying graphics
-     * device and may therefore benefit from platform-specific rendering
-     * acceleration.
-     * @param width the width of the returned <code>VolatileImage</code>
-     * @param height the height of the returned <code>VolatileImage</code>
-     * @return a <code>VolatileImage</code> whose data layout and color
-     * model is compatible with this <code>GraphicsConfiguration</code>.
-     * @see Component#createVolatileImage(int, int)
-     * @since 1.4
-     */
-    public VolatileImage createCompatibleVolatileImage(int width, int height) {
-        VolatileImage vi = null;
-        try {
-            vi = createCompatibleVolatileImage(width, height,
-                                               null, Transparency.OPAQUE);
-        } catch (AWTException e) {
-            // shouldn't happen: we're passing in null caps
-            assert false;
-        }
-        return vi;
-    }
-
-    /**
-     * Returns a {@link VolatileImage} with a data layout and color model
-     * compatible with this <code>GraphicsConfiguration</code>.
-     * The returned <code>VolatileImage</code>
-     * may have data that is stored optimally for the underlying graphics
-     * device and may therefore benefit from platform-specific rendering
-     * acceleration.
-     * @param width the width of the returned <code>VolatileImage</code>
-     * @param height the height of the returned <code>VolatileImage</code>
-     * @param transparency the specified transparency mode
-     * @return a <code>VolatileImage</code> whose data layout and color
-     * model is compatible with this <code>GraphicsConfiguration</code>.
-     * @throws IllegalArgumentException if the transparency is not a valid value
-     * @see Transparency#OPAQUE
-     * @see Transparency#BITMASK
-     * @see Transparency#TRANSLUCENT
-     * @see Component#createVolatileImage(int, int)
-     * @since 1.5
-     */
-    public VolatileImage createCompatibleVolatileImage(int width, int height,
-                                                       int transparency)
-    {
-        VolatileImage vi = null;
-        try {
-            vi = createCompatibleVolatileImage(width, height, null, transparency);
-        } catch (AWTException e) {
-            // shouldn't happen: we're passing in null caps
-            assert false;
-        }
-        return vi;
-    }
-
-    /**
-     * Returns a {@link VolatileImage} with a data layout and color model
-     * compatible with this <code>GraphicsConfiguration</code>, using
-     * the specified image capabilities.
-     * If the <code>caps</code> parameter is null, it is effectively ignored
-     * and this method will create a VolatileImage without regard to
-     * <code>ImageCapabilities</code> constraints.
-     *
-     * The returned <code>VolatileImage</code> has
-     * a layout and color model that is closest to this native device
-     * configuration and can therefore be optimally blitted to this
-     * device.
-     * @return a <code>VolatileImage</code> whose data layout and color
-     * model is compatible with this <code>GraphicsConfiguration</code>.
-     * @param width the width of the returned <code>VolatileImage</code>
-     * @param height the height of the returned <code>VolatileImage</code>
-     * @param caps the image capabilities
-     * @exception AWTException if the supplied image capabilities could not
-     * be met by this graphics configuration
-     * @since 1.4
-     */
-    public VolatileImage createCompatibleVolatileImage(int width, int height,
-        ImageCapabilities caps) throws AWTException
-    {
-        return createCompatibleVolatileImage(width, height, caps,
-                                             Transparency.OPAQUE);
-    }
-
-    /**
-     * Returns a {@link VolatileImage} with a data layout and color model
-     * compatible with this <code>GraphicsConfiguration</code>, using
-     * the specified image capabilities and transparency value.
-     * If the <code>caps</code> parameter is null, it is effectively ignored
-     * and this method will create a VolatileImage without regard to
-     * <code>ImageCapabilities</code> constraints.
-     *
-     * The returned <code>VolatileImage</code> has
-     * a layout and color model that is closest to this native device
-     * configuration and can therefore be optimally blitted to this
-     * device.
-     * @param width the width of the returned <code>VolatileImage</code>
-     * @param height the height of the returned <code>VolatileImage</code>
-     * @param caps the image capabilities
-     * @param transparency the specified transparency mode
-     * @return a <code>VolatileImage</code> whose data layout and color
-     * model is compatible with this <code>GraphicsConfiguration</code>.
-     * @see Transparency#OPAQUE
-     * @see Transparency#BITMASK
-     * @see Transparency#TRANSLUCENT
-     * @throws IllegalArgumentException if the transparency is not a valid value
-     * @exception AWTException if the supplied image capabilities could not
-     * be met by this graphics configuration
-     * @see Component#createVolatileImage(int, int)
-     * @since 1.5
-     */
-    public VolatileImage createCompatibleVolatileImage(int width, int height,
-        ImageCapabilities caps, int transparency) throws AWTException
-    {
-        VolatileImage vi = 
-            new Container().createVolatileImage(width, height, caps);
-        if (caps != null && caps.isAccelerated() &&
-            !vi.getCapabilities().isAccelerated())
-        {
-            throw new AWTException("Supplied image capabilities could not " +
-                                   "be met by this graphics configuration.");
-        }
-        return vi;
-    }
-
-    /**
-     * Returns the {@link ColorModel} associated with this
-     * <code>GraphicsConfiguration</code>.
-     * @return a <code>ColorModel</code> object that is associated with
-     * this <code>GraphicsConfiguration</code>.
-     */
-    public abstract ColorModel getColorModel();
-
-    /**
-     * Returns the <code>ColorModel</code> associated with this
-     * <code>GraphicsConfiguration</code> that supports the specified
-     * transparency.
-     * @param transparency the specified transparency mode
-     * @return a <code>ColorModel</code> object that is associated with
-     * this <code>GraphicsConfiguration</code> and supports the
-     * specified transparency or null if the transparency is not a valid
-     * value.
-     * @see Transparency#OPAQUE
-     * @see Transparency#BITMASK
-     * @see Transparency#TRANSLUCENT
-     */
-    public abstract ColorModel getColorModel(int transparency);
-
-    /**
-     * Returns the default {@link AffineTransform} for this
-     * <code>GraphicsConfiguration</code>. This
-     * <code>AffineTransform</code> is typically the Identity transform
-     * for most normal screens.  The default <code>AffineTransform</code>
-     * maps coordinates onto the device such that 72 user space
-     * coordinate units measure approximately 1 inch in device
-     * space.  The normalizing transform can be used to make
-     * this mapping more exact.  Coordinates in the coordinate space
-     * defined by the default <code>AffineTransform</code> for screen and
-     * printer devices have the origin in the upper left-hand corner of
-     * the target region of the device, with X coordinates
-     * increasing to the right and Y coordinates increasing downwards.
-     * For image buffers not associated with a device, such as those not
-     * created by <code>createCompatibleImage</code>,
-     * this <code>AffineTransform</code> is the Identity transform.
-     * @return the default <code>AffineTransform</code> for this
-     * <code>GraphicsConfiguration</code>.
-     */
-    public abstract AffineTransform getDefaultTransform();
-
-    /**
-     *
-     * Returns a <code>AffineTransform</code> that can be concatenated
-     * with the default <code>AffineTransform</code>
-     * of a <code>GraphicsConfiguration</code> so that 72 units in user
-     * space equals 1 inch in device space.
-     * <p>
-     * For a particular {@link Graphics2D}, g, one
-     * can reset the transformation to create
-     * such a mapping by using the following pseudocode:
-     * <pre>
-     *      GraphicsConfiguration gc = g.getDeviceConfiguration();
-     *
-     *      g.setTransform(gc.getDefaultTransform());
-     *      g.transform(gc.getNormalizingTransform());
-     * </pre>
-     * Note that sometimes this <code>AffineTransform</code> is identity,
-     * such as for printers or metafile output, and that this
-     * <code>AffineTransform</code> is only as accurate as the information
-     * supplied by the underlying system.  For image buffers not
-     * associated with a device, such as those not created by
-     * <code>createCompatibleImage</code>, this
-     * <code>AffineTransform</code> is the Identity transform
-     * since there is no valid distance measurement.
-     * @return an <code>AffineTransform</code> to concatenate to the
-     * default <code>AffineTransform</code> so that 72 units in user
-     * space is mapped to 1 inch in device space.
-     */
-    public abstract AffineTransform getNormalizingTransform();
-
-    /**
-     * Returns the bounds of the <code>GraphicsConfiguration</code>
-     * in the device coordinates. In a multi-screen environment
-     * with a virtual device, the bounds can have negative X
-     * or Y origins.
-     * @return the bounds of the area covered by this
-     * <code>GraphicsConfiguration</code>.
-     * @since 1.3
-     */
-    public abstract Rectangle getBounds();
-
-    private static class DefaultBufferCapabilities extends BufferCapabilities {
-        public DefaultBufferCapabilities(ImageCapabilities imageCaps) {
-            super(imageCaps, imageCaps, null);
-        }
-    }
-
-    /**
-     * Returns the buffering capabilities of this
-     * <code>GraphicsConfiguration</code>.
-     * @return the buffering capabilities of this graphics
-     * configuration object
-     * @since 1.4
-     */
-    public BufferCapabilities getBufferCapabilities() {
-        if (defaultBufferCaps == null) {
-            defaultBufferCaps = new DefaultBufferCapabilities(
-                getImageCapabilities());
-        }
-        return defaultBufferCaps;
-    }
-
-    /**
-     * Returns the image capabilities of this
-     * <code>GraphicsConfiguration</code>.
-     * @return the image capabilities of this graphics
-     * configuration object
-     * @since 1.4
-     */
-    public ImageCapabilities getImageCapabilities() {
-        if (defaultImageCaps == null) {
-            defaultImageCaps = new ImageCapabilities(false);
-        }
-        return defaultImageCaps;
-    }
-
-    /**
-     * Returns whether this {@code GraphicsConfiguration} supports
-     * the {@link GraphicsDevice.WindowTranslucency#PERPIXEL_TRANSLUCENT
-     * PERPIXEL_TRANSLUCENT} kind of translucency.
-     *
-     * @return whether the given GraphicsConfiguration supports
-     *         the translucency effects.
-     *
-     * @see Window#setBackground(Color)
-     *
-     * @since 1.7
-     */
-    public boolean isTranslucencyCapable() {
-        // Overridden in subclasses
-        return false;
-    }
-}
diff --git a/openjdk/java/awt/Image.java b/openjdk/java/awt/Image.java
deleted file mode 100644
index bc643781..00000000
--- a/openjdk/java/awt/Image.java
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
- * Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.awt;
-
-import java.awt.image.ImageProducer;
-import java.awt.image.ImageObserver;
-import java.awt.image.ImageFilter;
-import java.awt.image.FilteredImageSource;
-import java.awt.image.AreaAveragingScaleFilter;
-import java.awt.image.ReplicateScaleFilter;
-
-//import sun.awt.image.SurfaceManager;
-
-/**
- * The abstract class <code>Image</code> is the superclass of all
- * classes that represent graphical images. The image must be
- * obtained in a platform-specific manner.
- *
- * @author      Sami Shaio
- * @author      Arthur van Hoff
- * @since       JDK1.0
- */
-public abstract class Image {
-
-    /**
-     * convenience object; we can use this single static object for
-     * all images that do not create their own image caps; it holds the
-     * default (unaccelerated) properties.
-     */
-    private static ImageCapabilities defaultImageCaps =
-        new ImageCapabilities(false);
-
-    /**
-     * Priority for accelerating this image.  Subclasses are free to
-     * set different default priorities and applications are free to
-     * set the priority for specific images via the
-     * <code>setAccelerationPriority(float)</code> method.
-     * @since 1.5
-     */
-    protected float accelerationPriority = .5f;
-
-    /**
-     * Determines the width of the image. If the width is not yet known,
-     * this method returns <code>-1</code> and the specified
-     * <code>ImageObserver</code> object is notified later.
-     * @param     observer   an object waiting for the image to be loaded.
-     * @return    the width of this image, or <code>-1</code>
-     *                   if the width is not yet known.
-     * @see       java.awt.Image#getHeight
-     * @see       java.awt.image.ImageObserver
-     */
-    public abstract int getWidth(ImageObserver observer);
-
-    /**
-     * Determines the height of the image. If the height is not yet known,
-     * this method returns <code>-1</code> and the specified
-     * <code>ImageObserver</code> object is notified later.
-     * @param     observer   an object waiting for the image to be loaded.
-     * @return    the height of this image, or <code>-1</code>
-     *                   if the height is not yet known.
-     * @see       java.awt.Image#getWidth
-     * @see       java.awt.image.ImageObserver
-     */
-    public abstract int getHeight(ImageObserver observer);
-
-    /**
-     * Gets the object that produces the pixels for the image.
-     * This method is called by the image filtering classes and by
-     * methods that perform image conversion and scaling.
-     * @return     the image producer that produces the pixels
-     *                                  for this image.
-     * @see        java.awt.image.ImageProducer
-     */
-    public abstract ImageProducer getSource();
-
-    /**
-     * Creates a graphics context for drawing to an off-screen image.
-     * This method can only be called for off-screen images.
-     * @return  a graphics context to draw to the off-screen image.
-     * @exception UnsupportedOperationException if called for a
-     *            non-off-screen image.
-     * @see     java.awt.Graphics
-     * @see     java.awt.Component#createImage(int, int)
-     */
-    public abstract Graphics getGraphics();
-
-    /**
-     * Gets a property of this image by name.
-     * <p>
-     * Individual property names are defined by the various image
-     * formats. If a property is not defined for a particular image, this
-     * method returns the <code>UndefinedProperty</code> object.
-     * <p>
-     * If the properties for this image are not yet known, this method
-     * returns <code>null</code>, and the <code>ImageObserver</code>
-     * object is notified later.
-     * <p>
-     * The property name <code>"comment"</code> should be used to store
-     * an optional comment which can be presented to the application as a
-     * description of the image, its source, or its author.
-     * @param       name   a property name.
-     * @param       observer   an object waiting for this image to be loaded.
-     * @return      the value of the named property.
-     * @throws      <code>NullPointerException</code> if the property name is null.
-     * @see         java.awt.image.ImageObserver
-     * @see         java.awt.Image#UndefinedProperty
-     */
-    public abstract Object getProperty(String name, ImageObserver observer);
-
-    /**
-     * The <code>UndefinedProperty</code> object should be returned whenever a
-     * property which was not defined for a particular image is fetched.
-     */
-    public static final Object UndefinedProperty = new Object();
-
-    /**
-     * Creates a scaled version of this image.
-     * A new <code>Image</code> object is returned which will render
-     * the image at the specified <code>width</code> and
-     * <code>height</code> by default.  The new <code>Image</code> object
-     * may be loaded asynchronously even if the original source image
-     * has already been loaded completely.
-     *
-     * <p>
-     *
-     * If either <code>width</code>
-     * or <code>height</code> is a negative number then a value is
-     * substituted to maintain the aspect ratio of the original image
-     * dimensions. If both <code>width</code> and <code>height</code>
-     * are negative, then the original image dimensions are used.
-     *
-     * @param width the width to which to scale the image.
-     * @param height the height to which to scale the image.
-     * @param hints flags to indicate the type of algorithm to use
-     * for image resampling.
-     * @return     a scaled version of the image.
-     * @exception IllegalArgumentException if <code>width</code>
-     *             or <code>height</code> is zero.
-     * @see        java.awt.Image#SCALE_DEFAULT
-     * @see        java.awt.Image#SCALE_FAST
-     * @see        java.awt.Image#SCALE_SMOOTH
-     * @see        java.awt.Image#SCALE_REPLICATE
-     * @see        java.awt.Image#SCALE_AREA_AVERAGING
-     * @since      JDK1.1
-     */
-    public Image getScaledInstance(int width, int height, int hints) {
-        ImageFilter filter;
-        if ((hints & (SCALE_SMOOTH | SCALE_AREA_AVERAGING)) != 0) {
-            filter = new AreaAveragingScaleFilter(width, height);
-        } else {
-            filter = new ReplicateScaleFilter(width, height);
-        }
-        ImageProducer prod;
-        prod = new FilteredImageSource(getSource(), filter);
-        return Toolkit.getDefaultToolkit().createImage(prod);
-    }
-
-    /**
-     * Use the default image-scaling algorithm.
-     * @since JDK1.1
-     */
-    public static final int SCALE_DEFAULT = 1;
-
-    /**
-     * Choose an image-scaling algorithm that gives higher priority
-     * to scaling speed than smoothness of the scaled image.
-     * @since JDK1.1
-     */
-    public static final int SCALE_FAST = 2;
-
-    /**
-     * Choose an image-scaling algorithm that gives higher priority
-     * to image smoothness than scaling speed.
-     * @since JDK1.1
-     */
-    public static final int SCALE_SMOOTH = 4;
-
-    /**
-     * Use the image scaling algorithm embodied in the
-     * <code>ReplicateScaleFilter</code> class.
-     * The <code>Image</code> object is free to substitute a different filter
-     * that performs the same algorithm yet integrates more efficiently
-     * into the imaging infrastructure supplied by the toolkit.
-     * @see        java.awt.image.ReplicateScaleFilter
-     * @since      JDK1.1
-     */
-    public static final int SCALE_REPLICATE = 8;
-
-    /**
-     * Use the Area Averaging image scaling algorithm.  The
-     * image object is free to substitute a different filter that
-     * performs the same algorithm yet integrates more efficiently
-     * into the image infrastructure supplied by the toolkit.
-     * @see java.awt.image.AreaAveragingScaleFilter
-     * @since JDK1.1
-     */
-    public static final int SCALE_AREA_AVERAGING = 16;
-
-    /**
-     * Flushes all reconstructable resources being used by this Image object.
-     * This includes any pixel data that is being cached for rendering to
-     * the screen as well as any system resources that are being used
-     * to store data or pixels for the image if they can be recreated.
-     * The image is reset to a state similar to when it was first created
-     * so that if it is again rendered, the image data will have to be
-     * recreated or fetched again from its source.
-     * <p>
-     * Examples of how this method affects specific types of Image object:
-     * <ul>
-     * <li>
-     * BufferedImage objects leave the primary Raster which stores their
-     * pixels untouched, but flush any information cached about those
-     * pixels such as copies uploaded to the display hardware for
-     * accelerated blits.
-     * <li>
-     * Image objects created by the Component methods which take a
-     * width and height leave their primary buffer of pixels untouched,
-     * but have all cached information released much like is done for
-     * BufferedImage objects.
-     * <li>
-     * VolatileImage objects release all of their pixel resources
-     * including their primary copy which is typically stored on
-     * the display hardware where resources are scarce.
-     * These objects can later be restored using their
-     * {@link java.awt.image.VolatileImage#validate validate}
-     * method.
-     * <li>
-     * Image objects created by the Toolkit and Component classes which are
-     * loaded from files, URLs or produced by an {@link ImageProducer}
-     * are unloaded and all local resources are released.
-     * These objects can later be reloaded from their original source
-     * as needed when they are rendered, just as when they were first
-     * created.
-     * </ul>
-     */
-    public void flush() {
-//        if (surfaceManager != null) {
-//            surfaceManager.flush();
-//        }
-    }
-
-    /**
-     * Returns an ImageCapabilities object which can be
-     * inquired as to the capabilities of this
-     * Image on the specified GraphicsConfiguration.
-     * This allows programmers to find
-     * out more runtime information on the specific Image
-     * object that they have created.  For example, the user
-     * might create a BufferedImage but the system may have
-     * no video memory left for creating an image of that
-     * size on the given GraphicsConfiguration, so although the object
-     * may be acceleratable in general, it
-     * does not have that capability on this GraphicsConfiguration.
-     * @param gc a <code>GraphicsConfiguration</code> object.  A value of null
-     * for this parameter will result in getting the image capabilities
-     * for the default <code>GraphicsConfiguration</code>.
-     * @return an <code>ImageCapabilities</code> object that contains
-     * the capabilities of this <code>Image</code> on the specified
-     * GraphicsConfiguration.
-     * @see java.awt.image.VolatileImage#getCapabilities()
-     * VolatileImage.getCapabilities()
-     * @since 1.5
-     */
-    public ImageCapabilities getCapabilities(GraphicsConfiguration gc) {
-//        if (surfaceManager != null) {
-//            return surfaceManager.getCapabilities(gc);
-//        }
-        // Note: this is just a default object that gets returned in the
-        // absence of any more specific information from a surfaceManager.
-        // Subclasses of Image should either override this method or
-        // make sure that they always have a non-null SurfaceManager
-        // to return an ImageCapabilities object that is appropriate
-        // for their given subclass type.
-        return defaultImageCaps;
-    }
-
-    /**
-     * Sets a hint for this image about how important acceleration is.
-     * This priority hint is used to compare to the priorities of other
-     * Image objects when determining how to use scarce acceleration
-     * resources such as video memory.  When and if it is possible to
-     * accelerate this Image, if there are not enough resources available
-     * to provide that acceleration but enough can be freed up by
-     * de-accelerating some other image of lower priority, then that other
-     * Image may be de-accelerated in deference to this one.  Images
-     * that have the same priority take up resources on a first-come,
-     * first-served basis.
-     * @param priority a value between 0 and 1, inclusive, where higher
-     * values indicate more importance for acceleration.  A value of 0
-     * means that this Image should never be accelerated.  Other values
-     * are used simply to determine acceleration priority relative to other
-     * Images.
-     * @throws IllegalArgumentException if <code>priority</code> is less
-     * than zero or greater than 1.
-     * @since 1.5
-     */
-    public void setAccelerationPriority(float priority) {
-        if (priority < 0 || priority > 1) {
-            throw new IllegalArgumentException("Priority must be a value " +
-                                               "between 0 and 1, inclusive");
-        }
-        accelerationPriority = priority;
-//        if (surfaceManager != null) {
-//            surfaceManager.setAccelerationPriority(accelerationPriority);
-//        }
-    }
-
-    /**
-     * Returns the current value of the acceleration priority hint.
-     * @see #setAccelerationPriority(float priority) setAccelerationPriority
-     * @return value between 0 and 1, inclusive, which represents the current
-     * priority value
-     * @since 1.5
-     */
-    public float getAccelerationPriority() {
-        return accelerationPriority;
-    }
-
-//    SurfaceManager surfaceManager;
-//
-//    static {
-//        SurfaceManager.setImageAccessor(new SurfaceManager.ImageAccessor() {
-//            public SurfaceManager getSurfaceManager(Image img) {
-//                return img.surfaceManager;
-//            }
-//            public void setSurfaceManager(Image img, SurfaceManager mgr) {
-//                img.surfaceManager = mgr;
-//            }
-//        });
-//    }
-}
diff --git a/openjdk/java/awt/color/ICC_ColorSpace.java b/openjdk/java/awt/color/ICC_ColorSpace.java
deleted file mode 100644
index 465d7dc4..00000000
--- a/openjdk/java/awt/color/ICC_ColorSpace.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/* ICC_ColorSpace.java -- the canonical color space implementation
-   Copyright (C) 2000, 2002, 2004 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-
-package java.awt.color;
-
-import gnu.java.awt.color.CieXyzConverter;
-import gnu.java.awt.color.ClutProfileConverter;
-import gnu.java.awt.color.ColorSpaceConverter;
-import gnu.java.awt.color.GrayProfileConverter;
-import gnu.java.awt.color.GrayScaleConverter;
-import gnu.java.awt.color.RgbProfileConverter;
-import gnu.java.awt.color.SrgbConverter;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-
-/**
- * ICC_ColorSpace - an implementation of ColorSpace
- *
- * While an ICC_Profile class abstracts the data in an ICC profile file
- * an ICC_ColorSpace performs the color space conversions defined by
- * an ICC_Profile instance.
- *
- * Typically, an ICC_Profile will either be created using getInstance,
- * either from the built-in colorspaces, or from an ICC profile file.
- * Then a ICC_Colorspace will be used to perform transforms from the
- * device colorspace to and from the profile color space.
- *
- * The PCS used by ColorSpace is CIE XYZ relative a D50 white point.
- * (Profiles using a CIE Lab PCS will have their input and output converted
- * to D50 CIE XYZ accordingly.
- *
- * Note that a valid profile may not contain transforms in both directions,
- * in which case the output may be undefined.
- * All built-in colorspaces have bidirectional transforms, but developers
- * using an ICC profile file may want to check the profile class using
- * the ICC_Profile.getProfileClass() method. Input class profiles are
- * guaranteed to have transforms to the PCS, output class profiles are
- * guaranteed to have transforms from the PCS to device space.
- *
- * @author Sven de Marothy
- * @author Rolf W. Rasmussen (rolfwr@ii.uib.no)
- * @since 1.2
- */
-public class ICC_ColorSpace extends ColorSpace
-{
-  /**
-   * Compatible with JDK 1.2+.
-   */
-  private static final long serialVersionUID = 3455889114070431483L;
-
-  /**
-   * @serial
-   */
-  private ICC_Profile thisProfile;
-
-  /**
-   * @serial
-   */
-  private float[] minVal;
-
-  /**
-   * @serial
-   */
-  private float[] maxVal;
-
-  /**
-   * @serial
-   */
-  private float[] diffMinMax;
-
-  /**
-   * @serial
-   */
-  private float[] invDiffMinMax;
-
-  /**
-   * @serial
-   */
-  private boolean needScaleInit;
-
-  /**
-   * Tells us if the PCS is CIE LAB (must be CIEXYZ otherwise)
-   */
-  private transient int type;
-  private transient int nComponents;
-  private transient ColorSpaceConverter converter;
-
-  /**
-   * Constructs a new ICC_ColorSpace from an ICC_Profile object.
-   *
-   * @exception IllegalArgumentException If profile is inappropriate for
-   * representing a ColorSpace.
-   */
-  public ICC_ColorSpace(ICC_Profile profile)
-  {
-    super(profile.getColorSpaceType(), profile.getNumComponents());
-
-    converter = getConverter(profile);
-    thisProfile = profile;
-    nComponents = profile.getNumComponents();
-    type = profile.getColorSpaceType();
-    makeArrays();
-  }
-
-  /**
-   * Return the profile
-   */
-  public ICC_Profile getProfile()
-  {
-    return thisProfile;
-  }
-
-  /**
-   * Transforms a color value assumed to be in this ColorSpace into a value in
-   * the default CS_sRGB color space.
-   *
-   * @exception ArrayIndexOutOfBoundsException If array length is not at least
-   * the number of components in this ColorSpace.
-   */
-  public float[] toRGB(float[] colorvalue)
-  {
-    return converter.toRGB(colorvalue);
-  }
-
-  /**
-   * Transforms a color value assumed to be in the default CS_sRGB color space
-   * into this ColorSpace.
-   *
-   * @exception ArrayIndexOutOfBoundsException If array length is not at
-   * least 3.
-   */
-  public float[] fromRGB(float[] rgbvalue)
-  {
-    return converter.fromRGB(rgbvalue);
-  }
-
-  /**
-   * Transforms a color value assumed to be in this ColorSpace into the
-   * CS_CIEXYZ conversion color space.
-   *
-   * @exception ArrayIndexOutOfBoundsException If array length is not at
-   * least the number of components in this ColorSpace.
-   */
-  public float[] toCIEXYZ(float[] colorvalue)
-  {
-    return converter.toCIEXYZ(colorvalue);
-  }
-
-  /**
-   * Transforms a color value assumed to be in the CS_CIEXYZ conversion color
-   * space into this ColorSpace.
-   *
-   * @exception ArrayIndexOutOfBoundsException If array length is not at
-   * least 3.
-   */
-  public float[] fromCIEXYZ(float[] colorvalue)
-  {
-    return converter.fromCIEXYZ(colorvalue);
-  }
-
-  /**
-   * Returns the minimum normalized color component value for the specified
-   * component.
-   *
-   * @exception IllegalArgumentException If component is less than 0 or greater
-   * than numComponents - 1.
-   *
-   * @since 1.4
-   */
-  public float getMinValue(int idx)
-  {
-    // FIXME: Not 100% certain of this.
-    if (type == ColorSpace.TYPE_Lab && (idx == 1 || idx == 2))
-      return -128f;
-
-    if (idx < 0 || idx >= nComponents)
-      throw new IllegalArgumentException();
-    return 0;
-  }
-
-  /**
-   * Returns the maximum normalized color component value for the specified
-   * component.
-   *
-   * @exception IllegalArgumentException If component is less than 0 or greater
-   * than numComponents - 1.
-   *
-   * @since 1.4
-   */
-  public float getMaxValue(int idx)
-  {
-    if (type == ColorSpace.TYPE_XYZ && idx >= 0 && idx <= 2)
-      return 1 + 32767 / 32768f;
-    else if (type == ColorSpace.TYPE_Lab)
-      {
-        if (idx == 0)
-          return 100;
-        if (idx == 1 || idx == 2)
-          return 127;
-      }
-    if (idx < 0 || idx >= nComponents)
-      throw new IllegalArgumentException();
-    return 1;
-  }
-
-  /**
-   * Returns a colorspace converter suitable for a given profile
-   */
-  private ColorSpaceConverter getConverter(ICC_Profile profile)
-  {
-    ColorSpaceConverter converter;
-    switch (profile.getColorSpaceType())
-      {
-      case TYPE_XYZ:
-        converter = new CieXyzConverter();
-        break;
-      default:
-        if (profile instanceof ICC_ProfileRGB)
-          converter = new RgbProfileConverter((ICC_ProfileRGB) profile);
-        else if (profile instanceof ICC_ProfileGray)
-          converter = new GrayProfileConverter((ICC_ProfileGray) profile);
-        else
-          converter = new ClutProfileConverter(profile);
-        break;
-      }
-    return converter;
-  }
-
-  /**
-   * Serialization compatibility requires these variable to be set,
-   * although we don't use them. Perhaps we should?
-   */
-  private void makeArrays()
-  {
-    minVal = new float[nComponents];
-    maxVal = new float[nComponents];
-
-    invDiffMinMax = diffMinMax = null;
-    for (int i = 0; i < nComponents; i++)
-      {
-        minVal[i] = getMinValue(i);
-        maxVal[i] = getMaxValue(i);
-      }
-    needScaleInit = true;
-  }
-
-  /**
-   * Deserializes the object
-   */
-  private void readObject(ObjectInputStream s)
-                   throws IOException, ClassNotFoundException
-  {
-    s.defaultReadObject();
-    // set up objects
-    converter = getConverter(thisProfile);
-    nComponents = thisProfile.getNumComponents();
-    type = thisProfile.getColorSpaceType();
-  }
-} // class ICC_ColorSpace
diff --git a/openjdk/java/awt/image/AffineTransformOp.java b/openjdk/java/awt/image/AffineTransformOp.java
deleted file mode 100644
index df9db7d9..00000000
--- a/openjdk/java/awt/image/AffineTransformOp.java
+++ /dev/null
@@ -1,608 +0,0 @@
-/* AffineTransformOp.java --  This class performs affine 
-   transformation between two images or rasters in 2 dimensions.
-   Copyright (C) 2004, 2006 Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package java.awt.image;
-
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.RenderingHints;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.NoninvertibleTransformException;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.util.Arrays;
-
-/**
- * AffineTransformOp performs matrix-based transformations (translations,
- * scales, flips, rotations, and shears).
- * 
- * If interpolation is required, nearest neighbour, bilinear, and bicubic
- * methods are available.
- *
- * @author Olga Rodimina (rodimina@redhat.com) 
- * @author Francis Kung (fkung@redhat.com)
- */
-public class AffineTransformOp implements BufferedImageOp, RasterOp
-{
-    public static final int TYPE_NEAREST_NEIGHBOR = 1;
-    
-    public static final int TYPE_BILINEAR = 2;
-    
-    /**
-     * @since 1.5.0
-     */
-    public static final int TYPE_BICUBIC = 3;
-
-    private AffineTransform transform;
-    private RenderingHints hints;
-    
-    /**
-     * Construct AffineTransformOp with the given xform and interpolationType.
-     * Interpolation type can be TYPE_BILINEAR, TYPE_BICUBIC or
-     * TYPE_NEAREST_NEIGHBOR.
-     *
-     * @param xform AffineTransform that will applied to the source image 
-     * @param interpolationType type of interpolation used
-     * @throws ImagingOpException if the transform matrix is noninvertible
-     */
-    public AffineTransformOp (AffineTransform xform, int interpolationType)
-    {
-      this.transform = xform;
-      if (xform.getDeterminant() == 0)
-        throw new ImagingOpException(null);
-
-      switch (interpolationType)
-      {
-      case TYPE_BILINEAR:
-        hints = new RenderingHints (RenderingHints.KEY_INTERPOLATION, 
-                                    RenderingHints.VALUE_INTERPOLATION_BILINEAR);
-        break;
-      case TYPE_BICUBIC:
-        hints = new RenderingHints (RenderingHints.KEY_INTERPOLATION, 
-				    RenderingHints.VALUE_INTERPOLATION_BICUBIC);
-        break;
-      default:
-        hints = new RenderingHints (RenderingHints.KEY_INTERPOLATION,
-                                    RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR);
-      }
-    }
-
-    /**
-     * Construct AffineTransformOp with the given xform and rendering hints.
-     * 
-     * @param xform AffineTransform that will applied to the source image
-     * @param hints rendering hints that will be used during transformation
-     * @throws ImagingOpException if the transform matrix is noninvertible
-     */
-    public AffineTransformOp (AffineTransform xform, RenderingHints hints)
-    {
-      this.transform = xform;
-      this.hints = hints;
-      if (xform.getDeterminant() == 0)
-        throw new ImagingOpException(null);
-    }
-
-    /**
-     * Creates a new BufferedImage with the size equal to that of the 
-     * transformed image and the correct number of bands. The newly created 
-     * image is created with the specified ColorModel. 
-     * If a ColorModel is not specified, an appropriate ColorModel is used.
-     *
-     * @param src the source image.
-     * @param destCM color model for the destination image (can be null).
-     * @return a new compatible destination image.
-     */
-    public BufferedImage createCompatibleDestImage (BufferedImage src,
-                                                    ColorModel destCM)
-    {
-      if (destCM != null)
-        return new BufferedImage(destCM,
-                                 createCompatibleDestRaster(src.getRaster()),
-                                 src.isAlphaPremultiplied(), null);
-
-      // This behaviour was determined by Mauve testcases, and is compatible
-      // with the reference implementation
-      if (src.getType() == BufferedImage.TYPE_INT_ARGB_PRE
-          || src.getType() == BufferedImage.TYPE_4BYTE_ABGR
-          || src.getType() == BufferedImage.TYPE_4BYTE_ABGR_PRE)
-        return new BufferedImage(src.getWidth(), src.getHeight(), src.getType());
-
-      else
-        return new BufferedImage(src.getWidth(), src.getHeight(),
-                                 BufferedImage.TYPE_INT_ARGB);
-    }
-
-    /**
-     * Creates a new WritableRaster with the size equal to the transformed 
-     * source raster and correct number of bands .
-     *
-     * @param src the source raster.
-     * @throws RasterFormatException if resulting width or height of raster is 0.
-     * @return a new compatible raster.
-     */
-    public WritableRaster createCompatibleDestRaster (Raster src)
-    {
-      Rectangle2D rect = getBounds2D(src);
-      
-      if (rect.getWidth() == 0 || rect.getHeight() == 0) 
-        throw new RasterFormatException("width or height is 0");
-
-      return src.createCompatibleWritableRaster((int) rect.getWidth(), 
-                                                (int) rect.getHeight());
-    }
-
-    /**
-     * Transforms source image using transform specified at the constructor.
-     * The resulting transformed image is stored in the destination image if one
-     * is provided; otherwise a new BufferedImage is created and returned. 
-     *
-     * @param src source image
-     * @param dst destination image
-     * @throws IllegalArgumentException if the source and destination image are
-     *          the same
-     * @return transformed source image.
-     */
-    public final BufferedImage filter (BufferedImage src, BufferedImage dst)
-    {
-      if (dst == src)
-        throw new IllegalArgumentException("src image cannot be the same as "
-                                         + "the dst image");
-
-      // If the destination image is null, then use a compatible BufferedImage
-      if (dst == null)
-        dst = createCompatibleDestImage(src, null);
-
-      Graphics2D gr = dst.createGraphics();
-      gr.setRenderingHints(hints);
-      gr.drawImage(src, transform, null);
-      return dst;
-    }
-
-    /**
-     * Transforms source raster using transform specified at the constructor.
-     * The resulting raster is stored in the destination raster if it is not
-     * null, otherwise a new raster is created and returned.
-     *
-     * @param src source raster
-     * @param dst destination raster
-     * @throws IllegalArgumentException if the source and destination are not
-     *          compatible
-     * @return transformed raster.
-     */
-    public final WritableRaster filter(Raster src, WritableRaster dst)
-    {
-      // Initial checks
-      if (dst == src)
-        throw new IllegalArgumentException("src image cannot be the same as"
-                                           + " the dst image");
-
-      if (dst == null)
-        dst = createCompatibleDestRaster(src);
-
-      if (src.getNumBands() != dst.getNumBands())
-        throw new IllegalArgumentException("src and dst must have same number"
-                                           + " of bands");
-      
-      // Optimization for rasters that can be represented in the RGB colormodel:
-      // wrap the rasters in images, and let Cairo do the transformation
-      if (ColorModel.getRGBdefault().isCompatibleSampleModel(src.getSampleModel())
-          && ColorModel.getRGBdefault().isCompatibleSampleModel(dst.getSampleModel()))
-        {
-          WritableRaster src2 = Raster.createWritableRaster(src.getSampleModel(),
-                                                            src.getDataBuffer(),
-                                                            new Point(src.getMinX(),
-                                                                      src.getMinY()));
-          BufferedImage iSrc = new BufferedImage(ColorModel.getRGBdefault(),
-                                                 src2, false, null);
-          BufferedImage iDst = new BufferedImage(ColorModel.getRGBdefault(), dst,
-                                                 false, null);
-  
-          return filter(iSrc, iDst).getRaster();
-        }
-
-      // Otherwise, we need to do the transformation in java code...
-      // Create arrays to hold all the points
-      double[] dstPts = new double[dst.getHeight() * dst.getWidth() * 2];
-      double[] srcPts = new double[dst.getHeight() * dst.getWidth() * 2];
-
-      // Populate array with all points in the *destination* raster
-      int i = 0;
-      for (int x = 0; x < dst.getWidth(); x++)
-        {
-          for (int y = 0; y < dst.getHeight(); y++)
-            {
-              dstPts[i++] = x;
-              dstPts[i++] = y;
-            }
-        }
-      Rectangle srcbounds = src.getBounds();
-
-      // Use an inverse transform to map each point in the destination to
-      // a point in the source.  Note that, while all points in the destination
-      // matrix are integers, this is not necessarily true for points in the
-      // source (hence why interpolation is required) 
-      try
-        {
-          AffineTransform inverseTx = transform.createInverse();
-          inverseTx.transform(dstPts, 0, srcPts, 0, dstPts.length / 2);
-        }
-      catch (NoninvertibleTransformException e)
-        {
-          // Shouldn't happen since the constructor traps this
-          throw new ImagingOpException(e.getMessage());
-        }
-
-      // Different interpolation methods...
-      if (hints.containsValue(RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR))
-        filterNearest(src, dst, dstPts, srcPts);
-      
-      else if (hints.containsValue(RenderingHints.VALUE_INTERPOLATION_BILINEAR))
-        filterBilinear(src, dst, dstPts, srcPts);
-    
-      else          // bicubic
-        filterBicubic(src, dst, dstPts, srcPts);
-
-      return dst;  
-    }
-
-    /**
-     * Transforms source image using transform specified at the constructor and 
-     * returns bounds of the transformed image.
-     *
-     * @param src image to be transformed
-     * @return bounds of the transformed image.
-     */
-    public final Rectangle2D getBounds2D (BufferedImage src)
-    {
-      return getBounds2D (src.getRaster());
-    }
-   
-    /**
-     * Returns bounds of the transformed raster.
-     *
-     * @param src raster to be transformed
-     * @return bounds of the transformed raster.
-     */
-    public final Rectangle2D getBounds2D (Raster src)
-    {
-      return transform.createTransformedShape(src.getBounds()).getBounds2D();
-    }
-
-    /**
-     * Returns interpolation type used during transformations.
-     *
-     * @return interpolation type
-     */
-    public final int getInterpolationType ()
-    {
-      if (hints.containsValue(RenderingHints.VALUE_INTERPOLATION_BILINEAR))
-        return TYPE_BILINEAR;
-      
-      else if (hints.containsValue(RenderingHints.VALUE_INTERPOLATION_BICUBIC))
-        return TYPE_BICUBIC;
-      
-      else 
-        return TYPE_NEAREST_NEIGHBOR;
-    }
-
-    /** 
-     * Returns location of the transformed source point. The resulting point 
-     * is stored in the dstPt if one is specified.
-     *  
-     * @param srcPt point to be transformed
-     * @param dstPt destination point
-     * @return the location of the transformed source point.
-     */
-    public final Point2D getPoint2D (Point2D srcPt, Point2D dstPt)
-    {
-      return transform.transform (srcPt, dstPt);
-    }
-
-    /**
-     * Returns rendering hints that are used during transformation.
-     *
-     * @return the rendering hints used in this Op.
-     */
-    public final RenderingHints getRenderingHints ()
-    {
-      return hints;
-    }
-
-    /**
-     * Returns transform used in transformation between source and destination
-     * image.
-     *
-     * @return the transform used in this Op.
-     */
-    public final AffineTransform getTransform ()
-    {
-      return transform;
-    }
-    
-    /**
-     * Perform nearest-neighbour filtering
-     * 
-     * @param src the source raster
-     * @param dst the destination raster
-     * @param dpts array of points on the destination raster
-     * @param pts array of corresponding points on the source raster
-     */
-    private void filterNearest(Raster src, WritableRaster dst, double[] dpts,
-                               double[] pts)
-    {
-      Rectangle srcbounds = src.getBounds();
-  
-      // For all points on the destination raster, copy the value from the
-      // corrosponding (rounded) source point
-      for (int i = 0; i < dpts.length; i += 2)
-        {
-          int srcX = (int) Math.round(pts[i]) + src.getMinX();
-          int srcY = (int) Math.round(pts[i + 1]) + src.getMinY();
-          
-          if (srcbounds.contains(srcX, srcY))
-            dst.setDataElements((int) dpts[i] + dst.getMinX(),
-                                (int) dpts[i + 1] + dst.getMinY(),
-                                src.getDataElements(srcX, srcY, null));
-        }
-    }
-
-    /**
-     * Perform bilinear filtering
-     * 
-     * @param src the source raster
-     * @param dst the destination raster
-     * @param dpts array of points on the destination raster
-     * @param pts array of corresponding points on the source raster
-     */
-    private void filterBilinear(Raster src, WritableRaster dst, double[] dpts,
-                              double[] pts)
-    {
-      Rectangle srcbounds = src.getBounds();
-  
-      Object xyarr = null;
-      Object xp1arr = null;
-      Object yp1arr = null;
-      Object xyp1arr = null;
-      
-      double xy;
-      double xp1;
-      double yp1;
-      double xyp1;
-
-      double[] result = new double[src.getNumBands()];
-      
-      // For all points in the destination raster, use bilinear interpolation
-      // to find the value from the corrosponding source points
-      for (int i = 0; i < dpts.length; i += 2)
-        {
-          int srcX = (int) Math.round(pts[i]) + src.getMinX();
-          int srcY = (int) Math.round(pts[i + 1]) + src.getMinY();
-          
-          if (srcbounds.contains(srcX, srcY))
-            {
-              // Corner case at the bottom or right edge; use nearest neighbour
-              if (pts[i] >= src.getWidth() - 1
-                  || pts[i + 1] >= src.getHeight() - 1)
-                dst.setDataElements((int) dpts[i] + dst.getMinX(),
-                                    (int) dpts[i + 1] + dst.getMinY(),
-                                    src.getDataElements(srcX, srcY, null));
-  
-              // Standard case, apply the bilinear formula
-              else
-                {
-                  int x = (int) Math.floor(pts[i] + src.getMinX());
-                  int y = (int) Math.floor(pts[i + 1] + src.getMinY());
-                  double xdiff = pts[i] + src.getMinX() - x;
-                  double ydiff = pts[i + 1] + src.getMinY() - y;
-
-                  // Get surrounding pixels used in interpolation... optimized
-                  // to use the smallest datatype possible.
-                  if (src.getTransferType() == DataBuffer.TYPE_DOUBLE
-                      || src.getTransferType() == DataBuffer.TYPE_FLOAT)
-                    {
-                      xyarr = src.getPixel(x, y, (double[])xyarr);
-                      xp1arr  = src.getPixel(x+1, y, (double[])xp1arr);
-                      yp1arr = src.getPixel(x, y+1, (double[])yp1arr);
-                      xyp1arr = src.getPixel(x+1, y+1, (double[])xyp1arr);
-                    }
-                  else
-                    {
-                      xyarr = src.getPixel(x, y, (int[])xyarr);
-                      xp1arr  = src.getPixel(x+1, y, (int[])xp1arr);
-                      yp1arr = src.getPixel(x, y+1, (int[])yp1arr);
-                      xyp1arr = src.getPixel(x+1, y+1, (int[])xyp1arr);
-                    }
-                  // using 
-                  // array[] pixels = src.getPixels(x, y, 2, 2, pixels);
-                  // instead of doing four individual src.getPixel() calls
-                  // should be faster, but benchmarking shows that it's not...
-                  
-                  // Run interpolation for each band
-                  for (int j = 0; j < src.getNumBands(); j++)
-                    {
-                      // Pull individual sample values out of array
-                      if (src.getTransferType() == DataBuffer.TYPE_DOUBLE
-                          || src.getTransferType() == DataBuffer.TYPE_FLOAT)
-                        {
-                          xy = ((double[])xyarr)[j];
-                          xp1  = ((double[])xp1arr)[j];
-                          yp1 = ((double[])yp1arr)[j];
-                          xyp1 = ((double[])xyp1arr)[j];
-                        }
-                      else
-                        {
-                          xy = ((int[])xyarr)[j];
-                          xp1  = ((int[])xp1arr)[j];
-                          yp1 = ((int[])yp1arr)[j];
-                          xyp1 = ((int[])xyp1arr)[j];
-                        }
-                      
-                      // If all four samples are identical, there's no need to 
-                      // calculate anything
-                      if (xy == xp1 && xy == yp1 && xy == xyp1)
-                        result[j] = xy;
-                      
-                      // Run bilinear interpolation formula
-                      else
-                        result[j] = (xy * (1-xdiff) + xp1 * xdiff) 
-                                      * (1-ydiff) 
-                                    + (yp1 * (1-xdiff) + xyp1 * xdiff)
-                                      * ydiff;
-                    }
-
-                  dst.setPixel((int)dpts[i] + dst.getMinX(),
-                               (int)dpts[i+1] + dst.getMinY(),
-                               result);
-                }
-            }
-        }
-    }
-
-    /**
-     * Perform bicubic filtering
-     * based on http://local.wasp.uwa.edu.au/~pbourke/colour/bicubic/
-     * 
-     * @param src the source raster
-     * @param dst the destination raster
-     * @param dpts array of points on the destination raster
-     * @param pts array of corresponding points on the source raster
-     */
-    private void filterBicubic(Raster src, WritableRaster dst, double[] dpts,
-                               double[] pts)
-    {
-      Rectangle srcbounds = src.getBounds();
-      double[] result = new double[src.getNumBands()];
-      Object pixels = null;
-
-      // For all points on the destination raster, perform bicubic interpolation
-      // from corrosponding source points
-      for (int i = 0; i < dpts.length; i += 2)
-        {
-          if (srcbounds.contains((int) Math.round(pts[i]) + src.getMinX(),
-                                 (int) Math.round(pts[i + 1]) + src.getMinY()))
-            {
-              int x = (int) Math.floor(pts[i] + src.getMinX());
-              int y = (int) Math.floor(pts[i + 1] + src.getMinY());
-              double dx = pts[i] + src.getMinX() - x;
-              double dy = pts[i + 1] + src.getMinY() - y;
-              Arrays.fill(result, 0);
-  
-              for (int m = - 1; m < 3; m++)
-                for (int n = - 1; n < 3; n++)
-                  {
-                    // R(x) = ( P(x+2)^3 - 4 P(x+1)^3 + 6 P(x)^3 - 4 P(x-1)^3 ) / 6
-                    double r1 = 0;
-                    double r2 = 0;
-
-                    // Calculate R(m - dx)
-                    double rx = m - dx + 2;
-                    r1 += rx * rx * rx;
-
-                    rx = m - dx + 1;
-                    if (rx > 0)
-                      r1 -= 4 * rx * rx * rx;
-
-                    rx = m - dx;
-                    if (rx > 0)
-                      r1 += 6 * rx * rx * rx;
-
-                    rx = m - dx - 1;
-                    if (rx > 0)
-                      r1 -= 4 * rx * rx * rx;
-
-                    r1 /= 6;
-
-                    // Calculate R(dy - n);
-                    rx = dy - n + 2;
-                    if (rx > 0)
-                      r2 += rx * rx * rx;
-
-                    rx = dy - n + 1;
-                    if (rx > 0)
-                      r2 -= 4 * rx * rx * rx;
-
-                    rx = dy - n;
-                    if (rx > 0)
-                      r2 += 6 * rx * rx * rx;
-
-                    rx = dy - n - 1;
-                    if (rx > 0)
-                      r2 -= 4 * rx * rx * rx;
-
-                    r2 /= 6;
-
-                    // Calculate F(i+m, j+n) R(m - dx) R(dy - n)
-                    // Check corner cases
-                    int srcX = x + m;
-                    if (srcX >= src.getMinX() + src.getWidth())
-                      srcX = src.getMinX() + src.getWidth() - 1;
-                    else if (srcX < src.getMinX())
-                      srcX = src.getMinX();
-
-                    int srcY = y + n;
-                    if (srcY >= src.getMinY() + src.getHeight())
-                      srcY = src.getMinY() + src.getHeight() - 1;
-                    else if (srcY < src.getMinY())
-                      srcY = src.getMinY();
-
-                    // Calculate once for each band, using the smallest
-                    // datatype possible
-                    if (src.getTransferType() == DataBuffer.TYPE_DOUBLE
-                        || src.getTransferType() == DataBuffer.TYPE_FLOAT)
-                      {
-                        pixels = src.getPixel(srcX, srcY, (double[])pixels);
-                        for (int j = 0; j < result.length; j++)
-                          result[j] += ((double[])pixels)[j] * r1 * r2;
-                      }
-                    else
-                      {
-                        pixels = src.getPixel(srcX, srcY, (int[])pixels);
-                        for (int j = 0; j < result.length; j++)
-                          result[j] += ((int[])pixels)[j] * r1 * r2;
-                      }
-                  }
-  
-              // Put it all together
-              dst.setPixel((int)dpts[i] + dst.getMinX(),
-                           (int)dpts[i+1] + dst.getMinY(),
-                           result);
-            }
-        }
-    }
-}
diff --git a/openjdk/java/awt/image/BandCombineOp.java b/openjdk/java/awt/image/BandCombineOp.java
deleted file mode 100644
index d9ce16fa..00000000
--- a/openjdk/java/awt/image/BandCombineOp.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/* BandCombineOp.java - perform a combination on the bands of a raster
-   Copyright (C) 2004, 2006  Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package java.awt.image;
-
-import java.awt.RenderingHints;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.util.Arrays;
-
-/**
- * Filter Raster pixels by applying a matrix.
- * 
- * BandCombineOp applies a matrix to each pixel to produce new pixel values.
- * The width of the matrix must be the same or one more than the number of
- * bands in the source Raster.  If one more, the pixels in the source are
- * assumed to contain an implicit 1.0 at the end.
- * 
- * The rows of the matrix are multiplied by the pixel to produce the values
- * for the destination.  Therefore the destination Raster must contain the
- * same number of bands as the number of rows in the filter matrix.
- * 
- * This Op assumes that samples are integers; floating point sample types will
- * be rounded to their nearest integer value during filtering.
- * 
- * @author Jerry Quinn (jlquinn@optonline.net)
- */
-public class BandCombineOp implements RasterOp
-{
-  private RenderingHints hints;
-  private float[][] matrix;
-  
-  /**
-   * Construct a BandCombineOp.
-   * 
-   * @param matrix The matrix to filter pixels with.
-   * @param hints Rendering hints to apply.  Ignored.
-   * @throws ArrayIndexOutOfBoundsException if the matrix is invalid
-   */
-  public BandCombineOp(float[][] matrix, RenderingHints hints)
-  {
-    this.matrix = new float[matrix.length][];
-    int width = matrix[0].length;
-    for (int i = 0; i < matrix.length; i++)
-      {
-        this.matrix[i] = new float[width + 1];
-        for (int j = 0; j < width; j++)
-          this.matrix[i][j] = matrix[i][j];
-
-        // The reference implementation pads the array with a trailing zero...
-        this.matrix[i][width] = 0;
-      }
-
-    this.hints = hints;
-  }
-
-  /**
-   * Filter Raster pixels through a matrix. Applies the Op matrix to source
-   * pixes to produce dest pixels. Each row of the matrix is multiplied by the
-   * src pixel components to produce the dest pixel. If matrix is one more than
-   * the number of bands in the src, the last element is implicitly multiplied
-   * by 1, i.e. added to the sum for that dest component. If dest is null, a
-   * suitable Raster is created. This implementation uses
-   * createCompatibleDestRaster.
-   * 
-   * @param src The source Raster.
-   * @param dest The destination Raster, or null.
-   * @throws IllegalArgumentException if the destination raster is incompatible
-   *           with the source raster.
-   * @return The filtered Raster.
-   * @see java.awt.image.RasterOp#filter(java.awt.image.Raster,
-   *      java.awt.image.WritableRaster)
-   */
-  public WritableRaster filter(Raster src, WritableRaster dest) {
-    if (dest == null)
-      dest = createCompatibleDestRaster(src);
-    else if (dest.getNumBands() != src.getNumBands()
-             || dest.getTransferType() != src.getTransferType())
-      throw new IllegalArgumentException("Destination raster is incompatible with source raster");
-
-    // Filter the pixels
-    int[] spix = new int[matrix[0].length - 1];
-    int[] spix2 = new int[matrix[0].length - 1];
-    int[] dpix = new int[matrix.length];
-    for (int y = src.getMinY(); y < src.getHeight() + src.getMinY(); y++)
-      for (int x = src.getMinX(); x < src.getWidth() + src.getMinX(); x++)
-        {
-          // In case matrix rows have implicit translation
-          spix[spix.length - 1] = 1;
-          src.getPixel(x, y, spix);
-          
-          // Do not re-calculate if pixel is identical to the last one
-          // (ie, blocks of the same colour)
-          if (!Arrays.equals(spix, spix2))
-            {
-              System.arraycopy(spix, 0, spix2, 0, spix.length);
-              for (int i = 0; i < matrix.length; i++)
-                {
-                  dpix[i] = 0;
-                  for (int j = 0; j < matrix[0].length - 1; j++)
-                    dpix[i] += spix[j] * (int)matrix[i][j];
-                }
-            }
-          dest.setPixel(x, y, dpix);
-        }
-
-    return dest;
-  }
-
-  /* (non-Javadoc)
-   * @see java.awt.image.RasterOp#getBounds2D(java.awt.image.Raster)
-   */
-  public final Rectangle2D getBounds2D(Raster src)
-  {
-    return src.getBounds();
-  }
-
-  /**
-   * Creates a new WritableRaster that can be used as the destination for this
-   * Op. The number of bands in the source raster must equal the number of rows
-   * in the op matrix, which must also be equal to either the number of columns
-   * or (columns - 1) in the matrix.
-   * 
-   * @param src The source raster.
-   * @return A compatible raster.
-   * @see java.awt.image.RasterOp#createCompatibleDestRaster(java.awt.image.Raster)
-   * @throws IllegalArgumentException if the raster is incompatible with the
-   *           matrix.
-   */
-  public WritableRaster createCompatibleDestRaster(Raster src)
-  {
-    // Destination raster must have same number of bands as source
-    if (src.getNumBands() != matrix.length)
-      throw new IllegalArgumentException("Number of rows in matrix specifies an "
-                                             + "incompatible number of bands");
-
-    // We use -1 and -2 because we previously padded the rows with a trailing 0
-    if (src.getNumBands() != matrix[0].length - 1
-        && src.getNumBands() != matrix[0].length - 2)
-      throw new IllegalArgumentException("Incompatible number of bands: "
-                                             + "the number of bands in the raster must equal the number of "
-                                             + "columns in the matrix, optionally minus one");
-
-    return src.createCompatibleWritableRaster();
-  }
-
-  /**
-   * Return corresponding destination point for source point.  Because this is
-   * not a geometric operation, it simply returns a copy of the source.
-   * 
-   * @param src The source point.
-   * @param dst The destination point.
-   * @return dst The destination point.
-   * @see java.awt.image.RasterOp#getPoint2D(java.awt.geom.Point2D,
-   *java.awt.geom.Point2D) 
-   */
-  public final Point2D getPoint2D(Point2D src, Point2D dst)
-  {
-    if (dst == null)
-      return (Point2D)src.clone();
-    
-    dst.setLocation(src);
-    return dst;
-  }
-
-  /* (non-Javadoc)
-   * @see java.awt.image.RasterOp#getRenderingHints()
-   */
-  public final RenderingHints getRenderingHints()
-  {
-    return hints;
-  }
-  
-  /**
-   * Return the matrix used in this operation.
-   *
-   * @return The matrix used in this operation.
-   */
-  public final float[][] getMatrix()
-  {
-    return matrix;
-  }
-
-}
diff --git a/openjdk/java/awt/image/BufferedImage.java b/openjdk/java/awt/image/BufferedImage.java
deleted file mode 100644
index 91be2dc5..00000000
--- a/openjdk/java/awt/image/BufferedImage.java
+++ /dev/null
@@ -1,1811 +0,0 @@
-/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.awt.image;
-
-import cli.System.Drawing.Color;
-import cli.System.Drawing.Imaging.*;
-
-import java.awt.Transparency;
-import java.awt.color.ColorSpace;
-import java.awt.Graphics2D;
-import java.awt.GraphicsConfiguration;
-import java.awt.GraphicsEnvironment;
-import java.awt.ImageCapabilities;
-import java.awt.geom.Rectangle2D;
-import java.awt.geom.Point2D;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import sun.awt.image.BytePackedRaster;
-import sun.awt.image.ShortComponentRaster;
-import sun.awt.image.ByteComponentRaster;
-import sun.awt.image.IntegerComponentRaster;
-import sun.awt.image.OffScreenImageSource;
-
-/**
- *
- * The <code>BufferedImage</code> subclass describes an {@link
- * java.awt.Image Image} with an accessible buffer of image data.
- * A <code>BufferedImage</code> is comprised of a {@link ColorModel} and a
- * {@link Raster} of image data.
- * The number and types of bands in the {@link SampleModel} of the
- * <code>Raster</code> must match the number and types required by the
- * <code>ColorModel</code> to represent its color and alpha components.
- * All <code>BufferedImage</code> objects have an upper left corner
- * coordinate of (0,&nbsp;0).  Any <code>Raster</code> used to construct a
- * <code>BufferedImage</code> must therefore have minX=0 and minY=0.
- *
- * <p>
- * This class relies on the data fetching and setting methods
- * of <code>Raster</code>,
- * and on the color characterization methods of <code>ColorModel</code>.
- *
- * @see ColorModel
- * @see Raster
- * @see WritableRaster
- */
-
-public class BufferedImage extends java.awt.Image
-                           implements WritableRenderedImage, Transparency
-{
-    int        imageType = TYPE_CUSTOM;
-    ColorModel colorModel;
-    WritableRaster raster;
-    OffScreenImageSource osis;
-    Hashtable properties;
-
-    boolean    isAlphaPremultiplied;// If true, alpha has been premultiplied in
-    // color channels
-
-    /**
-     * Image Type Constants
-     */
-
-    /**
-     * Image type is not recognized so it must be a customized
-     * image.  This type is only used as a return value for the getType()
-     * method.
-     */
-    public static final int TYPE_CUSTOM = 0;
-
-    /**
-     * Represents an image with 8-bit RGB color components packed into
-     * integer pixels.  The image has a {@link DirectColorModel} without
-     * alpha.
-     * When data with non-opaque alpha is stored
-     * in an image of this type,
-     * the color data must be adjusted to a non-premultiplied form
-     * and the alpha discarded,
-     * as described in the
-     * {@link java.awt.AlphaComposite} documentation.
-     */
-    public static final int TYPE_INT_RGB = 1;
-
-    /**
-     * Represents an image with 8-bit RGBA color components packed into
-     * integer pixels.  The image has a <code>DirectColorModel</code>
-     * with alpha. The color data in this image is considered not to be
-     * premultiplied with alpha.  When this type is used as the
-     * <code>imageType</code> argument to a <code>BufferedImage</code>
-     * constructor, the created image is consistent with images
-     * created in the JDK1.1 and earlier releases.
-     */
-    public static final int TYPE_INT_ARGB = 2;
-
-    /**
-     * Represents an image with 8-bit RGBA color components packed into
-     * integer pixels.  The image has a <code>DirectColorModel</code>
-     * with alpha.  The color data in this image is considered to be
-     * premultiplied with alpha.
-     */
-    public static final int TYPE_INT_ARGB_PRE = 3;
-
-    /**
-     * Represents an image with 8-bit RGB color components, corresponding
-     * to a Windows- or Solaris- style BGR color model, with the colors
-     * Blue, Green, and Red packed into integer pixels.  There is no alpha.
-     * The image has a {@link DirectColorModel}.
-     * When data with non-opaque alpha is stored
-     * in an image of this type,
-     * the color data must be adjusted to a non-premultiplied form
-     * and the alpha discarded,
-     * as described in the
-     * {@link java.awt.AlphaComposite} documentation.
-     */
-    public static final int TYPE_INT_BGR = 4;
-
-    /**
-     * Represents an image with 8-bit RGB color components, corresponding
-     * to a Windows-style BGR color model) with the colors Blue, Green,
-     * and Red stored in 3 bytes.  There is no alpha.  The image has a
-     * <code>ComponentColorModel</code>.
-     * When data with non-opaque alpha is stored
-     * in an image of this type,
-     * the color data must be adjusted to a non-premultiplied form
-     * and the alpha discarded,
-     * as described in the
-     * {@link java.awt.AlphaComposite} documentation.
-     */
-    public static final int TYPE_3BYTE_BGR = 5;
-
-    /**
-     * Represents an image with 8-bit RGBA color components with the colors
-     * Blue, Green, and Red stored in 3 bytes and 1 byte of alpha.  The
-     * image has a <code>ComponentColorModel</code> with alpha.  The
-     * color data in this image is considered not to be premultiplied with
-     * alpha.  The byte data is interleaved in a single
-     * byte array in the order A, B, G, R
-     * from lower to higher byte addresses within each pixel.
-     */
-    public static final int TYPE_4BYTE_ABGR = 6;
-
-    /**
-     * Represents an image with 8-bit RGBA color components with the colors
-     * Blue, Green, and Red stored in 3 bytes and 1 byte of alpha.  The
-     * image has a <code>ComponentColorModel</code> with alpha. The color
-     * data in this image is considered to be premultiplied with alpha.
-     * The byte data is interleaved in a single byte array in the order
-     * A, B, G, R from lower to higher byte addresses within each pixel.
-     */
-    public static final int TYPE_4BYTE_ABGR_PRE = 7;
-
-    /**
-     * Represents an image with 5-6-5 RGB color components (5-bits red,
-     * 6-bits green, 5-bits blue) with no alpha.  This image has
-     * a <code>DirectColorModel</code>.
-     * When data with non-opaque alpha is stored
-     * in an image of this type,
-     * the color data must be adjusted to a non-premultiplied form
-     * and the alpha discarded,
-     * as described in the
-     * {@link java.awt.AlphaComposite} documentation.
-     */
-    public static final int TYPE_USHORT_565_RGB = 8;
-
-    /**
-     * Represents an image with 5-5-5 RGB color components (5-bits red,
-     * 5-bits green, 5-bits blue) with no alpha.  This image has
-     * a <code>DirectColorModel</code>.
-     * When data with non-opaque alpha is stored
-     * in an image of this type,
-     * the color data must be adjusted to a non-premultiplied form
-     * and the alpha discarded,
-     * as described in the
-     * {@link java.awt.AlphaComposite} documentation.
-     */
-    public static final int TYPE_USHORT_555_RGB = 9;
-
-    /**
-     * Represents a unsigned byte grayscale image, non-indexed.  This
-     * image has a <code>ComponentColorModel</code> with a CS_GRAY
-     * {@link ColorSpace}.
-     * When data with non-opaque alpha is stored
-     * in an image of this type,
-     * the color data must be adjusted to a non-premultiplied form
-     * and the alpha discarded,
-     * as described in the
-     * {@link java.awt.AlphaComposite} documentation.
-     */
-    public static final int TYPE_BYTE_GRAY = 10;
-
-    /**
-     * Represents an unsigned short grayscale image, non-indexed).  This
-     * image has a <code>ComponentColorModel</code> with a CS_GRAY
-     * <code>ColorSpace</code>.
-     * When data with non-opaque alpha is stored
-     * in an image of this type,
-     * the color data must be adjusted to a non-premultiplied form
-     * and the alpha discarded,
-     * as described in the
-     * {@link java.awt.AlphaComposite} documentation.
-     */
-    public static final int TYPE_USHORT_GRAY = 11;
-
-    /**
-     * Represents an opaque byte-packed 1, 2, or 4 bit image.  The
-     * image has an {@link IndexColorModel} without alpha.  When this
-     * type is used as the <code>imageType</code> argument to the
-     * <code>BufferedImage</code> constructor that takes an
-     * <code>imageType</code> argument but no <code>ColorModel</code>
-     * argument, a 1-bit image is created with an
-     * <code>IndexColorModel</code> with two colors in the default
-     * sRGB <code>ColorSpace</code>: {0,&nbsp;0,&nbsp;0} and
-     * {255,&nbsp;255,&nbsp;255}.
-     *
-     * <p> Images with 2 or 4 bits per pixel may be constructed via
-     * the <code>BufferedImage</code> constructor that takes a
-     * <code>ColorModel</code> argument by supplying a
-     * <code>ColorModel</code> with an appropriate map size.
-     *
-     * <p> Images with 8 bits per pixel should use the image types
-     * <code>TYPE_BYTE_INDEXED</code> or <code>TYPE_BYTE_GRAY</code>
-     * depending on their <code>ColorModel</code>.
-
-     * <p> When color data is stored in an image of this type,
-     * the closest color in the colormap is determined
-     * by the <code>IndexColorModel</code> and the resulting index is stored.
-     * Approximation and loss of alpha or color components
-     * can result, depending on the colors in the
-     * <code>IndexColorModel</code> colormap.
-     */
-    public static final int TYPE_BYTE_BINARY = 12;
-
-    /**
-     * Represents an indexed byte image.  When this type is used as the
-     * <code>imageType</code> argument to the <code>BufferedImage</code>
-     * constructor that takes an <code>imageType</code> argument
-     * but no <code>ColorModel</code> argument, an
-     * <code>IndexColorModel</code> is created with
-     * a 256-color 6/6/6 color cube palette with the rest of the colors
-     * from 216-255 populated by grayscale values in the
-     * default sRGB ColorSpace.
-     *
-     * <p> When color data is stored in an image of this type,
-     * the closest color in the colormap is determined
-     * by the <code>IndexColorModel</code> and the resulting index is stored.
-     * Approximation and loss of alpha or color components
-     * can result, depending on the colors in the
-     * <code>IndexColorModel</code> colormap.
-     */
-    public static final int TYPE_BYTE_INDEXED = 13;
-
-    private static final int DCM_RED_MASK   = 0x00ff0000;
-    private static final int DCM_GREEN_MASK = 0x0000ff00;
-    private static final int DCM_BLUE_MASK  = 0x000000ff;
-    private static final int DCM_ALPHA_MASK = 0xff000000;
-    private static final int DCM_565_RED_MASK = 0xf800;
-    private static final int DCM_565_GRN_MASK = 0x07E0;
-    private static final int DCM_565_BLU_MASK = 0x001F;
-    private static final int DCM_555_RED_MASK = 0x7C00;
-    private static final int DCM_555_GRN_MASK = 0x03E0;
-    private static final int DCM_555_BLU_MASK = 0x001F;
-    private static final int DCM_BGR_RED_MASK = 0x0000ff;
-    private static final int DCM_BGR_GRN_MASK = 0x00ff00;
-    private static final int DCM_BGR_BLU_MASK = 0xff0000;
-
-    /** reference to the :NET equivalent */
-    private cli.System.Drawing.Bitmap bitmap;
-    
-    /** Which buffer include the current data, raster or bitmap */
-    private int currentBuffer;
-    
-    private static final int BUFFER_BITMAP = 1;
-    private static final int BUFFER_RASTER = 2;
-    private static final int BUFFER_BOTH   = 3;
-
-    /**
-     * Create a BufferedImage directly from the .NET Bitmap class
-     */
-    @cli.IKVM.Attributes.HideFromJavaAttribute.Annotation
-    public BufferedImage(cli.System.Drawing.Bitmap bitmap){
-        this.imageType = TYPE_INT_ARGB;
-        this.colorModel = createColorModel();
-        this.bitmap = bitmap;
-        this.currentBuffer = BUFFER_BITMAP;
-    }
-
-    /**
-     * Constructs a <code>BufferedImage</code> of one of the predefined
-     * image types.  The <code>ColorSpace</code> for the image is the
-     * default sRGB space.
-     * @param width     width of the created image
-     * @param height    height of the created image
-     * @param imageType type of the created image
-     * @see ColorSpace
-     * @see #TYPE_INT_RGB
-     * @see #TYPE_INT_ARGB
-     * @see #TYPE_INT_ARGB_PRE
-     * @see #TYPE_INT_BGR
-     * @see #TYPE_3BYTE_BGR
-     * @see #TYPE_4BYTE_ABGR
-     * @see #TYPE_4BYTE_ABGR_PRE
-     * @see #TYPE_BYTE_GRAY
-     * @see #TYPE_USHORT_GRAY
-     * @see #TYPE_BYTE_BINARY
-     * @see #TYPE_BYTE_INDEXED
-     * @see #TYPE_USHORT_565_RGB
-     * @see #TYPE_USHORT_555_RGB
-     */
-    public BufferedImage(int width,
-                         int height,
-                         int imageType) {
-        this.imageType = imageType;
-        this.colorModel = createColorModel();
-        this.bitmap = createBitmap(width, height);
-        this.currentBuffer = BUFFER_BITMAP;
-    }
-
-    /**
-     * Create a Bitmap if not already one exists
-     * @param width     width of the created image
-     * @param height    height of the created image
-     * @return a Bitmap object, never null
-     */
-    private cli.System.Drawing.Bitmap createBitmap(int width, int height){
-        if(bitmap != null){
-            return bitmap;
-        }
-        if(width <= 0 || height <= 0){
-            throw new IllegalArgumentException("Width (" + width + ") and height (" + height + ") cannot be <= 0");
-        }
-        return new cli.System.Drawing.Bitmap(width, height, PixelFormat.wrap(PixelFormat.Format32bppArgb));
-    }
-
-    /**
-     * Constructs a <code>BufferedImage</code> of one of the predefined
-     * image types:
-     * TYPE_BYTE_BINARY or TYPE_BYTE_INDEXED.
-     *
-     * <p> If the image type is TYPE_BYTE_BINARY, the number of
-     * entries in the color model is used to determine whether the
-     * image should have 1, 2, or 4 bits per pixel.  If the color model
-     * has 1 or 2 entries, the image will have 1 bit per pixel.  If it
-     * has 3 or 4 entries, the image with have 2 bits per pixel.  If
-     * it has between 5 and 16 entries, the image will have 4 bits per
-     * pixel.  Otherwise, an IllegalArgumentException will be thrown.
-     *
-     * @param width     width of the created image
-     * @param height    height of the created image
-     * @param imageType type of the created image
-     * @param cm        <code>IndexColorModel</code> of the created image
-     * @throws IllegalArgumentException   if the imageType is not
-     * TYPE_BYTE_BINARY or TYPE_BYTE_INDEXED or if the imageType is
-     * TYPE_BYTE_BINARY and the color map has more than 16 entries.
-     * @see #TYPE_BYTE_BINARY
-     * @see #TYPE_BYTE_INDEXED
-     */
-    public BufferedImage (int width,
-                          int height,
-                          int imageType,
-                          IndexColorModel cm) {
-        if (cm.hasAlpha() && cm.isAlphaPremultiplied()) {
-            throw new IllegalArgumentException("This image types do not have "+
-                                               "premultiplied alpha.");
-        }
-
-        switch(imageType) {
-        case TYPE_BYTE_BINARY:
-            int bits; // Will be set below
-            int mapSize = cm.getMapSize();
-            if (mapSize <= 2) {
-                bits = 1;
-            } else if (mapSize <= 4) {
-                bits = 2;
-            } else if (mapSize <= 16) {
-                bits = 4;
-            } else {
-                throw new IllegalArgumentException
-                    ("Color map for TYPE_BYTE_BINARY " +
-                     "must have no more than 16 entries");
-            }
-            raster = Raster.createPackedRaster(DataBuffer.TYPE_BYTE,
-                                                width, height, 1, bits, null);
-            break;
-
-        case TYPE_BYTE_INDEXED:
-            raster = Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE,
-                                                    width, height, 1, null);
-            break;
-        default:
-            throw new IllegalArgumentException("Invalid image type (" +
-                                               imageType+").  Image type must"+
-                                               " be either TYPE_BYTE_BINARY or "+
-                                               " TYPE_BYTE_INDEXED");
-        }
-
-        if (!cm.isCompatibleRaster(raster)) {
-            throw new IllegalArgumentException("Incompatible image type and IndexColorModel");
-        }
-
-        colorModel = cm;
-        this.imageType = imageType;
-        this.currentBuffer = BUFFER_RASTER;
-        raster.getDataBuffer().setImage( this );
-    }
-
-    /**
-     * Constructs a new <code>BufferedImage</code> with a specified
-     * <code>ColorModel</code> and <code>Raster</code>.  If the number and
-     * types of bands in the <code>SampleModel</code> of the
-     * <code>Raster</code> do not match the number and types required by
-     * the <code>ColorModel</code> to represent its color and alpha
-     * components, a {@link RasterFormatException} is thrown.  This
-     * method can multiply or divide the color <code>Raster</code> data by
-     * alpha to match the <code>alphaPremultiplied</code> state
-     * in the <code>ColorModel</code>.  Properties for this
-     * <code>BufferedImage</code> can be established by passing
-     * in a {@link Hashtable} of <code>String</code>/<code>Object</code>
-     * pairs.
-     * @param cm <code>ColorModel</code> for the new image
-     * @param raster     <code>Raster</code> for the image data
-     * @param isRasterPremultiplied   if <code>true</code>, the data in
-     *                  the raster has been premultiplied with alpha.
-     * @param properties <code>Hashtable</code> of
-     *                  <code>String</code>/<code>Object</code> pairs.
-     * @exception RasterFormatException if the number and
-     * types of bands in the <code>SampleModel</code> of the
-     * <code>Raster</code> do not match the number and types required by
-     * the <code>ColorModel</code> to represent its color and alpha
-     * components.
-     * @exception IllegalArgumentException if
-     *          <code>raster</code> is incompatible with <code>cm</code>
-     * @see ColorModel
-     * @see Raster
-     * @see WritableRaster
-     */
-
-
-/*
- *
- *  FOR NOW THE CODE WHICH DEFINES THE RASTER TYPE IS DUPLICATED BY DVF
- *  SEE THE METHOD DEFINERASTERTYPE @ RASTEROUTPUTMANAGER
- *
- */
-    public BufferedImage (ColorModel cm,
-                          WritableRaster raster,
-                          boolean isRasterPremultiplied,
-                          Hashtable<?,?> properties) {
-
-        if (!cm.isCompatibleRaster(raster)) {
-            throw new
-                IllegalArgumentException("Raster "+raster+
-                                         " is incompatible with ColorModel "+
-                                         cm);
-        }
-
-        if ((raster.minX != 0) || (raster.minY != 0)) {
-            throw new
-                IllegalArgumentException("Raster "+raster+
-                                         " has minX or minY not equal to zero: "
-                                         + raster.minX + " " + raster.minY);
-        }
-
-        colorModel = cm;
-        this.raster  = raster;
-        raster.getDataBuffer().setImage( this );
-        this.currentBuffer = BUFFER_RASTER;
-        this.properties = properties;
-        int numBands = raster.getNumBands();
-        boolean isAlphaPre = cm.isAlphaPremultiplied();
-        final boolean isStandard = isStandard(cm, raster);
-        ColorSpace cs;
-
-        // Force the raster data alpha state to match the premultiplied
-        // state in the color model
-        coerceData(isRasterPremultiplied);
-
-        SampleModel sm = raster.getSampleModel();
-        cs = cm.getColorSpace();
-        int csType = cs.getType();
-        if (csType != ColorSpace.TYPE_RGB) {
-            if (csType == ColorSpace.TYPE_GRAY &&
-                isStandard &&
-                cm instanceof ComponentColorModel) {
-                // Check if this might be a child raster (fix for bug 4240596)
-                if (sm instanceof ComponentSampleModel &&
-                    ((ComponentSampleModel)sm).getPixelStride() != numBands) {
-                    imageType = TYPE_CUSTOM;
-                } else if (raster instanceof ByteComponentRaster &&
-                       raster.getNumBands() == 1 &&
-                       cm.getComponentSize(0) == 8 &&
-                       ((ByteComponentRaster)raster).getPixelStride() == 1) {
-                    imageType = TYPE_BYTE_GRAY;
-                } else if (raster instanceof ShortComponentRaster &&
-                       raster.getNumBands() == 1 &&
-                       cm.getComponentSize(0) == 16 &&
-                       ((ShortComponentRaster)raster).getPixelStride() == 1) {
-                    imageType = TYPE_USHORT_GRAY;
-                }
-            } else {
-                imageType = TYPE_CUSTOM;
-            }
-            return;
-        }
-
-        if ((raster instanceof IntegerComponentRaster) &&
-            (numBands == 3 || numBands == 4)) {
-            IntegerComponentRaster iraster =
-                (IntegerComponentRaster) raster;
-            // Check if the raster params and the color model
-            // are correct
-            int pixSize = cm.getPixelSize();
-            if (iraster.getPixelStride() == 1 &&
-                isStandard &&
-                cm instanceof DirectColorModel  &&
-                (pixSize == 32 || pixSize == 24))
-            {
-                // Now check on the DirectColorModel params
-                DirectColorModel dcm = (DirectColorModel) cm;
-                int rmask = dcm.getRedMask();
-                int gmask = dcm.getGreenMask();
-                int bmask = dcm.getBlueMask();
-                if (rmask == DCM_RED_MASK && gmask == DCM_GREEN_MASK &&
-                    bmask == DCM_BLUE_MASK)
-                {
-                    if (dcm.getAlphaMask() == DCM_ALPHA_MASK) {
-                        imageType = (isAlphaPre
-                                     ? TYPE_INT_ARGB_PRE
-                                     : TYPE_INT_ARGB);
-                    }
-                    else {
-                        // No Alpha
-                        if (!dcm.hasAlpha()) {
-                            imageType = TYPE_INT_RGB;
-                        }
-                    }
-                }   // if (dcm.getRedMask() == DCM_RED_MASK &&
-                else if (rmask == DCM_BGR_RED_MASK && gmask == DCM_BGR_GRN_MASK
-                         && bmask == DCM_BGR_BLU_MASK) {
-                    if (!dcm.hasAlpha()) {
-                        imageType = TYPE_INT_BGR;
-                    }
-                }  // if (rmask == DCM_BGR_RED_MASK &&
-            }   // if (iraster.getPixelStride() == 1
-        }   // ((raster instanceof IntegerComponentRaster) &&
-        else if ((cm instanceof IndexColorModel) && (numBands == 1) &&
-                 isStandard &&
-                 (!cm.hasAlpha() || !isAlphaPre))
-        {
-            IndexColorModel icm = (IndexColorModel) cm;
-            int pixSize = icm.getPixelSize();
-
-            if (raster instanceof BytePackedRaster) {
-                imageType = TYPE_BYTE_BINARY;
-            }   // if (raster instanceof BytePackedRaster)
-            else if (raster instanceof ByteComponentRaster) {
-                ByteComponentRaster braster = (ByteComponentRaster) raster;
-                if (braster.getPixelStride() == 1 && pixSize <= 8) {
-                    imageType = TYPE_BYTE_INDEXED;
-                }
-            }
-        }   // else if (cm instanceof IndexColorModel) && (numBands == 1))
-        else if ((raster instanceof ShortComponentRaster)
-                 && (cm instanceof DirectColorModel)
-                 && isStandard
-                 && (numBands == 3)
-                 && !cm.hasAlpha())
-        {
-            DirectColorModel dcm = (DirectColorModel) cm;
-            if (dcm.getRedMask() == DCM_565_RED_MASK) {
-                if (dcm.getGreenMask() == DCM_565_GRN_MASK &&
-                    dcm.getBlueMask()  == DCM_565_BLU_MASK) {
-                    imageType = TYPE_USHORT_565_RGB;
-                }
-            }
-            else if (dcm.getRedMask() == DCM_555_RED_MASK) {
-                if (dcm.getGreenMask() == DCM_555_GRN_MASK &&
-                    dcm.getBlueMask() == DCM_555_BLU_MASK) {
-                    imageType = TYPE_USHORT_555_RGB;
-                }
-            }
-        }   // else if ((cm instanceof IndexColorModel) && (numBands == 1))
-        else if ((raster instanceof ByteComponentRaster)
-                 && (cm instanceof ComponentColorModel)
-                 && isStandard
-                 && (raster.getSampleModel() instanceof PixelInterleavedSampleModel)
-                 && (numBands == 3 || numBands == 4))
-        {
-            ComponentColorModel ccm = (ComponentColorModel) cm;
-            PixelInterleavedSampleModel csm =
-                (PixelInterleavedSampleModel)raster.getSampleModel();
-            ByteComponentRaster braster = (ByteComponentRaster) raster;
-            int[] offs = csm.getBandOffsets();
-            if (ccm.getNumComponents() != numBands) {
-                throw new RasterFormatException("Number of components in "+
-                                                "ColorModel ("+
-                                                ccm.getNumComponents()+
-                                                ") does not match # in "+
-                                                " Raster ("+numBands+")");
-            }
-            int[] nBits = ccm.getComponentSize();
-            boolean is8bit = true;
-            for (int i=0; i < numBands; i++) {
-                if (nBits[i] != 8) {
-                    is8bit = false;
-                    break;
-                }
-            }
-            if (is8bit &&
-                braster.getPixelStride() == numBands &&
-                offs[0] == numBands-1 &&
-                offs[1] == numBands-2 &&
-                offs[2] == numBands-3)
-            {
-                if (numBands == 3 && !ccm.hasAlpha()) {
-                    imageType = TYPE_3BYTE_BGR;
-                }
-                else if (offs[3] == 0 && ccm.hasAlpha()) {
-                    imageType = (isAlphaPre
-                                 ? TYPE_4BYTE_ABGR_PRE
-                                 : TYPE_4BYTE_ABGR);
-                }
-            }
-        }   // else if ((raster instanceof ByteComponentRaster) &&
-    }
-
-    private static boolean isStandard(ColorModel cm, WritableRaster wr) {
-        final Class<? extends ColorModel> cmClass = cm.getClass();
-        final Class<? extends WritableRaster> wrClass = wr.getClass();
-        final Class<? extends SampleModel> smClass = wr.getSampleModel().getClass();
-
-        final PrivilegedAction<Boolean> checkClassLoadersAction =
-                new PrivilegedAction<Boolean>()
-        {
-
-            @Override
-            public Boolean run() {
-                final ClassLoader std = System.class.getClassLoader();
-
-                return (cmClass.getClassLoader() == std) &&
-                        (smClass.getClassLoader() == std) &&
-                        (wrClass.getClassLoader() == std);
-            }
-        };
-        return AccessController.doPrivileged(checkClassLoadersAction);
-    }
-    
-    /**
-     * Get the .NET Bitmap object.
-     */
-    @cli.IKVM.Attributes.HideFromJavaAttribute.Annotation
-    public cli.System.Drawing.Bitmap getBitmap(){
-        raster2Bitmap();
-        return bitmap;
-    }
-
-    /**
-     * Switch to the BITMAP buffer and invalidate the RASTER buffer before a graphics operation.
-     */
-    final void toBitmap(){
-    	raster2Bitmap();
-    	currentBuffer = BUFFER_BITMAP;
-    }
-    
-    /**
-     * Switch to the RASTER buffer and invalidate the BITMAP buffer before a graphics operation.
-     */
-    @cli.IKVM.Attributes.HideFromJavaAttribute.Annotation
-    final void toRaster() {
-    	bitmap2Raster();
-    	currentBuffer = BUFFER_RASTER;
-    }
-    
-    /**
-     * This Implementation of BufferedImage has 2 different Buffer, 
-     * a Java WritableRaster and a .NET Bitmap.
-     * This method convert a Java WritableRaster to a .NET Bitmap if needed.
-     */
-    private void raster2Bitmap(){
-        if(currentBuffer != BUFFER_RASTER){
-            return; // BUFFER_BOTH and BUFFER_BITMAP
-        }
-        int width = getWidth();
-        int height = getHeight();
-        
-        bitmap = createBitmap(width, height);
-        synchronized( bitmap ) {
-            // First map the pixel from Java type to .NET type
-            switch (getType()){
-                case TYPE_INT_ARGB:
-                    copyToBitmap(width, height, ((DataBufferInt)raster.getDataBuffer()).getData());
-                    break;
-                default:{
-                    for( int y = 0; y<height; y++){
-                        for(int x = 0; x<width; x++){
-                            int rgb = colorModel.getRGB(raster.getDataElements(x, y, null));
-                            bitmap.SetPixel(x, y, cli.System.Drawing.Color.FromArgb(rgb));
-                        }
-                    }
-                }   
-            }
-            this.currentBuffer = BUFFER_BOTH;
-        }
-        return;
-    }
-
-    /**
-     * Caller must synchronized the bitmap object 
-     */
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    private void copyToBitmap(int width, int height, int[] pixelData)
-    {
-        long size = (long)width * (long)height;
-        if (size > pixelData.length)
-        {
-            throw new IllegalArgumentException();
-        }
-        cli.System.Drawing.Rectangle rect = new cli.System.Drawing.Rectangle(0, 0, width, height);
-        cli.System.Drawing.Imaging.BitmapData data = bitmap.LockBits(rect, ImageLockMode.wrap(ImageLockMode.WriteOnly), PixelFormat.wrap(PixelFormat.Format32bppArgb));
-        cli.System.IntPtr pixelPtr = data.get_Scan0();
-        cli.System.Runtime.InteropServices.Marshal.Copy(pixelData, 0, pixelPtr, (int)size);
-        bitmap.UnlockBits(data);
-    }
-
-    /**
-     * This Implementation of BufferedImage has 2 different Buffer, 
-     * a Java WritableRaster and a .NET Bitmap.
-     * This method convert the .NET Bitmap object to Java WritableRaster.
-     */
-    private void bitmap2Raster(){
-        if(currentBuffer != BUFFER_BITMAP){
-            return; // BUFFER_BOTH and BUFFER_RASTER
-        }
-        synchronized( bitmap ) {
-            int width = bitmap.get_Width();
-            int height = bitmap.get_Height();
-            if(colorModel == null){
-                colorModel = createColorModel();
-            }
-            if(raster == null){
-                raster = createRaster(width, height);
-                raster.getDataBuffer().setImage( this );
-            }
-            
-            this.currentBuffer = BUFFER_BOTH;
-            switch (getType()){
-                case TYPE_INT_ARGB:
-                    copyFromBitmap(bitmap, ((DataBufferInt)raster.getDataBuffer()).getData());
-                    break;
-                default:
-                	Object pixel = colorModel.getDataElements( 0, null ); //allocate a buffer for the follow loop
-                    for( int y = 0; y<height; y++){
-                        for(int x = 0; x<width; x++){
-                            int rgb = bitmap.GetPixel(x, y).ToArgb();
-                            raster.setDataElements(x, y, colorModel.getDataElements(rgb, pixel));
-                        }
-                    }
-            }
-        }
-    }
-
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    private static void copyFromBitmap(cli.System.Drawing.Bitmap bitmap, int[] pixelData)
-    {
-        int width = bitmap.get_Width();
-        int height = bitmap.get_Height();
-        long size = (long)width * (long)height;
-        if (width <= 0 || height <= 0 || pixelData.length < size)
-        {
-            throw new IllegalArgumentException();
-        }
-        cli.System.Drawing.Rectangle rect = new cli.System.Drawing.Rectangle(0, 0, width, height);
-        cli.System.Drawing.Imaging.BitmapData data = bitmap.LockBits(rect, ImageLockMode.wrap(ImageLockMode.ReadOnly), PixelFormat.wrap(PixelFormat.Format32bppArgb));
-        cli.System.IntPtr pixelPtr = data.get_Scan0();
-        cli.System.Runtime.InteropServices.Marshal.Copy(pixelPtr, pixelData, 0, (int)size);        
-        bitmap.UnlockBits(data);
-    }
-
-    /**
-     * Create a new ColorModel based on the current imageType.
-     */
-    private ColorModel createColorModel(){
-        switch(imageType){
-            case TYPE_INT_RGB: {
-                return new DirectColorModel(24, 0x00ff0000, // Red
-                        0x0000ff00, // Green
-                        0x000000ff, // Blue
-                        0x0 // Alpha
-                );
-            }
-            case TYPE_INT_ARGB: {
-                return ColorModel.getRGBdefault();
-            }
-            case TYPE_INT_ARGB_PRE: {
-                return new DirectColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB), 32, 0x00ff0000,// Red
-                        0x0000ff00,// Green
-                        0x000000ff,// Blue
-                        0xff000000,// Alpha
-                        true, // Alpha Premultiplied
-                        DataBuffer.TYPE_INT);
-            }
-            case TYPE_INT_BGR: {
-                return new DirectColorModel(24, 0x000000ff, // Red
-                        0x0000ff00, // Green
-                        0x00ff0000 // Blue
-                );
-            }
-            case TYPE_3BYTE_BGR: {
-                ColorSpace cs = ColorSpace.getInstance(ColorSpace.CS_sRGB);
-                int[] nBits = {8, 8, 8};
-                return new ComponentColorModel(cs, nBits, false, false, Transparency.OPAQUE, DataBuffer.TYPE_BYTE);
-            }
-            case TYPE_4BYTE_ABGR: {
-                ColorSpace cs = ColorSpace.getInstance(ColorSpace.CS_sRGB);
-                int[] nBits = {8, 8, 8, 8};
-                return new ComponentColorModel(cs, nBits, true, false, Transparency.TRANSLUCENT,
-                        DataBuffer.TYPE_BYTE);
-            }
-            case TYPE_4BYTE_ABGR_PRE: {
-                ColorSpace cs = ColorSpace.getInstance(ColorSpace.CS_sRGB);
-                int[] nBits = {8, 8, 8, 8};
-                return new ComponentColorModel(cs, nBits, true, true, Transparency.TRANSLUCENT,
-                        DataBuffer.TYPE_BYTE);
-            }
-            case TYPE_BYTE_GRAY: {
-                ColorSpace cs = ColorSpace.getInstance(ColorSpace.CS_GRAY);
-                int[] nBits = {8};
-                return new ComponentColorModel(cs, nBits, false, true, Transparency.OPAQUE, DataBuffer.TYPE_BYTE);
-            }
-            case TYPE_USHORT_GRAY: {
-                ColorSpace cs = ColorSpace.getInstance(ColorSpace.CS_GRAY);
-                int[] nBits = {16};
-                return new ComponentColorModel(cs, nBits, false, true, Transparency.OPAQUE,
-                        DataBuffer.TYPE_USHORT);
-            }
-            case TYPE_BYTE_BINARY: {
-                byte[] arr = {(byte)0, (byte)0xff};
-
-                return new IndexColorModel(1, 2, arr, arr, arr);
-            }
-            case TYPE_BYTE_INDEXED: {
-                // Create a 6x6x6 color cube
-                int[] cmap = new int[256];
-                int i = 0;
-                for(int r = 0; r < 256; r += 51){
-                    for(int g = 0; g < 256; g += 51){
-                        for(int b = 0; b < 256; b += 51){
-                            cmap[i++] = (r << 16) | (g << 8) | b;
-                        }
-                    }
-                }
-                // And populate the rest of the cmap with gray values
-                int grayIncr = 256 / (256 - i);
-
-                // The gray ramp will be between 18 and 252
-                int gray = grayIncr * 3;
-                for(; i < 256; i++){
-                    cmap[i] = (gray << 16) | (gray << 8) | gray;
-                    gray += grayIncr;
-                }
-
-                return new IndexColorModel(8, 256, cmap, 0, false, -1, DataBuffer.TYPE_BYTE);
-            }
-            case TYPE_USHORT_565_RGB: {
-                return new DirectColorModel(16, DCM_565_RED_MASK, DCM_565_GRN_MASK, DCM_565_BLU_MASK);
-            }
-            case TYPE_USHORT_555_RGB: {
-                return new DirectColorModel(15, DCM_555_RED_MASK, DCM_555_GRN_MASK, DCM_555_BLU_MASK);
-            }
-            default:
-                throw new IllegalArgumentException("Unknown image type " + imageType);
-        }
-    }
-
-    /**
-     * Create a new WritableRaster based on the current imageType and ColorModel.
-     */
-    private WritableRaster createRaster(int width, int height){
-        switch(imageType){
-            case TYPE_INT_RGB:
-            case TYPE_INT_ARGB:
-            case TYPE_INT_ARGB_PRE:
-            case TYPE_INT_BGR:
-            case TYPE_BYTE_GRAY:
-            case TYPE_USHORT_GRAY:
-            case TYPE_USHORT_565_RGB:
-            case TYPE_USHORT_555_RGB: {
-                return colorModel.createCompatibleWritableRaster(width, height);
-            }
-            case TYPE_3BYTE_BGR: {
-                int[] bOffs = {2, 1, 0};
-                return Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE, width, height, width * 3, 3, bOffs, null);
-            }
-            case TYPE_4BYTE_ABGR:
-            case TYPE_4BYTE_ABGR_PRE: {
-                int[] bOffs = {3, 2, 1, 0};
-                return Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE, width, height, width * 4, 4, bOffs, null);
-            }
-            case TYPE_BYTE_BINARY: {
-                return Raster.createPackedRaster(DataBuffer.TYPE_BYTE, width, height, 1, 1, null);
-            }
-            case TYPE_BYTE_INDEXED: {
-                return Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE, width, height, 1, null);
-            }
-            default:
-                throw new IllegalArgumentException("Unknown image type " + imageType);
-        }
-    }
-
-    /**
-     * Returns the image type.  If it is not one of the known types,
-     * TYPE_CUSTOM is returned.
-     * @return the image type of this <code>BufferedImage</code>.
-     * @see #TYPE_INT_RGB
-     * @see #TYPE_INT_ARGB
-     * @see #TYPE_INT_ARGB_PRE
-     * @see #TYPE_INT_BGR
-     * @see #TYPE_3BYTE_BGR
-     * @see #TYPE_4BYTE_ABGR
-     * @see #TYPE_4BYTE_ABGR_PRE
-     * @see #TYPE_BYTE_GRAY
-     * @see #TYPE_BYTE_BINARY
-     * @see #TYPE_BYTE_INDEXED
-     * @see #TYPE_USHORT_GRAY
-     * @see #TYPE_USHORT_565_RGB
-     * @see #TYPE_USHORT_555_RGB
-     * @see #TYPE_CUSTOM
-     */
-    public int getType() {
-        return imageType;
-    }
-
-    /**
-     * Returns the <code>ColorModel</code>.
-     * @return the <code>ColorModel</code> of this
-     *  <code>BufferedImage</code>.
-     */
-    public ColorModel getColorModel() {
-        return colorModel;
-    }
-
-    /**
-     * Returns the {@link WritableRaster}.
-     * @return the <code>WriteableRaster</code> of this
-     *  <code>BufferedImage</code>.
-     */
-    public WritableRaster getRaster() {
-        bitmap2Raster();
-        this.currentBuffer = BUFFER_RASTER;
-        return raster;
-    }
-
-
-    /**
-     * Returns a <code>WritableRaster</code> representing the alpha
-     * channel for <code>BufferedImage</code> objects
-     * with <code>ColorModel</code> objects that support a separate
-     * spatial alpha channel, such as <code>ComponentColorModel</code> and
-     * <code>DirectColorModel</code>.  Returns <code>null</code> if there
-     * is no alpha channel associated with the <code>ColorModel</code> in
-     * this image.  This method assumes that for all
-     * <code>ColorModel</code> objects other than
-     * <code>IndexColorModel</code>, if the <code>ColorModel</code>
-     * supports alpha, there is a separate alpha channel
-     * which is stored as the last band of image data.
-     * If the image uses an <code>IndexColorModel</code> that
-     * has alpha in the lookup table, this method returns
-     * <code>null</code> since there is no spatially discrete alpha
-     * channel.  This method creates a new
-     * <code>WritableRaster</code>, but shares the data array.
-     * @return a <code>WritableRaster</code> or <code>null</code> if this
-     *          <code>BufferedImage</code> has no alpha channel associated
-     *          with its <code>ColorModel</code>.
-     */
-    public WritableRaster getAlphaRaster() {
-        bitmap2Raster();
-        return colorModel.getAlphaRaster(raster);
-    }
-
-    /**
-     * Returns an integer pixel in the default RGB color model
-     * (TYPE_INT_ARGB) and default sRGB colorspace.  Color
-     * conversion takes place if this default model does not match
-     * the image <code>ColorModel</code>.  There are only 8-bits of
-     * precision for each color component in the returned data when using
-     * this method.
-     *
-     * <p>
-     *
-     * An <code>ArrayOutOfBoundsException</code> may be thrown
-     * if the coordinates are not in bounds.
-     * However, explicit bounds checking is not guaranteed.
-     *
-     * @param x the X coordinate of the pixel from which to get
-     *          the pixel in the default RGB color model and sRGB
-     *          color space
-     * @param y the Y coordinate of the pixel from which to get
-     *          the pixel in the default RGB color model and sRGB
-     *          color space
-     * @return an integer pixel in the default RGB color model and
-     *          default sRGB colorspace.
-     * @see #setRGB(int, int, int)
-     * @see #setRGB(int, int, int, int, int[], int, int)
-     */
-    public int getRGB(int x, int y) {
-        bitmap2Raster();
-        return colorModel.getRGB(raster.getDataElements(x, y, null));
-    }
-
-    /**
-     * Returns an array of integer pixels in the default RGB color model
-     * (TYPE_INT_ARGB) and default sRGB color space,
-     * from a portion of the image data.  Color conversion takes
-     * place if the default model does not match the image
-     * <code>ColorModel</code>.  There are only 8-bits of precision for
-     * each color component in the returned data when
-     * using this method.  With a specified coordinate (x,&nbsp;y) in the
-     * image, the ARGB pixel can be accessed in this way:
-     *
-     * <pre>
-     *    pixel   = rgbArray[offset + (y-startY)*scansize + (x-startX)]; </pre>
-     *
-     * <p>
-     *
-     * An <code>ArrayOutOfBoundsException</code> may be thrown
-     * if the region is not in bounds.
-     * However, explicit bounds checking is not guaranteed.
-     *
-     * @param startX      the starting X coordinate
-     * @param startY      the starting Y coordinate
-     * @param w           width of region
-     * @param h           height of region
-     * @param rgbArray    if not <code>null</code>, the rgb pixels are
-     *          written here
-     * @param offset      offset into the <code>rgbArray</code>
-     * @param scansize    scanline stride for the <code>rgbArray</code>
-     * @return            array of RGB pixels.
-     * @see #setRGB(int, int, int)
-     * @see #setRGB(int, int, int, int, int[], int, int)
-     */
-    public int[] getRGB(int startX, int startY, int w, int h,
-                        int[] rgbArray, int offset, int scansize) {
-        int yoff  = offset;
-        int off;
-        Object data;
-        bitmap2Raster();
-        int nbands = raster.getNumBands();
-        int dataType = raster.getDataBuffer().getDataType();
-        switch (dataType) {
-        case DataBuffer.TYPE_BYTE:
-            data = new byte[nbands];
-            break;
-        case DataBuffer.TYPE_USHORT:
-            data = new short[nbands];
-            break;
-        case DataBuffer.TYPE_INT:
-            data = new int[nbands];
-            break;
-        case DataBuffer.TYPE_FLOAT:
-            data = new float[nbands];
-            break;
-        case DataBuffer.TYPE_DOUBLE:
-            data = new double[nbands];
-            break;
-        default:
-            throw new IllegalArgumentException("Unknown data buffer type: "+
-                                               dataType);
-        }
-
-        if (rgbArray == null) {
-            rgbArray = new int[offset+h*scansize];
-        }
-
-        for (int y = startY; y < startY+h; y++, yoff+=scansize) {
-            off = yoff;
-            for (int x = startX; x < startX+w; x++) {
-                rgbArray[off++] = colorModel.getRGB(raster.getDataElements(x,
-                                                                        y,
-                                                                        data));
-            }
-        }
-
-        return rgbArray;
-    }
-
-
-    /**
-     * Sets a pixel in this <code>BufferedImage</code> to the specified
-     * RGB value. The pixel is assumed to be in the default RGB color
-     * model, TYPE_INT_ARGB, and default sRGB color space.  For images
-     * with an <code>IndexColorModel</code>, the index with the nearest
-     * color is chosen.
-     *
-     * <p>
-     *
-     * An <code>ArrayOutOfBoundsException</code> may be thrown
-     * if the coordinates are not in bounds.
-     * However, explicit bounds checking is not guaranteed.
-     *
-     * @param x the X coordinate of the pixel to set
-     * @param y the Y coordinate of the pixel to set
-     * @param rgb the RGB value
-     * @see #getRGB(int, int)
-     * @see #getRGB(int, int, int, int, int[], int, int)
-     */
-    public synchronized void setRGB(int x, int y, int rgb) {
-    	switch( currentBuffer ) {
-    	case BUFFER_BITMAP:
-    		synchronized (bitmap) {
-    			bitmap.SetPixel(x, y, Color.FromArgb(rgb));
-			}
-    		break;
-    	case BUFFER_RASTER:
-    		raster.setDataElements(x, y, colorModel.getDataElements(rgb, null));
-    		break;
-    	case BUFFER_BOTH:
-    		raster.setDataElements(x, y, colorModel.getDataElements(rgb, null));
-    		synchronized (bitmap) {
-    			bitmap.SetPixel(x, y, Color.FromArgb(rgb));
-			}
-    		break;
-    	}
-    }
-
-    /**
-     * Sets an array of integer pixels in the default RGB color model
-     * (TYPE_INT_ARGB) and default sRGB color space,
-     * into a portion of the image data.  Color conversion takes place
-     * if the default model does not match the image
-     * <code>ColorModel</code>.  There are only 8-bits of precision for
-     * each color component in the returned data when
-     * using this method.  With a specified coordinate (x,&nbsp;y) in the
-     * this image, the ARGB pixel can be accessed in this way:
-     * <pre>
-     *    pixel   = rgbArray[offset + (y-startY)*scansize + (x-startX)];
-     * </pre>
-     * WARNING: No dithering takes place.
-     *
-     * <p>
-     *
-     * An <code>ArrayOutOfBoundsException</code> may be thrown
-     * if the region is not in bounds.
-     * However, explicit bounds checking is not guaranteed.
-     *
-     * @param startX      the starting X coordinate
-     * @param startY      the starting Y coordinate
-     * @param w           width of the region
-     * @param h           height of the region
-     * @param rgbArray    the rgb pixels
-     * @param offset      offset into the <code>rgbArray</code>
-     * @param scansize    scanline stride for the <code>rgbArray</code>
-     * @see #getRGB(int, int)
-     * @see #getRGB(int, int, int, int, int[], int, int)
-     */
-    public void setRGB(int startX, int startY, int w, int h,
-                        int[] rgbArray, int offset, int scansize) {
-        int yoff  = offset;
-        int off;
-
-        for (int y = startY; y < startY+h; y++, yoff+=scansize) {
-            off = yoff;
-            for (int x = startX; x < startX+w; x++) {
-            	setRGB(x, y, rgbArray[off++]);
-            }
-        }
-    }
-
-
-    /**
-     * Returns the width of the <code>BufferedImage</code>.
-     * @return the width of this <code>BufferedImage</code>
-     */
-    public int getWidth() {
-        if(currentBuffer == BUFFER_BITMAP){
-            synchronized( bitmap ) {
-                return bitmap.get_Width();
-            }
-        }else{
-            return raster.getWidth();
-        }
-    }
-
-    /**
-     * Returns the height of the <code>BufferedImage</code>.
-     * @return the height of this <code>BufferedImage</code>
-     */
-    public int getHeight() {
-        if(currentBuffer == BUFFER_BITMAP){
-            synchronized( bitmap ) {
-                return bitmap.get_Height();
-            }
-        }else{
-            return raster.getHeight();
-        }
-    }
-
-    /**
-     * Returns the width of the <code>BufferedImage</code>.
-     * @param observer ignored
-     * @return the width of this <code>BufferedImage</code>
-     */
-    public int getWidth(ImageObserver observer) {
-        return getWidth();
-    }
-
-    /**
-     * Returns the height of the <code>BufferedImage</code>.
-     * @param observer ignored
-     * @return the height of this <code>BufferedImage</code>
-     */
-    public int getHeight(ImageObserver observer) {
-        return getHeight();
-    }
-
-    /**
-     * Returns the object that produces the pixels for the image.
-     * @return the {@link ImageProducer} that is used to produce the
-     * pixels for this image.
-     * @see ImageProducer
-     */
-    public ImageProducer getSource() {
-        if(currentBuffer != BUFFER_RASTER){
-            synchronized( bitmap ) {
-                int width = bitmap.get_Width();
-                int height = bitmap.get_Height();
-                int[] pix = new int[width * height];
-                for(int y = 0; y < height; y++){
-                    for(int x = 0; x < width; x++){
-                        pix[x + y * width] = bitmap.GetPixel(x, y).ToArgb();
-                    }
-                }
-                return new java.awt.image.MemoryImageSource(width, height, pix, 0, width);
-            }
-        }else{
-            if(osis == null){
-                if(properties == null){
-                    properties = new Hashtable();
-                }
-                osis = new OffScreenImageSource(this, properties);
-            }
-            return osis;
-        }
-    }
-
-
-    /**
-     * Returns a property of the image by name.  Individual property names
-     * are defined by the various image formats.  If a property is not
-     * defined for a particular image, this method returns the
-     * <code>UndefinedProperty</code> field.  If the properties
-     * for this image are not yet known, then this method returns
-     * <code>null</code> and the <code>ImageObserver</code> object is
-     * notified later.  The property name "comment" should be used to
-     * store an optional comment that can be presented to the user as a
-     * description of the image, its source, or its author.
-     * @param name the property name
-     * @param observer the <code>ImageObserver</code> that receives
-     *  notification regarding image information
-     * @return an {@link Object} that is the property referred to by the
-     *          specified <code>name</code> or <code>null</code> if the
-     *          properties of this image are not yet known.
-     * @throws NullPointerException if the property name is null.
-     * @see ImageObserver
-     * @see java.awt.Image#UndefinedProperty
-     */
-    public Object getProperty(String name, ImageObserver observer) {
-        return getProperty(name);
-    }
-
-    /**
-     * Returns a property of the image by name.
-     * @param name the property name
-     * @return an <code>Object</code> that is the property referred to by
-     *          the specified <code>name</code>.
-     * @throws NullPointerException if the property name is null.
-     */
-    public Object getProperty(String name) {
-        if (name == null) {
-            throw new NullPointerException("null property name is not allowed");
-        }
-        if (properties == null) {
-            return java.awt.Image.UndefinedProperty;
-        }
-        Object o = properties.get(name);
-        if (o == null) {
-            o = java.awt.Image.UndefinedProperty;
-        }
-        return o;
-    }
-
-    /**
-     * This method returns a {@link Graphics2D}, but is here
-     * for backwards compatibility.  {@link #createGraphics() createGraphics} is more
-     * convenient, since it is declared to return a
-     * <code>Graphics2D</code>.
-     * @return a <code>Graphics2D</code>, which can be used to draw into
-     *          this image.
-     */
-    public java.awt.Graphics getGraphics() {
-        return createGraphics();
-    }
-
-    /**
-     * Creates a <code>Graphics2D</code>, which can be used to draw into
-     * this <code>BufferedImage</code>.
-     * @return a <code>Graphics2D</code>, used for drawing into this
-     *          image.
-     */
-    public Graphics2D createGraphics() {
-        GraphicsEnvironment env =
-            GraphicsEnvironment.getLocalGraphicsEnvironment();
-        return env.createGraphics(this);
-    }
-
-    /**
-     * Returns a subimage defined by a specified rectangular region.
-     * The returned <code>BufferedImage</code> shares the same
-     * data array as the original image.
-     * @param x the X coordinate of the upper-left corner of the
-     *          specified rectangular region
-     * @param y the Y coordinate of the upper-left corner of the
-     *          specified rectangular region
-     * @param w the width of the specified rectangular region
-     * @param h the height of the specified rectangular region
-     * @return a <code>BufferedImage</code> that is the subimage of this
-     *          <code>BufferedImage</code>.
-     * @exception RasterFormatException if the specified
-     * area is not contained within this <code>BufferedImage</code>.
-     */
-    public BufferedImage getSubimage (int x, int y, int w, int h) {
-        bitmap2Raster();
-        return new BufferedImage (colorModel,
-                                  raster.createWritableChild(x, y, w, h,
-                                                             0, 0, null),
-                                  colorModel.isAlphaPremultiplied(),
-                                  properties);
-    }
-
-    /**
-     * Returns whether or not the alpha has been premultiplied.  It
-     * returns <code>false</code> if there is no alpha.
-     * @return <code>true</code> if the alpha has been premultiplied;
-     *          <code>false</code> otherwise.
-     */
-    public boolean isAlphaPremultiplied() {
-        return colorModel.isAlphaPremultiplied();
-    }
-
-    /**
-     * Forces the data to match the state specified in the
-     * <code>isAlphaPremultiplied</code> variable.  It may multiply or
-     * divide the color raster data by alpha, or do nothing if the data is
-     * in the correct state.
-     * @param isAlphaPremultiplied <code>true</code> if the alpha has been
-     *          premultiplied; <code>false</code> otherwise.
-     */
-    public void coerceData (boolean isAlphaPremultiplied) {
-        if (colorModel.hasAlpha() &&
-            colorModel.isAlphaPremultiplied() != isAlphaPremultiplied) {
-            bitmap2Raster();
-            this.currentBuffer = BUFFER_RASTER;
-            // Make the color model do the conversion
-            colorModel = colorModel.coerceData (raster, isAlphaPremultiplied);
-        }
-    }
-
-    /**
-     * Returns a <code>String</code> representation of this
-     * <code>BufferedImage</code> object and its values.
-     * @return a <code>String</code> representing this
-     *          <code>BufferedImage</code>.
-     */
-    public String toString() {
-        return "BufferedImage@"+Integer.toHexString(hashCode())
-            +": type = "+imageType
-            +" "+colorModel+" "+raster;
-    }
-
-    /**
-     * Returns a {@link Vector} of {@link RenderedImage} objects that are
-     * the immediate sources, not the sources of these immediate sources,
-     * of image data for this <code>BufferedImage</code>.  This
-     * method returns <code>null</code> if the <code>BufferedImage</code>
-     * has no information about its immediate sources.  It returns an
-     * empty <code>Vector</code> if the <code>BufferedImage</code> has no
-     * immediate sources.
-     * @return a <code>Vector</code> containing immediate sources of
-     *          this <code>BufferedImage</code> object's image date, or
-     *          <code>null</code> if this <code>BufferedImage</code> has
-     *          no information about its immediate sources, or an empty
-     *          <code>Vector</code> if this <code>BufferedImage</code>
-     *          has no immediate sources.
-     */
-    public Vector<RenderedImage> getSources() {
-        return null;
-    }
-
-    /**
-     * Returns an array of names recognized by
-     * {@link #getProperty(String) getProperty(String)}
-     * or <code>null</code>, if no property names are recognized.
-     * @return a <code>String</code> array containing all of the property
-     *          names that <code>getProperty(String)</code> recognizes;
-     *          or <code>null</code> if no property names are recognized.
-     */
-    public String[] getPropertyNames() {
-         return null;
-    }
-
-    /**
-     * Returns the minimum x coordinate of this
-     * <code>BufferedImage</code>.  This is always zero.
-     * @return the minimum x coordinate of this
-     *          <code>BufferedImage</code>.
-     */
-    public int getMinX() {
-        return 0;
-    }
-
-    /**
-     * Returns the minimum y coordinate of this
-     * <code>BufferedImage</code>.  This is always zero.
-     * @return the minimum y coordinate of this
-     *          <code>BufferedImage</code>.
-     */
-    public int getMinY() {
-        return 0;
-    }
-
-    /**
-     * Returns the <code>SampleModel</code> associated with this
-     * <code>BufferedImage</code>.
-     * @return the <code>SampleModel</code> of this
-     *          <code>BufferedImage</code>.
-     */
-    public SampleModel getSampleModel() {
-        bitmap2Raster();
-        return raster.getSampleModel();
-    }
-
-    /**
-     * Returns the number of tiles in the x direction.
-     * This is always one.
-     * @return the number of tiles in the x direction.
-     */
-    public int getNumXTiles() {
-        return 1;
-    }
-
-    /**
-     * Returns the number of tiles in the y direction.
-     * This is always one.
-     * @return the number of tiles in the y direction.
-     */
-    public int getNumYTiles() {
-        return 1;
-    }
-
-    /**
-     * Returns the minimum tile index in the x direction.
-     * This is always zero.
-     * @return the minimum tile index in the x direction.
-     */
-    public int getMinTileX() {
-        return 0;
-    }
-
-    /**
-     * Returns the minimum tile index in the y direction.
-     * This is always zero.
-     * @return the minimum tile index in the y direction.
-     */
-    public int getMinTileY() {
-        return 0;
-    }
-
-    /**
-     * Returns the tile width in pixels.
-     * @return the tile width in pixels.
-     */
-    public int getTileWidth() {
-       return getWidth();
-    }
-
-    /**
-     * Returns the tile height in pixels.
-     * @return the tile height in pixels.
-     */
-    public int getTileHeight() {
-       return getHeight();
-    }
-
-    /**
-     * Returns the x offset of the tile grid relative to the origin,
-     * For example, the x coordinate of the location of tile
-     * (0,&nbsp;0).  This is always zero.
-     * @return the x offset of the tile grid.
-     */
-    public int getTileGridXOffset() {
-        bitmap2Raster();
-        return raster.getSampleModelTranslateX();
-    }
-
-    /**
-     * Returns the y offset of the tile grid relative to the origin,
-     * For example, the y coordinate of the location of tile
-     * (0,&nbsp;0).  This is always zero.
-     * @return the y offset of the tile grid.
-     */
-    public int getTileGridYOffset() {
-        bitmap2Raster();
-        return raster.getSampleModelTranslateY();
-    }
-
-    /**
-     * Returns tile (<code>tileX</code>,&nbsp;<code>tileY</code>).  Note
-     * that <code>tileX</code> and <code>tileY</code> are indices
-     * into the tile array, not pixel locations.  The <code>Raster</code>
-     * that is returned is live, which means that it is updated if the
-     * image is changed.
-     * @param tileX the x index of the requested tile in the tile array
-     * @param tileY the y index of the requested tile in the tile array
-     * @return a <code>Raster</code> that is the tile defined by the
-     *          arguments <code>tileX</code> and <code>tileY</code>.
-     * @exception ArrayIndexOutOfBoundsException if both
-     *          <code>tileX</code> and <code>tileY</code> are not
-     *          equal to 0
-     */
-    public Raster getTile(int tileX, int tileY) {
-        if (tileX == 0 && tileY == 0) {
-            bitmap2Raster();
-            return raster;
-        }
-        throw new ArrayIndexOutOfBoundsException("BufferedImages only have"+
-             " one tile with index 0,0");
-    }
-
-    /**
-     * Returns the image as one large tile.  The <code>Raster</code>
-     * returned is a copy of the image data is not updated if the
-     * image is changed.
-     * @return a <code>Raster</code> that is a copy of the image data.
-     * @see #setData(Raster)
-     */
-    public Raster getData() {
-        bitmap2Raster();
-
-        // REMIND : this allocates a whole new tile if raster is a
-        // subtile.  (It only copies in the requested area)
-        // We should do something smarter.
-        int width = raster.getWidth();
-        int height = raster.getHeight();
-        int startX = raster.getMinX();
-        int startY = raster.getMinY();
-        WritableRaster wr =
-           Raster.createWritableRaster(raster.getSampleModel(),
-                         new Point(raster.getSampleModelTranslateX(),
-                                   raster.getSampleModelTranslateY()));
-
-        Object tdata = null;
-
-        for (int i = startY; i < startY+height; i++)  {
-            tdata = raster.getDataElements(startX,i,width,1,tdata);
-            wr.setDataElements(startX,i,width,1, tdata);
-        }
-        return wr;
-    }
-
-    /**
-     * Computes and returns an arbitrary region of the
-     * <code>BufferedImage</code>.  The <code>Raster</code> returned is a
-     * copy of the image data and is not updated if the image is
-     * changed.
-     * @param rect the region of the <code>BufferedImage</code> to be
-     * returned.
-     * @return a <code>Raster</code> that is a copy of the image data of
-     *          the specified region of the <code>BufferedImage</code>
-     * @see #setData(Raster)
-     */
-    public Raster getData(Rectangle rect) {
-        bitmap2Raster();
-        SampleModel sm = raster.getSampleModel();
-        SampleModel nsm = sm.createCompatibleSampleModel(rect.width,
-                                                         rect.height);
-        WritableRaster wr = Raster.createWritableRaster(nsm,
-                                                  rect.getLocation());
-        int width = rect.width;
-        int height = rect.height;
-        int startX = rect.x;
-        int startY = rect.y;
-
-        Object tdata = null;
-
-        for (int i = startY; i < startY+height; i++)  {
-            tdata = raster.getDataElements(startX,i,width,1,tdata);
-            wr.setDataElements(startX,i,width,1, tdata);
-        }
-        return wr;
-    }
-
-    /**
-     * Computes an arbitrary rectangular region of the
-     * <code>BufferedImage</code> and copies it into a specified
-     * <code>WritableRaster</code>.  The region to be computed is
-     * determined from the bounds of the specified
-     * <code>WritableRaster</code>.  The specified
-     * <code>WritableRaster</code> must have a
-     * <code>SampleModel</code> that is compatible with this image.  If
-     * <code>outRaster</code> is <code>null</code>,
-     * an appropriate <code>WritableRaster</code> is created.
-     * @param outRaster a <code>WritableRaster</code> to hold the returned
-     *          part of the image, or <code>null</code>
-     * @return a reference to the supplied or created
-     *          <code>WritableRaster</code>.
-     */
-    public WritableRaster copyData(WritableRaster outRaster) {
-        bitmap2Raster();
-        if (outRaster == null) {
-            return (WritableRaster) getData();
-        }
-        int width = outRaster.getWidth();
-        int height = outRaster.getHeight();
-        int startX = outRaster.getMinX();
-        int startY = outRaster.getMinY();
-
-        Object tdata = null;
-
-        for (int i = startY; i < startY+height; i++)  {
-            tdata = raster.getDataElements(startX,i,width,1,tdata);
-            outRaster.setDataElements(startX,i,width,1, tdata);
-        }
-
-        return outRaster;
-    }
-
-  /**
-     * Sets a rectangular region of the image to the contents of the
-     * specified <code>Raster</code> <code>r</code>, which is
-     * assumed to be in the same coordinate space as the
-     * <code>BufferedImage</code>. The operation is clipped to the bounds
-     * of the <code>BufferedImage</code>.
-     * @param r the specified <code>Raster</code>
-     * @see #getData
-     * @see #getData(Rectangle)
-    */
-    public void setData(Raster r) {
-        bitmap2Raster();
-        this.currentBuffer = BUFFER_RASTER;
-        
-        int width = r.getWidth();
-        int height = r.getHeight();
-        int startX = r.getMinX();
-        int startY = r.getMinY();
-
-        int[] tdata = null;
-
-        // Clip to the current Raster
-        Rectangle rclip = new Rectangle(startX, startY, width, height);
-        Rectangle bclip = new Rectangle(0, 0, raster.width, raster.height);
-        Rectangle intersect = rclip.intersection(bclip);
-        if (intersect.isEmpty()) {
-            return;
-        }
-        width = intersect.width;
-        height = intersect.height;
-        startX = intersect.x;
-        startY = intersect.y;
-
-        // remind use get/setDataElements for speed if Rasters are
-        // compatible
-        for (int i = startY; i < startY+height; i++)  {
-            tdata = r.getPixels(startX,i,width,1,tdata);
-            raster.setPixels(startX,i,width,1, tdata);
-        }
-    }
-
-
-  /**
-   * Adds a tile observer.  If the observer is already present,
-   * it receives multiple notifications.
-   * @param to the specified {@link TileObserver}
-   */
-    public void addTileObserver (TileObserver to) {
-    }
-
-  /**
-   * Removes a tile observer.  If the observer was not registered,
-   * nothing happens.  If the observer was registered for multiple
-   * notifications, it is now registered for one fewer notification.
-   * @param to the specified <code>TileObserver</code>.
-   */
-    public void removeTileObserver (TileObserver to) {
-    }
-
-    /**
-     * Returns whether or not a tile is currently checked out for writing.
-     * @param tileX the x index of the tile.
-     * @param tileY the y index of the tile.
-     * @return <code>true</code> if the tile specified by the specified
-     *          indices is checked out for writing; <code>false</code>
-     *          otherwise.
-     * @exception ArrayIndexOutOfBoundsException if both
-     *          <code>tileX</code> and <code>tileY</code> are not equal
-     *          to 0
-     */
-    public boolean isTileWritable (int tileX, int tileY) {
-        if (tileX == 0 && tileY == 0) {
-            return true;
-        }
-        throw new IllegalArgumentException("Only 1 tile in image");
-    }
-
-    /**
-     * Returns an array of {@link Point} objects indicating which tiles
-     * are checked out for writing.  Returns <code>null</code> if none are
-     * checked out.
-     * @return a <code>Point</code> array that indicates the tiles that
-     *          are checked out for writing, or <code>null</code> if no
-     *          tiles are checked out for writing.
-     */
-    public Point[] getWritableTileIndices() {
-        Point[] p = new Point[1];
-        p[0] = new Point(0, 0);
-
-        return p;
-    }
-
-    /**
-     * Returns whether or not any tile is checked out for writing.
-     * Semantically equivalent to
-     * <pre>
-     * (getWritableTileIndices() != null).
-     * </pre>
-     * @return <code>true</code> if any tile is checked out for writing;
-     *          <code>false</code> otherwise.
-     */
-    public boolean hasTileWriters () {
-        return true;
-    }
-
-  /**
-   * Checks out a tile for writing.  All registered
-   * <code>TileObservers</code> are notified when a tile goes from having
-   * no writers to having one writer.
-   * @param tileX the x index of the tile
-   * @param tileY the y index of the tile
-   * @return a <code>WritableRaster</code> that is the tile, indicated by
-   *            the specified indices, to be checked out for writing.
-   */
-    public WritableRaster getWritableTile (int tileX, int tileY) {
-        bitmap2Raster();
-        this.currentBuffer = BUFFER_RASTER;
-        return raster;
-    }
-
-  /**
-   * Relinquishes permission to write to a tile.  If the caller
-   * continues to write to the tile, the results are undefined.
-   * Calls to this method should only appear in matching pairs
-   * with calls to {@link #getWritableTile(int, int) getWritableTile(int, int)}.  Any other leads
-   * to undefined results.  All registered <code>TileObservers</code>
-   * are notified when a tile goes from having one writer to having no
-   * writers.
-   * @param tileX the x index of the tile
-   * @param tileY the y index of the tile
-   */
-    public void releaseWritableTile (int tileX, int tileY) {
-    }
-
-    /**
-     * Returns the transparency.  Returns either OPAQUE, BITMASK,
-     * or TRANSLUCENT.
-     * @return the transparency of this <code>BufferedImage</code>.
-     * @see Transparency#OPAQUE
-     * @see Transparency#BITMASK
-     * @see Transparency#TRANSLUCENT
-     * @since 1.5
-     */
-    public int getTransparency() {
-        return colorModel.getTransparency();
-    }
-    
-    public void flush(){
-    }
-}
diff --git a/openjdk/java/awt/image/ColorConvertOp.java b/openjdk/java/awt/image/ColorConvertOp.java
deleted file mode 100644
index 0fb74978..00000000
--- a/openjdk/java/awt/image/ColorConvertOp.java
+++ /dev/null
@@ -1,537 +0,0 @@
-/* ColorConvertOp.java --
-   Copyright (C) 2004, 2006  Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-
-package java.awt.image;
-
-import gnu.java.awt.Buffers;
-
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.RenderingHints;
-import java.awt.color.ColorSpace;
-import java.awt.color.ICC_ColorSpace;
-import java.awt.color.ICC_Profile;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-
-/**
- * ColorConvertOp is a filter for converting images or rasters between
- * colorspaces, either through a sequence of colorspaces or just from source to 
- * destination.
- * 
- * Color conversion is done on the color components without alpha.  Thus
- * if a BufferedImage has alpha premultiplied, this is divided out before
- * color conversion, and premultiplication applied if the destination
- * requires it.
- * 
- * Color rendering and dithering hints may be applied if specified.  This is
- * likely platform-dependent.
- * 
- * @author jlquinn@optonline.net
- */
-public class ColorConvertOp implements BufferedImageOp, RasterOp
-{
-  private RenderingHints hints;
-  private ICC_Profile[] profiles = null;
-  private ColorSpace[] spaces;
-  
-
-  /**
-   * Convert a BufferedImage through a ColorSpace.
-   * 
-   * Objects created with this constructor can be used to convert
-   * BufferedImage's to a destination ColorSpace.  Attempts to convert Rasters
-   * with this constructor will result in an IllegalArgumentException when the
-   * filter(Raster, WritableRaster) method is called.  
-   * 
-   * @param cspace The target color space.
-   * @param hints Rendering hints to use in conversion, if any (may be null)
-   * @throws NullPointerException if the ColorSpace is null.
-   */
-  public ColorConvertOp(ColorSpace cspace, RenderingHints hints)
-  {
-    if (cspace == null)
-      throw new NullPointerException();
-    spaces = new ColorSpace[]{cspace};
-    this.hints = hints;
-  }
-  
-  /**
-   * Convert from a source colorspace to a destination colorspace.
-   * 
-   * This constructor takes two ColorSpace arguments as the source and
-   * destination color spaces.  It is usually used with the
-   * filter(Raster, WritableRaster) method, in which case the source colorspace 
-   * is assumed to correspond to the source Raster, and the destination 
-   * colorspace with the destination Raster.
-   * 
-   * If used with BufferedImages that do not match the source or destination 
-   * colorspaces specified here, there is an implicit conversion from the 
-   * source image to the source ColorSpace, or the destination ColorSpace to 
-   * the destination image.
-   * 
-   * @param srcCspace The source ColorSpace.
-   * @param dstCspace The destination ColorSpace.
-   * @param hints Rendering hints to use in conversion, if any (may be null).
-   * @throws NullPointerException if any ColorSpace is null.
-   */
-  public ColorConvertOp(ColorSpace srcCspace, ColorSpace dstCspace,
-			RenderingHints hints)
-  {
-    if (srcCspace == null || dstCspace == null)
-      throw new NullPointerException();
-    spaces = new ColorSpace[]{srcCspace, dstCspace};
-    this.hints = hints;     
-  }
-
-  /**
-   * Convert from a source colorspace to a destinatino colorspace.
-   * 
-   * This constructor builds a ColorConvertOp from an array of ICC_Profiles.
-   * The source will be converted through the sequence of color spaces
-   * defined by the profiles.  If the sequence of profiles doesn't give a
-   * well-defined conversion, an IllegalArgumentException is thrown.
-   * 
-   * If used with BufferedImages that do not match the source or destination 
-   * colorspaces specified here, there is an implicit conversion from the 
-   * source image to the source ColorSpace, or the destination ColorSpace to 
-   * the destination image.
-   * 
-   * For Rasters, the first and last profiles must have the same number of
-   * bands as the source and destination Rasters, respectively.  If this is
-   * not the case, or there fewer than 2 profiles, an IllegalArgumentException
-   * will be thrown. 
-   * 
-   * @param profiles An array of ICC_Profile's to convert through.
-   * @param hints Rendering hints to use in conversion, if any (may be null).
-   * @throws NullPointerException if the profile array is null.
-   * @throws IllegalArgumentException if the array is not a well-defined
-   *            conversion.
-   */
-  public ColorConvertOp(ICC_Profile[] profiles, RenderingHints hints)
-  {
-    if (profiles == null)
-      throw new NullPointerException();
-    
-    this.hints = hints; 
-    this.profiles = profiles;
-    
-    // Create colorspace array with space for src and dest colorspace
-    // Note that the ICC_ColorSpace constructor will throw an
-    // IllegalArgumentException if the profile is invalid; thus we check
-    // for a "well defined conversion"
-    spaces = new ColorSpace[profiles.length];
-    for (int i = 0; i < profiles.length; i++)
-      spaces[i] = new ICC_ColorSpace(profiles[i]);
-  }
-  
-  /**
-   * Convert from source color space to destination color space.
-   * 
-   * Only valid for BufferedImage objects, this Op converts from the source
-   * image's color space to the destination image's color space.
-   * 
-   * The destination in the filter(BufferedImage, BufferedImage) method cannot 
-   * be null for this operation, and it also cannot be used with the
-   * filter(Raster, WritableRaster) method.
-   * 
-   * @param hints Rendering hints to use in conversion, if any (may be null).
-   */
-  public ColorConvertOp(RenderingHints hints)
-  {
-    this.hints = hints;
-    spaces = new ColorSpace[0];
-  }
-  
-  /**
-   * Converts the source image using the conversion path specified in the
-   * constructor.  The resulting image is stored in the destination image if one
-   * is provided; otherwise a new BufferedImage is created and returned. 
-   * 
-   * The source and destination BufferedImage (if one is supplied) must have
-   * the same dimensions.
-   *
-   * @param src The source image.
-   * @param dst The destination image.
-   * @throws IllegalArgumentException if the rasters and/or color spaces are
-   *            incompatible.
-   * @return The transformed image.
-   */
-  public final BufferedImage filter(BufferedImage src, BufferedImage dst)
-  {
-    // TODO: The plan is to create a scanline buffer for intermediate buffers.
-    // For now we just suck it up and create intermediate buffers.
-    
-    if (dst == null && spaces.length == 0)
-      throw new IllegalArgumentException("Not enough color space information "
-                                         + "to complete conversion.");
-
-    if (dst != null
-        && (src.getHeight() != dst.getHeight() || src.getWidth() != dst.getWidth()))
-      throw new IllegalArgumentException("Source and destination images have "
-                                         + "different dimensions");
-
-    // Make sure input isn't premultiplied by alpha
-    if (src.isAlphaPremultiplied())
-      {
-        BufferedImage tmp = createCompatibleDestImage(src, src.getColorModel());
-        copyimage(src, tmp);
-        tmp.coerceData(false);
-        src = tmp;
-      }
-
-    // Convert through defined intermediate conversions
-    BufferedImage tmp;
-    for (int i = 0; i < spaces.length; i++)
-      {
-        if (src.getColorModel().getColorSpace().getType() != spaces[i].getType())
-          {
-            tmp = createCompatibleDestImage(src,
-                                            createCompatibleColorModel(src,
-                                                                       spaces[i]));
-            copyimage(src, tmp);
-            src = tmp;
-          }
-      }
-
-    // No implicit conversion to destination type needed; return result from the
-    // last intermediate conversions (which was left in src)
-    if (dst == null)
-      dst = src;
-
-    // Implicit conversion to destination image's color space
-    else
-      copyimage(src, dst);
-
-    return dst;
-  }
-
-  /**
-   * Converts the source raster using the conversion path specified in the
-   * constructor.  The resulting raster is stored in the destination raster if
-   * one is provided; otherwise a new WritableRaster is created and returned.
-   * 
-   * This operation is not valid with every constructor of this class; see
-   * the constructors for details.  Further, the source raster must have the
-   * same number of bands as the source ColorSpace, and the destination raster
-   * must have the same number of bands as the destination ColorSpace.
-   * 
-   * The source and destination raster (if one is supplied) must also have the
-   * same dimensions.
-   *
-   * @param src The source raster.
-   * @param dest The destination raster.
-   * @throws IllegalArgumentException if the rasters and/or color spaces are
-   *            incompatible.
-   * @return The transformed raster.
-   */
-  public final WritableRaster filter(Raster src, WritableRaster dest)
-  {
-    // Various checks to ensure that the rasters and color spaces are compatible
-    if (spaces.length < 2)
-      throw new IllegalArgumentException("Not enough information about " +
-            "source and destination colorspaces.");
-
-    if (spaces[0].getNumComponents() != src.getNumBands()
-        || (dest != null && spaces[spaces.length - 1].getNumComponents() != dest.getNumBands()))
-      throw new IllegalArgumentException("Source or destination raster " +
-            "contains the wrong number of bands.");
-
-    if (dest != null
-        && (src.getHeight() != dest.getHeight() || src.getWidth() != dest.getWidth()))
-      throw new IllegalArgumentException("Source and destination rasters " +
-            "have different dimensions");
-
-    // Need to iterate through each color space.
-    // spaces[0] corresponds to the ColorSpace of the source raster, and
-    // spaces[spaces.length - 1] corresponds to the ColorSpace of the
-    // destination, with any number (or zero) of intermediate conversions.
-
-    for (int i = 0; i < spaces.length - 2; i++)
-      {
-        WritableRaster tmp = createCompatibleDestRaster(src, spaces[i + 1],
-                                                        false,
-                                                        src.getTransferType());
-        copyraster(src, spaces[i], tmp, spaces[i + 1]);
-        src = tmp;
-      }
-
-    // The last conversion is done outside of the loop so that we can
-    // use the dest raster supplied, instead of creating our own temp raster
-    if (dest == null)
-      dest = createCompatibleDestRaster(src, spaces[spaces.length - 1], false,
-                                        DataBuffer.TYPE_BYTE);
-    copyraster(src, spaces[spaces.length - 2], dest, spaces[spaces.length - 1]);
-
-    return dest;
-  }
-
-  /**
-   * Creates an empty BufferedImage with the size equal to the source and the
-   * correct number of bands for the conversion defined in this Op. The newly 
-   * created image is created with the specified ColorModel, or if no ColorModel
-   * is supplied, an appropriate one is chosen.
-   *
-   * @param src The source image.
-   * @param dstCM A color model for the destination image (may be null).
-   * @throws IllegalArgumentException if an appropriate colormodel cannot be
-   *            chosen with the information given.
-   * @return The new compatible destination image.
-   */
-  public BufferedImage createCompatibleDestImage(BufferedImage src,
-                         ColorModel dstCM)
-  {
-    if (dstCM == null && spaces.length == 0)
-      throw new IllegalArgumentException("Don't know the destination " +
-            "colormodel");
-
-    if (dstCM == null)
-      {
-        dstCM = createCompatibleColorModel(src, spaces[spaces.length - 1]);
-      }
-
-    return new BufferedImage(dstCM,
-                             createCompatibleDestRaster(src.getRaster(),
-                                                        dstCM.getColorSpace(),
-                                                        src.getColorModel().hasAlpha(),
-                                                        dstCM.getTransferType()),
-                             src.isAlphaPremultiplied, null);
-  }
-  
-  /**
-   * Creates a new WritableRaster with the size equal to the source and the
-   * correct number of bands.
-   * 
-   * Note, the new Raster will always use a BYTE storage size, regardless of
-   * the color model or defined destination; this is for compatibility with
-   * the reference implementation.
-   *
-   * @param src The source Raster.
-   * @throws IllegalArgumentException if there isn't enough colorspace
-   *            information to create a compatible Raster.
-   * @return The new compatible destination raster.
-   */
-  public WritableRaster createCompatibleDestRaster(Raster src)
-  {
-    if (spaces.length < 2)
-      throw new IllegalArgumentException("Not enough destination colorspace " +
-            "information");
-
-    // Create a new raster with the last ColorSpace in the conversion
-    // chain, and with no alpha (implied)
-    return createCompatibleDestRaster(src, spaces[spaces.length-1], false,
-                                      DataBuffer.TYPE_BYTE);
-  }
-
-  /**
-   * Returns the array of ICC_Profiles used to create this Op, or null if the
-   * Op was created using ColorSpace arguments.
-   * 
-   * @return The array of ICC_Profiles, or null.
-   */
-  public final ICC_Profile[] getICC_Profiles()
-  {
-    return profiles;
-  }
-
-  /**
-   * Returns the rendering hints for this op.
-   * 
-   * @return The rendering hints for this Op, or null.
-   */
-  public final RenderingHints getRenderingHints()
-  {
-    return hints;
-  }
-
-  /**
-   * Returns the corresponding destination point for a source point.
-   * Because this is not a geometric operation, the destination and source
-   * points will be identical.
-   * 
-   * @param src The source point.
-   * @param dst The transformed destination point.
-   * @return The transformed destination point.
-   */
-  public final Point2D getPoint2D(Point2D src, Point2D dst)
-  {
-    if (dst == null)
-      return (Point2D)src.clone();
-    
-    dst.setLocation(src);
-    return dst;
-  }
-
-  /**
-   * Returns the corresponding destination boundary of a source boundary.
-   * Because this is not a geometric operation, the destination and source
-   * boundaries will be identical.
-   * 
-   * @param src The source boundary.
-   * @return The boundaries of the destination.
-   */
-  public final Rectangle2D getBounds2D(BufferedImage src)
-  {
-    return src.getRaster().getBounds();
-  }
-
-  /**
-   * Returns the corresponding destination boundary of a source boundary.
-   * Because this is not a geometric operation, the destination and source
-   * boundaries will be identical.
-   * 
-   * @param src The source boundary.
-   * @return The boundaries of the destination.
-   */
-  public final Rectangle2D getBounds2D(Raster src)
-  {
-    return src.getBounds();
-  }
-
-  /**
-   * Copy a source image to a destination image, respecting their colorspaces 
-   * and performing colorspace conversions if necessary.  
-   * 
-   * @param src The source image.
-   * @param dst The destination image.
-   */
-  private void copyimage(BufferedImage src, BufferedImage dst)
-  {
-    // This is done using Graphics2D in order to respect the rendering hints.
-    Graphics2D gg = dst.createGraphics();
-    
-    // If no hints are set there is no need to call
-    // setRenderingHints on the Graphics2D object.
-    if (hints != null)
-      gg.setRenderingHints(hints);
-    
-    gg.drawImage(src, 0, 0, null);
-    gg.dispose();
-  }
-  
-  /**
-   * Copy a source raster to a destination raster, performing a colorspace
-   * conversion between the two.  The conversion will respect the
-   * KEY_COLOR_RENDERING rendering hint if one is present.
-   * 
-   * @param src The source raster.
-   * @param scs The colorspace of the source raster.
-   * @dst The destination raster.
-   * @dcs The colorspace of the destination raster.
-   */
-  private void copyraster(Raster src, ColorSpace scs, WritableRaster dst, ColorSpace dcs)
-  {
-    float[] sbuf = new float[src.getNumBands()];
-    
-    if (hints != null
-        && hints.get(RenderingHints.KEY_COLOR_RENDERING) ==
-                 RenderingHints.VALUE_COLOR_RENDER_QUALITY)
-    {
-      // use cie for accuracy
-      for (int y = src.getMinY(); y < src.getHeight() + src.getMinY(); y++)
-        for (int x = src.getMinX(); x < src.getWidth() + src.getMinX(); x++)
-          dst.setPixel(x, y,
-		       dcs.fromCIEXYZ(scs.toCIEXYZ(src.getPixel(x, y, sbuf))));
-    }
-    else
-    {
-      // use rgb - it's probably faster
-      for (int y = src.getMinY(); y < src.getHeight() + src.getMinY(); y++)
-        for (int x = src.getMinX(); x < src.getWidth() + src.getMinX(); x++)
-          dst.setPixel(x, y,
-		       dcs.fromRGB(scs.toRGB(src.getPixel(x, y, sbuf))));
-    }
-  }
-
-  /**
-   * This method creates a color model with the same colorspace and alpha
-   * settings as the source image.  The created color model will always be a
-   * ComponentColorModel and have a BYTE transfer type.
-   * 
-   * @param img The source image.
-   * @param cs The ColorSpace to use.
-   * @return A color model compatible with the source image.
-   */ 
-  private ColorModel createCompatibleColorModel(BufferedImage img, ColorSpace cs)
-  {
-    // The choice of ComponentColorModel and DataBuffer.TYPE_BYTE is based on
-    // Mauve testing of the reference implementation.
-    return new ComponentColorModel(cs,
-                                   img.getColorModel().hasAlpha(), 
-                                   img.isAlphaPremultiplied(),
-                                   img.getColorModel().getTransparency(),
-                                   DataBuffer.TYPE_BYTE);    
-  }
-
-  /**
-   * This method creates a compatible Raster, given a source raster, colorspace,
-   * alpha value, and transfer type.
-   * 
-   * @param src The source raster.
-   * @param cs The ColorSpace to use.
-   * @param hasAlpha Whether the raster should include a component for an alpha.
-   * @param transferType The size of a single data element.
-   * @return A compatible WritableRaster. 
-   */
-  private WritableRaster createCompatibleDestRaster(Raster src, ColorSpace cs,
-                                                    boolean hasAlpha,
-                                                    int transferType)
-  {
-    // The use of a PixelInterleavedSampleModel weas determined using mauve
-    // tests, based on the reference implementation
-    
-    int numComponents = cs.getNumComponents();
-    if (hasAlpha)
-      numComponents++;
-    
-    int[] offsets = new int[numComponents];
-    for (int i = 0; i < offsets.length; i++)
-      offsets[i] = i;
-
-    DataBuffer db = Buffers.createBuffer(transferType,
-                                         src.getWidth() * src.getHeight() * numComponents,
-                                         1);
-    return new WritableRaster(new PixelInterleavedSampleModel(transferType,
-                                                              src.getWidth(),
-                                                              src.getHeight(),
-                                                              numComponents,
-                                                              numComponents * src.getWidth(),
-                                                              offsets),
-                              db, new Point(src.getMinX(), src.getMinY()));
-  }
-}
diff --git a/openjdk/java/awt/image/ConvolveOp.java b/openjdk/java/awt/image/ConvolveOp.java
deleted file mode 100644
index cf30e762..00000000
--- a/openjdk/java/awt/image/ConvolveOp.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/* ConvolveOp.java --
-   Copyright (C) 2004, 2005, 2006, Free Software Foundation -- ConvolveOp
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-
-package java.awt.image;
-
-import java.awt.RenderingHints;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-
-/**
- * Convolution filter.
- * 
- * ConvolveOp convolves the source image with a Kernel to generate a
- * destination image.  This involves multiplying each pixel and its neighbors
- * with elements in the kernel to compute a new pixel.
- * 
- * Each band in a Raster is convolved and copied to the destination Raster.
- * For BufferedImages, convolution is applied to all components.  Color 
- * conversion will be applied if needed.
- * 
- * Note that this filter ignores whether the source or destination is alpha
- * premultiplied.  The reference spec states that data will be premultiplied
- * prior to convolving and divided back out afterwards (if needed), but testing
- * has shown that this is not the case with their implementation.
- * 
- * @author jlquinn@optonline.net
- */
-public class ConvolveOp implements BufferedImageOp, RasterOp
-{
-  /** Edge pixels are set to 0. */
-  public static final int EDGE_ZERO_FILL = 0;
-  
-  /** Edge pixels are copied from the source. */
-  public static final int EDGE_NO_OP = 1;
-  
-  private Kernel kernel;
-  private int edge;
-  private RenderingHints hints;
-
-  /**
-   * Construct a ConvolveOp.
-   * 
-   * The edge condition specifies that pixels outside the area that can be
-   * filtered are either set to 0 or copied from the source image.
-   * 
-   * @param kernel The kernel to convolve with.
-   * @param edgeCondition Either EDGE_ZERO_FILL or EDGE_NO_OP.
-   * @param hints Rendering hints for color conversion, or null.
-   */
-  public ConvolveOp(Kernel kernel,
-      				int edgeCondition,
-      				RenderingHints hints)
-  {
-    this.kernel = kernel;
-    edge = edgeCondition;
-    this.hints = hints;
-  }
-  
-  /**
-   * Construct a ConvolveOp.
-   * 
-   * The edge condition defaults to EDGE_ZERO_FILL.
-   * 
-   * @param kernel The kernel to convolve with.
-   */
-  public ConvolveOp(Kernel kernel)
-  {
-    this.kernel = kernel;
-    edge = EDGE_ZERO_FILL;
-    hints = null;
-  }
-
-  /**
-   * Converts the source image using the kernel specified in the
-   * constructor.  The resulting image is stored in the destination image if one
-   * is provided; otherwise a new BufferedImage is created and returned. 
-   * 
-   * The source and destination BufferedImage (if one is supplied) must have
-   * the same dimensions.
-   *
-   * @param src The source image.
-   * @param dst The destination image.
-   * @throws IllegalArgumentException if the rasters and/or color spaces are
-   *            incompatible.
-   * @return The convolved image.
-   */
-  public final BufferedImage filter(BufferedImage src, BufferedImage dst)
-  {
-    if (src == dst)
-      throw new IllegalArgumentException("Source and destination images " +
-            "cannot be the same.");
-    
-    if (dst == null)
-      dst = createCompatibleDestImage(src, src.getColorModel());
-    
-    // Make sure source image is premultiplied
-    BufferedImage src1 = src;
-    // The spec says we should do this, but mauve testing shows that Sun's
-    // implementation does not check this.
-    /*
-    if (!src.isAlphaPremultiplied())
-    {
-      src1 = createCompatibleDestImage(src, src.getColorModel());
-      src.copyData(src1.getRaster());
-      src1.coerceData(true);
-    }
-    */
-
-    BufferedImage dst1 = dst;
-    if (src1.getColorModel().getColorSpace().getType() != dst.getColorModel().getColorSpace().getType())
-      dst1 = createCompatibleDestImage(src, src.getColorModel());
-
-    filter(src1.getRaster(), dst1.getRaster());
-    
-    // Since we don't coerceData above, we don't need to divide it back out.
-    // This is wrong (one mauve test specifically tests converting a non-
-    // premultiplied image to a premultiplied image, and it shows that Sun
-    // simply ignores the premultipled flag, contrary to the spec), but we
-    // mimic it for compatibility.
-    /*
-	if (! dst.isAlphaPremultiplied())
-	  dst1.coerceData(false);
-    */
-
-    // Convert between color models if needed
-    if (dst1 != dst)
-      new ColorConvertOp(hints).filter(dst1, dst);
-
-    return dst;
-  }
-
-  /**
-   * Creates an empty BufferedImage with the size equal to the source and the
-   * correct number of bands. The new image is created with the specified 
-   * ColorModel, or if no ColorModel is supplied, an appropriate one is chosen.
-   *
-   * @param src The source image.
-   * @param dstCM A color model for the destination image (may be null).
-   * @return The new compatible destination image.
-   */
-  public BufferedImage createCompatibleDestImage(BufferedImage src,
-                                                 ColorModel dstCM)
-  {
-    if (dstCM != null)
-      return new BufferedImage(dstCM,
-                               src.getRaster().createCompatibleWritableRaster(),
-                               src.isAlphaPremultiplied(), null);
-
-    return new BufferedImage(src.getWidth(), src.getHeight(), src.getType());
-  }
-
-  /* (non-Javadoc)
-   * @see java.awt.image.RasterOp#getRenderingHints()
-   */
-  public final RenderingHints getRenderingHints()
-  {
-    return hints;
-  }
-  
-  /**
-   * Get the edge condition for this Op.
-   * 
-   * @return The edge condition.
-   */
-  public int getEdgeCondition()
-  {
-    return edge;
-  }
-  
-  /**
-   * Returns (a clone of) the convolution kernel.
-   *
-   * @return The convolution kernel.
-   */
-  public final Kernel getKernel()
-  {
-    return (Kernel) kernel.clone();
-  }
-
-  /**
-   * Converts the source raster using the kernel specified in the constructor.  
-   * The resulting raster is stored in the destination raster if one is 
-   * provided; otherwise a new WritableRaster is created and returned.
-   * 
-   * If the convolved value for a sample is outside the range of [0-255], it
-   * will be clipped.
-   * 
-   * The source and destination raster (if one is supplied) cannot be the same,
-   * and must also have the same dimensions.
-   *
-   * @param src The source raster.
-   * @param dest The destination raster.
-   * @throws IllegalArgumentException if the rasters identical.
-   * @throws ImagingOpException if the convolution is not possible.
-   * @return The transformed raster.
-   */
-  public final WritableRaster filter(Raster src, WritableRaster dest)
-  {
-    if (src == dest)
-      throw new IllegalArgumentException("src == dest is not allowed.");
-    if (kernel.getWidth() > src.getWidth() 
-        || kernel.getHeight() > src.getHeight())
-      throw new ImagingOpException("The kernel is too large.");
-    if (dest == null)
-      dest = createCompatibleDestRaster(src);
-    else if (src.getNumBands() != dest.getNumBands())
-      throw new ImagingOpException("src and dest have different band counts.");
-
-    // calculate the borders that the op can't reach...
-    int kWidth = kernel.getWidth();
-    int kHeight = kernel.getHeight();
-    int left = kernel.getXOrigin();
-    int right = Math.max(kWidth - left - 1, 0);
-    int top = kernel.getYOrigin();
-    int bottom = Math.max(kHeight - top - 1, 0);
-    
-    // Calculate max sample values for clipping
-    int[] maxValue = src.getSampleModel().getSampleSize();
-    for (int i = 0; i < maxValue.length; i++)
-      maxValue[i] = (int)Math.pow(2, maxValue[i]) - 1;
-    
-    // process the region that is reachable...
-    int regionW = src.width - left - right;
-    int regionH = src.height - top - bottom;
-    float[] kvals = kernel.getKernelData(null);
-    float[] tmp = new float[kWidth * kHeight];
-
-    for (int x = 0; x < regionW; x++)
-      {
-        for (int y = 0; y < regionH; y++)
-          {
-            // FIXME: This needs a much more efficient implementation
-            for (int b = 0; b < src.getNumBands(); b++)
-            {
-              float v = 0;
-              src.getSamples(x, y, kWidth, kHeight, b, tmp);
-              for (int i = 0; i < tmp.length; i++)
-                v += tmp[tmp.length - i - 1] * kvals[i];
-                // FIXME: in the above line, I've had to reverse the order of 
-                // the samples array to make the tests pass.  I haven't worked 
-                // out why this is necessary.
-
-              // This clipping is is undocumented, but determined by testing.
-              if (v > maxValue[b])
-                v = maxValue[b];
-              else if (v < 0)
-                v = 0;
-
-              dest.setSample(x + kernel.getXOrigin(), y + kernel.getYOrigin(), 
-                             b, v);
-            }
-          }
-      }
-    
-    // fill in the top border
-    fillEdge(src, dest, 0, 0, src.width, top, edge);
-    
-    // fill in the bottom border
-    fillEdge(src, dest, 0, src.height - bottom, src.width, bottom, edge);
-    
-    // fill in the left border
-    fillEdge(src, dest, 0, top, left, regionH, edge);
-    
-    // fill in the right border
-    fillEdge(src, dest, src.width - right, top, right, regionH, edge);
-    
-    return dest;  
-  }
-  
-  /**
-   * Fills a range of pixels (typically at the edge of a raster) with either
-   * zero values (if <code>edgeOp</code> is <code>EDGE_ZERO_FILL</code>) or the 
-   * corresponding pixel values from the source raster (if <code>edgeOp</code>
-   * is <code>EDGE_NO_OP</code>).  This utility method is called by the 
-   * {@link #fillEdge(Raster, WritableRaster, int, int, int, int, int)} method.
-   * 
-   * @param src  the source raster.
-   * @param dest  the destination raster.
-   * @param x  the x-coordinate of the top left pixel in the range.
-   * @param y  the y-coordinate of the top left pixel in the range.
-   * @param w  the width of the pixel range.
-   * @param h  the height of the pixel range.
-   * @param edgeOp  indicates how to determine the values for the range
-   *     (either {@link #EDGE_ZERO_FILL} or {@link #EDGE_NO_OP}).
-   */
-  private void fillEdge(Raster src, WritableRaster dest, int x, int y, int w, 
-                        int h, int edgeOp) 
-  {
-    if (w <= 0)
-      return;
-    if (h <= 0)
-      return;
-    if (edgeOp == EDGE_ZERO_FILL)  // fill region with zeroes
-      {
-        float[] zeros = new float[src.getNumBands() * w * h];
-        dest.setPixels(x, y, w, h, zeros); 
-      }
-    else  // copy pixels from source
-      {
-        float[] pixels = new float[src.getNumBands() * w * h];
-        src.getPixels(x, y, w, h, pixels);
-        dest.setPixels(x, y, w, h, pixels);
-      }
-  }
-
-  /* (non-Javadoc)
-   * @see java.awt.image.RasterOp#createCompatibleDestRaster(java.awt.image.Raster)
-   */
-  public WritableRaster createCompatibleDestRaster(Raster src)
-  {
-    return src.createCompatibleWritableRaster();
-  }
-
-  /* (non-Javadoc)
-   * @see java.awt.image.BufferedImageOp#getBounds2D(java.awt.image.BufferedImage)
-   */
-  public final Rectangle2D getBounds2D(BufferedImage src)
-  {
-    return src.getRaster().getBounds();
-  }
-
-  /* (non-Javadoc)
-   * @see java.awt.image.RasterOp#getBounds2D(java.awt.image.Raster)
-   */
-  public final Rectangle2D getBounds2D(Raster src)
-  {
-    return src.getBounds();
-  }
-
-  /**
-   * Returns the corresponding destination point for a source point. Because
-   * this is not a geometric operation, the destination and source points will
-   * be identical.
-   * 
-   * @param src The source point.
-   * @param dst The transformed destination point.
-   * @return The transformed destination point.
-   */
-  public final Point2D getPoint2D(Point2D src, Point2D dst)
-  {
-    if (dst == null) return (Point2D)src.clone();
-    dst.setLocation(src);
-    return dst;
-  }
-}
diff --git a/openjdk/java/awt/image/IndexColorModel.java b/openjdk/java/awt/image/IndexColorModel.java
deleted file mode 100644
index b76f924c..00000000
--- a/openjdk/java/awt/image/IndexColorModel.java
+++ /dev/null
@@ -1,1527 +0,0 @@
-/*
- * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.awt.image;
-
-import java.awt.Transparency;
-import java.awt.color.ColorSpace;
-import java.math.BigInteger;
-
-/**
- * The <code>IndexColorModel</code> class is a <code>ColorModel</code>
- * class that works with pixel values consisting of a
- * single sample that is an index into a fixed colormap in the default
- * sRGB color space.  The colormap specifies red, green, blue, and
- * optional alpha components corresponding to each index.  All components
- * are represented in the colormap as 8-bit unsigned integral values.
- * Some constructors allow the caller to specify "holes" in the colormap
- * by indicating which colormap entries are valid and which represent
- * unusable colors via the bits set in a <code>BigInteger</code> object.
- * This color model is similar to an X11 PseudoColor visual.
- * <p>
- * Some constructors provide a means to specify an alpha component
- * for each pixel in the colormap, while others either provide no
- * such means or, in some cases, a flag to indicate whether the
- * colormap data contains alpha values.  If no alpha is supplied to
- * the constructor, an opaque alpha component (alpha = 1.0) is
- * assumed for each entry.
- * An optional transparent pixel value can be supplied that indicates a
- * pixel to be made completely transparent, regardless of any alpha
- * component supplied or assumed for that pixel value.
- * Note that the color components in the colormap of an
- * <code>IndexColorModel</code> objects are never pre-multiplied with
- * the alpha components.
- * <p>
- * <a name="transparency">
- * The transparency of an <code>IndexColorModel</code> object is
- * determined by examining the alpha components of the colors in the
- * colormap and choosing the most specific value after considering
- * the optional alpha values and any transparent index specified.
- * The transparency value is <code>Transparency.OPAQUE</code>
- * only if all valid colors in
- * the colormap are opaque and there is no valid transparent pixel.
- * If all valid colors
- * in the colormap are either completely opaque (alpha = 1.0) or
- * completely transparent (alpha = 0.0), which typically occurs when
- * a valid transparent pixel is specified,
- * the value is <code>Transparency.BITMASK</code>.
- * Otherwise, the value is <code>Transparency.TRANSLUCENT</code>, indicating
- * that some valid color has an alpha component that is
- * neither completely transparent nor completely opaque
- * (0.0 &lt; alpha &lt; 1.0).
- * </a>
- *
- * <p>
- * If an <code>IndexColorModel</code> object has
- * a transparency value of <code>Transparency.OPAQUE</code>,
- * then the <code>hasAlpha</code>
- * and <code>getNumComponents</code> methods
- * (both inherited from <code>ColorModel</code>)
- * return false and 3, respectively.
- * For any other transparency value,
- * <code>hasAlpha</code> returns true
- * and <code>getNumComponents</code> returns 4.
- *
- * <p>
- * <a name="index_values">
- * The values used to index into the colormap are taken from the least
- * significant <em>n</em> bits of pixel representations where
- * <em>n</em> is based on the pixel size specified in the constructor.
- * For pixel sizes smaller than 8 bits, <em>n</em> is rounded up to a
- * power of two (3 becomes 4 and 5,6,7 become 8).
- * For pixel sizes between 8 and 16 bits, <em>n</em> is equal to the
- * pixel size.
- * Pixel sizes larger than 16 bits are not supported by this class.
- * Higher order bits beyond <em>n</em> are ignored in pixel representations.
- * Index values greater than or equal to the map size, but less than
- * 2<sup><em>n</em></sup>, are undefined and return 0 for all color and
- * alpha components.
- * <p>
- * For those methods that use a primitive array pixel representation of
- * type <code>transferType</code>, the array length is always one.
- * The transfer types supported are <code>DataBuffer.TYPE_BYTE</code> and
- * <code>DataBuffer.TYPE_USHORT</code>.  A single int pixel
- * representation is valid for all objects of this class, since it is
- * always possible to represent pixel values used with this class in a
- * single int.  Therefore, methods that use this representation do
- * not throw an <code>IllegalArgumentException</code> due to an invalid
- * pixel value.
- * <p>
- * Many of the methods in this class are final.  The reason for
- * this is that the underlying native graphics code makes assumptions
- * about the layout and operation of this class and those assumptions
- * are reflected in the implementations of the methods here that are
- * marked final.  You can subclass this class for other reasons, but
- * you cannot override or modify the behaviour of those methods.
- *
- * @see ColorModel
- * @see ColorSpace
- * @see DataBuffer
- *
- */
-public class IndexColorModel extends ColorModel {
-    private int rgb[];
-    private int map_size;
-    private int pixel_mask;
-    private int transparent_index = -1;
-    private boolean allgrayopaque;
-    private BigInteger validBits;
-
-    private static int[] opaqueBits = {8, 8, 8};
-    private static int[] alphaBits = {8, 8, 8, 8};
-
-    /**
-     * Constructs an <code>IndexColorModel</code> from the specified
-     * arrays of red, green, and blue components.  Pixels described
-     * by this color model all have alpha components of 255
-     * unnormalized (1.0&nbsp;normalized), which means they
-     * are fully opaque.  All of the arrays specifying the color
-     * components must have at least the specified number of entries.
-     * The <code>ColorSpace</code> is the default sRGB space.
-     * Since there is no alpha information in any of the arguments
-     * to this constructor, the transparency value is always
-     * <code>Transparency.OPAQUE</code>.
-     * The transfer type is the smallest of <code>DataBuffer.TYPE_BYTE</code>
-     * or <code>DataBuffer.TYPE_USHORT</code> that can hold a single pixel.
-     * @param bits      the number of bits each pixel occupies
-     * @param size      the size of the color component arrays
-     * @param r         the array of red color components
-     * @param g         the array of green color components
-     * @param b         the array of blue color components
-     * @throws IllegalArgumentException if <code>bits</code> is less
-     *         than 1 or greater than 16
-     * @throws IllegalArgumentException if <code>size</code> is less
-     *         than 1
-     */
-    public IndexColorModel(int bits, int size,
-                           byte r[], byte g[], byte b[]) {
-        super(bits, opaqueBits,
-              ColorSpace.getInstance(ColorSpace.CS_sRGB),
-              false, false, OPAQUE,
-              ColorModel.getDefaultTransferType(bits));
-        if (bits < 1 || bits > 16) {
-            throw new IllegalArgumentException("Number of bits must be between"
-                                               +" 1 and 16.");
-        }
-        setRGBs(size, r, g, b, null);
-        calculatePixelMask();
-    }
-
-    /**
-     * Constructs an <code>IndexColorModel</code> from the given arrays
-     * of red, green, and blue components.  Pixels described by this color
-     * model all have alpha components of 255 unnormalized
-     * (1.0&nbsp;normalized), which means they are fully opaque, except
-     * for the indicated pixel to be made transparent.  All of the arrays
-     * specifying the color components must have at least the specified
-     * number of entries.
-     * The <code>ColorSpace</code> is the default sRGB space.
-     * The transparency value may be <code>Transparency.OPAQUE</code> or
-     * <code>Transparency.BITMASK</code> depending on the arguments, as
-     * specified in the <a href="#transparency">class description</a> above.
-     * The transfer type is the smallest of <code>DataBuffer.TYPE_BYTE</code>
-     * or <code>DataBuffer.TYPE_USHORT</code> that can hold a
-     * single pixel.
-     * @param bits      the number of bits each pixel occupies
-     * @param size      the size of the color component arrays
-     * @param r         the array of red color components
-     * @param g         the array of green color components
-     * @param b         the array of blue color components
-     * @param trans     the index of the transparent pixel
-     * @throws IllegalArgumentException if <code>bits</code> is less than
-     *          1 or greater than 16
-     * @throws IllegalArgumentException if <code>size</code> is less than
-     *          1
-     */
-    public IndexColorModel(int bits, int size,
-                           byte r[], byte g[], byte b[], int trans) {
-        super(bits, opaqueBits,
-              ColorSpace.getInstance(ColorSpace.CS_sRGB),
-              false, false, OPAQUE,
-              ColorModel.getDefaultTransferType(bits));
-        if (bits < 1 || bits > 16) {
-            throw new IllegalArgumentException("Number of bits must be between"
-                                               +" 1 and 16.");
-        }
-        setRGBs(size, r, g, b, null);
-        setTransparentPixel(trans);
-        calculatePixelMask();
-    }
-
-    /**
-     * Constructs an <code>IndexColorModel</code> from the given
-     * arrays of red, green, blue and alpha components.  All of the
-     * arrays specifying the components must have at least the specified
-     * number of entries.
-     * The <code>ColorSpace</code> is the default sRGB space.
-     * The transparency value may be any of <code>Transparency.OPAQUE</code>,
-     * <code>Transparency.BITMASK</code>,
-     * or <code>Transparency.TRANSLUCENT</code>
-     * depending on the arguments, as specified
-     * in the <a href="#transparency">class description</a> above.
-     * The transfer type is the smallest of <code>DataBuffer.TYPE_BYTE</code>
-     * or <code>DataBuffer.TYPE_USHORT</code> that can hold a single pixel.
-     * @param bits      the number of bits each pixel occupies
-     * @param size      the size of the color component arrays
-     * @param r         the array of red color components
-     * @param g         the array of green color components
-     * @param b         the array of blue color components
-     * @param a         the array of alpha value components
-     * @throws IllegalArgumentException if <code>bits</code> is less
-     *           than 1 or greater than 16
-     * @throws IllegalArgumentException if <code>size</code> is less
-     *           than 1
-     */
-    public IndexColorModel(int bits, int size,
-                           byte r[], byte g[], byte b[], byte a[]) {
-        super (bits, alphaBits,
-               ColorSpace.getInstance(ColorSpace.CS_sRGB),
-               true, false, TRANSLUCENT,
-               ColorModel.getDefaultTransferType(bits));
-        if (bits < 1 || bits > 16) {
-            throw new IllegalArgumentException("Number of bits must be between"
-                                               +" 1 and 16.");
-        }
-        setRGBs (size, r, g, b, a);
-        calculatePixelMask();
-    }
-
-    /**
-     * Constructs an <code>IndexColorModel</code> from a single
-     * array of interleaved red, green, blue and optional alpha
-     * components.  The array must have enough values in it to
-     * fill all of the needed component arrays of the specified
-     * size.  The <code>ColorSpace</code> is the default sRGB space.
-     * The transparency value may be any of <code>Transparency.OPAQUE</code>,
-     * <code>Transparency.BITMASK</code>,
-     * or <code>Transparency.TRANSLUCENT</code>
-     * depending on the arguments, as specified
-     * in the <a href="#transparency">class description</a> above.
-     * The transfer type is the smallest of
-     * <code>DataBuffer.TYPE_BYTE</code> or <code>DataBuffer.TYPE_USHORT</code>
-     * that can hold a single pixel.
-     *
-     * @param bits      the number of bits each pixel occupies
-     * @param size      the size of the color component arrays
-     * @param cmap      the array of color components
-     * @param start     the starting offset of the first color component
-     * @param hasalpha  indicates whether alpha values are contained in
-     *                  the <code>cmap</code> array
-     * @throws IllegalArgumentException if <code>bits</code> is less
-     *           than 1 or greater than 16
-     * @throws IllegalArgumentException if <code>size</code> is less
-     *           than 1
-     */
-    public IndexColorModel(int bits, int size, byte cmap[], int start,
-                           boolean hasalpha) {
-        this(bits, size, cmap, start, hasalpha, -1);
-        if (bits < 1 || bits > 16) {
-            throw new IllegalArgumentException("Number of bits must be between"
-                                               +" 1 and 16.");
-        }
-    }
-
-    /**
-     * Constructs an <code>IndexColorModel</code> from a single array of
-     * interleaved red, green, blue and optional alpha components.  The
-     * specified transparent index represents a pixel that is made
-     * entirely transparent regardless of any alpha value specified
-     * for it.  The array must have enough values in it to fill all
-     * of the needed component arrays of the specified size.
-     * The <code>ColorSpace</code> is the default sRGB space.
-     * The transparency value may be any of <code>Transparency.OPAQUE</code>,
-     * <code>Transparency.BITMASK</code>,
-     * or <code>Transparency.TRANSLUCENT</code>
-     * depending on the arguments, as specified
-     * in the <a href="#transparency">class description</a> above.
-     * The transfer type is the smallest of
-     * <code>DataBuffer.TYPE_BYTE</code> or <code>DataBuffer.TYPE_USHORT</code>
-     * that can hold a single pixel.
-     * @param bits      the number of bits each pixel occupies
-     * @param size      the size of the color component arrays
-     * @param cmap      the array of color components
-     * @param start     the starting offset of the first color component
-     * @param hasalpha  indicates whether alpha values are contained in
-     *                  the <code>cmap</code> array
-     * @param trans     the index of the fully transparent pixel
-     * @throws IllegalArgumentException if <code>bits</code> is less than
-     *               1 or greater than 16
-     * @throws IllegalArgumentException if <code>size</code> is less than
-     *               1
-     */
-    public IndexColorModel(int bits, int size, byte cmap[], int start,
-                           boolean hasalpha, int trans) {
-        // REMIND: This assumes the ordering: RGB[A]
-        super(bits, opaqueBits,
-              ColorSpace.getInstance(ColorSpace.CS_sRGB),
-              false, false, OPAQUE,
-              ColorModel.getDefaultTransferType(bits));
-
-        if (bits < 1 || bits > 16) {
-            throw new IllegalArgumentException("Number of bits must be between"
-                                               +" 1 and 16.");
-        }
-        if (size < 1) {
-            throw new IllegalArgumentException("Map size ("+size+
-                                               ") must be >= 1");
-        }
-        map_size = size;
-        rgb = new int[calcRealMapSize(bits, size)];
-        int j = start;
-        int alpha = 0xff;
-        boolean allgray = true;
-        int transparency = OPAQUE;
-        for (int i = 0; i < size; i++) {
-            int r = cmap[j++] & 0xff;
-            int g = cmap[j++] & 0xff;
-            int b = cmap[j++] & 0xff;
-            allgray = allgray && (r == g) && (g == b);
-            if (hasalpha) {
-                alpha = cmap[j++] & 0xff;
-                if (alpha != 0xff) {
-                    if (alpha == 0x00) {
-                        if (transparency == OPAQUE) {
-                            transparency = BITMASK;
-                        }
-                        if (transparent_index < 0) {
-                            transparent_index = i;
-                        }
-                    } else {
-                        transparency = TRANSLUCENT;
-                    }
-                    allgray = false;
-                }
-            }
-            rgb[i] = (alpha << 24) | (r << 16) | (g << 8) | b;
-        }
-        this.allgrayopaque = allgray;
-        setTransparency(transparency);
-        setTransparentPixel(trans);
-        calculatePixelMask();
-    }
-
-    /**
-     * Constructs an <code>IndexColorModel</code> from an array of
-     * ints where each int is comprised of red, green, blue, and
-     * optional alpha components in the default RGB color model format.
-     * The specified transparent index represents a pixel that is made
-     * entirely transparent regardless of any alpha value specified
-     * for it.  The array must have enough values in it to fill all
-     * of the needed component arrays of the specified size.
-     * The <code>ColorSpace</code> is the default sRGB space.
-     * The transparency value may be any of <code>Transparency.OPAQUE</code>,
-     * <code>Transparency.BITMASK</code>,
-     * or <code>Transparency.TRANSLUCENT</code>
-     * depending on the arguments, as specified
-     * in the <a href="#transparency">class description</a> above.
-     * @param bits      the number of bits each pixel occupies
-     * @param size      the size of the color component arrays
-     * @param cmap      the array of color components
-     * @param start     the starting offset of the first color component
-     * @param hasalpha  indicates whether alpha values are contained in
-     *                  the <code>cmap</code> array
-     * @param trans     the index of the fully transparent pixel
-     * @param transferType the data type of the array used to represent
-     *           pixel values.  The data type must be either
-     *           <code>DataBuffer.TYPE_BYTE</code> or
-     *           <code>DataBuffer.TYPE_USHORT</code>.
-     * @throws IllegalArgumentException if <code>bits</code> is less
-     *           than 1 or greater than 16
-     * @throws IllegalArgumentException if <code>size</code> is less
-     *           than 1
-     * @throws IllegalArgumentException if <code>transferType</code> is not
-     *           one of <code>DataBuffer.TYPE_BYTE</code> or
-     *           <code>DataBuffer.TYPE_USHORT</code>
-     */
-    public IndexColorModel(int bits, int size,
-                           int cmap[], int start,
-                           boolean hasalpha, int trans, int transferType) {
-        // REMIND: This assumes the ordering: RGB[A]
-        super(bits, opaqueBits,
-              ColorSpace.getInstance(ColorSpace.CS_sRGB),
-              false, false, OPAQUE,
-              transferType);
-
-        if (bits < 1 || bits > 16) {
-            throw new IllegalArgumentException("Number of bits must be between"
-                                               +" 1 and 16.");
-        }
-        if (size < 1) {
-            throw new IllegalArgumentException("Map size ("+size+
-                                               ") must be >= 1");
-        }
-        if ((transferType != DataBuffer.TYPE_BYTE) &&
-            (transferType != DataBuffer.TYPE_USHORT)) {
-            throw new IllegalArgumentException("transferType must be either" +
-                "DataBuffer.TYPE_BYTE or DataBuffer.TYPE_USHORT");
-        }
-
-        setRGBs(size, cmap, start, hasalpha);
-        setTransparentPixel(trans);
-        calculatePixelMask();
-    }
-
-    /**
-     * Constructs an <code>IndexColorModel</code> from an
-     * <code>int</code> array where each <code>int</code> is
-     * comprised of red, green, blue, and alpha
-     * components in the default RGB color model format.
-     * The array must have enough values in it to fill all
-     * of the needed component arrays of the specified size.
-     * The <code>ColorSpace</code> is the default sRGB space.
-     * The transparency value may be any of <code>Transparency.OPAQUE</code>,
-     * <code>Transparency.BITMASK</code>,
-     * or <code>Transparency.TRANSLUCENT</code>
-     * depending on the arguments, as specified
-     * in the <a href="#transparency">class description</a> above.
-     * The transfer type must be one of <code>DataBuffer.TYPE_BYTE</code>
-     * <code>DataBuffer.TYPE_USHORT</code>.
-     * The <code>BigInteger</code> object specifies the valid/invalid pixels
-     * in the <code>cmap</code> array.  A pixel is valid if the
-     * <code>BigInteger</code> value at that index is set, and is invalid
-     * if the <code>BigInteger</code> bit  at that index is not set.
-     * @param bits the number of bits each pixel occupies
-     * @param size the size of the color component array
-     * @param cmap the array of color components
-     * @param start the starting offset of the first color component
-     * @param transferType the specified data type
-     * @param validBits a <code>BigInteger</code> object.  If a bit is
-     *    set in the BigInteger, the pixel at that index is valid.
-     *    If a bit is not set, the pixel at that index
-     *    is considered invalid.  If null, all pixels are valid.
-     *    Only bits from 0 to the map size are considered.
-     * @throws IllegalArgumentException if <code>bits</code> is less
-     *           than 1 or greater than 16
-     * @throws IllegalArgumentException if <code>size</code> is less
-     *           than 1
-     * @throws IllegalArgumentException if <code>transferType</code> is not
-     *           one of <code>DataBuffer.TYPE_BYTE</code> or
-     *           <code>DataBuffer.TYPE_USHORT</code>
-     *
-     * @since 1.3
-     */
-    public IndexColorModel(int bits, int size, int cmap[], int start,
-                           int transferType, BigInteger validBits) {
-        super (bits, alphaBits,
-               ColorSpace.getInstance(ColorSpace.CS_sRGB),
-               true, false, TRANSLUCENT,
-               transferType);
-
-        if (bits < 1 || bits > 16) {
-            throw new IllegalArgumentException("Number of bits must be between"
-                                               +" 1 and 16.");
-        }
-        if (size < 1) {
-            throw new IllegalArgumentException("Map size ("+size+
-                                               ") must be >= 1");
-        }
-        if ((transferType != DataBuffer.TYPE_BYTE) &&
-            (transferType != DataBuffer.TYPE_USHORT)) {
-            throw new IllegalArgumentException("transferType must be either" +
-                "DataBuffer.TYPE_BYTE or DataBuffer.TYPE_USHORT");
-        }
-
-        if (validBits != null) {
-            // Check to see if it is all valid
-            for (int i=0; i < size; i++) {
-                if (!validBits.testBit(i)) {
-                    this.validBits = validBits;
-                    break;
-                }
-            }
-        }
-
-        setRGBs(size, cmap, start, true);
-        calculatePixelMask();
-    }
-
-    private void setRGBs(int size, byte r[], byte g[], byte b[], byte a[]) {
-        if (size < 1) {
-            throw new IllegalArgumentException("Map size ("+size+
-                                               ") must be >= 1");
-        }
-        map_size = size;
-        rgb = new int[calcRealMapSize(pixel_bits, size)];
-        int alpha = 0xff;
-        int transparency = OPAQUE;
-        boolean allgray = true;
-        for (int i = 0; i < size; i++) {
-            int rc = r[i] & 0xff;
-            int gc = g[i] & 0xff;
-            int bc = b[i] & 0xff;
-            allgray = allgray && (rc == gc) && (gc == bc);
-            if (a != null) {
-                alpha = a[i] & 0xff;
-                if (alpha != 0xff) {
-                    if (alpha == 0x00) {
-                        if (transparency == OPAQUE) {
-                            transparency = BITMASK;
-                        }
-                        if (transparent_index < 0) {
-                            transparent_index = i;
-                        }
-                    } else {
-                        transparency = TRANSLUCENT;
-                    }
-                    allgray = false;
-                }
-            }
-            rgb[i] = (alpha << 24) | (rc << 16) | (gc << 8) | bc;
-        }
-        this.allgrayopaque = allgray;
-        setTransparency(transparency);
-    }
-
-    private void setRGBs(int size, int cmap[], int start, boolean hasalpha) {
-        map_size = size;
-        rgb = new int[calcRealMapSize(pixel_bits, size)];
-        int j = start;
-        int transparency = OPAQUE;
-        boolean allgray = true;
-        BigInteger validBits = this.validBits;
-        for (int i = 0; i < size; i++, j++) {
-            if (validBits != null && !validBits.testBit(i)) {
-                continue;
-            }
-            int cmaprgb = cmap[j];
-            int r = (cmaprgb >> 16) & 0xff;
-            int g = (cmaprgb >>  8) & 0xff;
-            int b = (cmaprgb      ) & 0xff;
-            allgray = allgray && (r == g) && (g == b);
-            if (hasalpha) {
-                int alpha = cmaprgb >>> 24;
-                if (alpha != 0xff) {
-                    if (alpha == 0x00) {
-                        if (transparency == OPAQUE) {
-                            transparency = BITMASK;
-                        }
-                        if (transparent_index < 0) {
-                            transparent_index = i;
-                        }
-                    } else {
-                        transparency = TRANSLUCENT;
-                    }
-                    allgray = false;
-                }
-            } else {
-                cmaprgb |= 0xff000000;
-            }
-            rgb[i] = cmaprgb;
-        }
-        this.allgrayopaque = allgray;
-        setTransparency(transparency);
-    }
-
-    private int calcRealMapSize(int bits, int size) {
-        int newSize = Math.max(1 << bits, size);
-        return Math.max(newSize, 256);
-    }
-
-    private BigInteger getAllValid() {
-        int numbytes = (map_size+7)/8;
-        byte[] valid = new byte[numbytes];
-        java.util.Arrays.fill(valid, (byte)0xff);
-        valid[0] = (byte)(0xff >>> (numbytes*8 - map_size));
-
-        return new BigInteger(1, valid);
-    }
-
-    /**
-     * Returns the transparency.  Returns either OPAQUE, BITMASK,
-     * or TRANSLUCENT
-     * @return the transparency of this <code>IndexColorModel</code>
-     * @see Transparency#OPAQUE
-     * @see Transparency#BITMASK
-     * @see Transparency#TRANSLUCENT
-     */
-    public int getTransparency() {
-        return transparency;
-    }
-
-    /**
-     * Returns an array of the number of bits for each color/alpha component.
-     * The array contains the color components in the order red, green,
-     * blue, followed by the alpha component, if present.
-     * @return an array containing the number of bits of each color
-     *         and alpha component of this <code>IndexColorModel</code>
-     */
-    public int[] getComponentSize() {
-        if (nBits == null) {
-            if (supportsAlpha) {
-                nBits = new int[4];
-                nBits[3] = 8;
-            }
-            else {
-                nBits = new int[3];
-            }
-            nBits[0] = nBits[1] = nBits[2] = 8;
-        }
-        return nBits.clone();
-    }
-
-    /**
-     * Returns the size of the color/alpha component arrays in this
-     * <code>IndexColorModel</code>.
-     * @return the size of the color and alpha component arrays.
-     */
-    final public int getMapSize() {
-        return map_size;
-    }
-
-    /**
-     * Returns the index of a transparent pixel in this
-     * <code>IndexColorModel</code> or -1 if there is no pixel
-     * with an alpha value of 0.  If a transparent pixel was
-     * explicitly specified in one of the constructors by its
-     * index, then that index will be preferred, otherwise,
-     * the index of any pixel which happens to be fully transparent
-     * may be returned.
-     * @return the index of a transparent pixel in this
-     *         <code>IndexColorModel</code> object, or -1 if there
-     *         is no such pixel
-     */
-    final public int getTransparentPixel() {
-        return transparent_index;
-    }
-
-    /**
-     * Copies the array of red color components into the specified array.
-     * Only the initial entries of the array as specified by
-     * {@link #getMapSize() getMapSize} are written.
-     * @param r the specified array into which the elements of the
-     *      array of red color components are copied
-     */
-    final public void getReds(byte r[]) {
-        for (int i = 0; i < map_size; i++) {
-            r[i] = (byte) (rgb[i] >> 16);
-        }
-    }
-
-    /**
-     * Copies the array of green color components into the specified array.
-     * Only the initial entries of the array as specified by
-     * <code>getMapSize</code> are written.
-     * @param g the specified array into which the elements of the
-     *      array of green color components are copied
-     */
-    final public void getGreens(byte g[]) {
-        for (int i = 0; i < map_size; i++) {
-            g[i] = (byte) (rgb[i] >> 8);
-        }
-    }
-
-    /**
-     * Copies the array of blue color components into the specified array.
-     * Only the initial entries of the array as specified by
-     * <code>getMapSize</code> are written.
-     * @param b the specified array into which the elements of the
-     *      array of blue color components are copied
-     */
-    final public void getBlues(byte b[]) {
-        for (int i = 0; i < map_size; i++) {
-            b[i] = (byte) rgb[i];
-        }
-    }
-
-    /**
-     * Copies the array of alpha transparency components into the
-     * specified array.  Only the initial entries of the array as specified
-     * by <code>getMapSize</code> are written.
-     * @param a the specified array into which the elements of the
-     *      array of alpha components are copied
-     */
-    final public void getAlphas(byte a[]) {
-        for (int i = 0; i < map_size; i++) {
-            a[i] = (byte) (rgb[i] >> 24);
-        }
-    }
-
-    /**
-     * Converts data for each index from the color and alpha component
-     * arrays to an int in the default RGB ColorModel format and copies
-     * the resulting 32-bit ARGB values into the specified array.  Only
-     * the initial entries of the array as specified by
-     * <code>getMapSize</code> are
-     * written.
-     * @param rgb the specified array into which the converted ARGB
-     *        values from this array of color and alpha components
-     *        are copied.
-     */
-    final public void getRGBs(int rgb[]) {
-        System.arraycopy(this.rgb, 0, rgb, 0, map_size);
-    }
-
-    private void setTransparentPixel(int trans) {
-        if (trans >= 0 && trans < map_size) {
-            rgb[trans] &= 0x00ffffff;
-            transparent_index = trans;
-            allgrayopaque = false;
-            if (this.transparency == OPAQUE) {
-                setTransparency(BITMASK);
-            }
-        }
-    }
-
-    private void setTransparency(int transparency) {
-        if (this.transparency != transparency) {
-            this.transparency = transparency;
-            if (transparency == OPAQUE) {
-                supportsAlpha = false;
-                numComponents = 3;
-                nBits = opaqueBits;
-            } else {
-                supportsAlpha = true;
-                numComponents = 4;
-                nBits = alphaBits;
-            }
-        }
-    }
-
-    /**
-     * This method is called from the constructors to set the pixel_mask
-     * value, which is based on the value of pixel_bits.  The pixel_mask
-     * value is used to mask off the pixel parameters for methods such
-     * as getRed(), getGreen(), getBlue(), getAlpha(), and getRGB().
-     */
-    private final void calculatePixelMask() {
-        // Note that we adjust the mask so that our masking behavior here
-        // is consistent with that of our native rendering loops.
-        int maskbits = pixel_bits;
-        if (maskbits == 3) {
-            maskbits = 4;
-        } else if (maskbits > 4 && maskbits < 8) {
-            maskbits = 8;
-        }
-        pixel_mask = (1 << maskbits) - 1;
-    }
-
-    /**
-     * Returns the red color component for the specified pixel, scaled
-     * from 0 to 255 in the default RGB ColorSpace, sRGB.  The pixel value
-     * is specified as an int.
-     * Only the lower <em>n</em> bits of the pixel value, as specified in the
-     * <a href="#index_values">class description</a> above, are used to
-     * calculate the returned value.
-     * The returned value is a non pre-multiplied value.
-     * @param pixel the specified pixel
-     * @return the value of the red color component for the specified pixel
-     */
-    final public int getRed(int pixel) {
-        return (rgb[pixel & pixel_mask] >> 16) & 0xff;
-    }
-
-    /**
-     * Returns the green color component for the specified pixel, scaled
-     * from 0 to 255 in the default RGB ColorSpace, sRGB.  The pixel value
-     * is specified as an int.
-     * Only the lower <em>n</em> bits of the pixel value, as specified in the
-     * <a href="#index_values">class description</a> above, are used to
-     * calculate the returned value.
-     * The returned value is a non pre-multiplied value.
-     * @param pixel the specified pixel
-     * @return the value of the green color component for the specified pixel
-     */
-    final public int getGreen(int pixel) {
-        return (rgb[pixel & pixel_mask] >> 8) & 0xff;
-    }
-
-    /**
-     * Returns the blue color component for the specified pixel, scaled
-     * from 0 to 255 in the default RGB ColorSpace, sRGB.  The pixel value
-     * is specified as an int.
-     * Only the lower <em>n</em> bits of the pixel value, as specified in the
-     * <a href="#index_values">class description</a> above, are used to
-     * calculate the returned value.
-     * The returned value is a non pre-multiplied value.
-     * @param pixel the specified pixel
-     * @return the value of the blue color component for the specified pixel
-     */
-    final public int getBlue(int pixel) {
-        return rgb[pixel & pixel_mask] & 0xff;
-    }
-
-    /**
-     * Returns the alpha component for the specified pixel, scaled
-     * from 0 to 255.  The pixel value is specified as an int.
-     * Only the lower <em>n</em> bits of the pixel value, as specified in the
-     * <a href="#index_values">class description</a> above, are used to
-     * calculate the returned value.
-     * @param pixel the specified pixel
-     * @return the value of the alpha component for the specified pixel
-     */
-    final public int getAlpha(int pixel) {
-        return (rgb[pixel & pixel_mask] >> 24) & 0xff;
-    }
-
-    /**
-     * Returns the color/alpha components of the pixel in the default
-     * RGB color model format.  The pixel value is specified as an int.
-     * Only the lower <em>n</em> bits of the pixel value, as specified in the
-     * <a href="#index_values">class description</a> above, are used to
-     * calculate the returned value.
-     * The returned value is in a non pre-multiplied format.
-     * @param pixel the specified pixel
-     * @return the color and alpha components of the specified pixel
-     * @see ColorModel#getRGBdefault
-     */
-    final public int getRGB(int pixel) {
-        return rgb[pixel & pixel_mask];
-    }
-
-    private static final int CACHESIZE = 40;
-    private int lookupcache[] = new int[CACHESIZE];
-
-    /**
-     * Returns a data element array representation of a pixel in this
-     * ColorModel, given an integer pixel representation in the
-     * default RGB color model.  This array can then be passed to the
-     * {@link WritableRaster#setDataElements(int, int, java.lang.Object) setDataElements}
-     * method of a {@link WritableRaster} object.  If the pixel variable is
-     * <code>null</code>, a new array is allocated.  If <code>pixel</code>
-     * is not <code>null</code>, it must be
-     * a primitive array of type <code>transferType</code>; otherwise, a
-     * <code>ClassCastException</code> is thrown.  An
-     * <code>ArrayIndexOutOfBoundsException</code> is
-     * thrown if <code>pixel</code> is not large enough to hold a pixel
-     * value for this <code>ColorModel</code>.  The pixel array is returned.
-     * <p>
-     * Since <code>IndexColorModel</code> can be subclassed, subclasses
-     * inherit the implementation of this method and if they don't
-     * override it then they throw an exception if they use an
-     * unsupported <code>transferType</code>.
-     *
-     * @param rgb the integer pixel representation in the default RGB
-     * color model
-     * @param pixel the specified pixel
-     * @return an array representation of the specified pixel in this
-     *  <code>IndexColorModel</code>.
-     * @throws ClassCastException if <code>pixel</code>
-     *  is not a primitive array of type <code>transferType</code>
-     * @throws ArrayIndexOutOfBoundsException if
-     *  <code>pixel</code> is not large enough to hold a pixel value
-     *  for this <code>ColorModel</code>
-     * @throws UnsupportedOperationException if <code>transferType</code>
-     *         is invalid
-     * @see WritableRaster#setDataElements
-     * @see SampleModel#setDataElements
-     */
-    public synchronized Object getDataElements(int rgb, Object pixel) {
-        int red = (rgb>>16) & 0xff;
-        int green = (rgb>>8) & 0xff;
-        int blue  = rgb & 0xff;
-        int alpha = (rgb>>>24);
-        int pix = 0;
-
-        // Note that pixels are stored at lookupcache[2*i]
-        // and the rgb that was searched is stored at
-        // lookupcache[2*i+1].  Also, the pixel is first
-        // inverted using the unary complement operator
-        // before storing in the cache so it can never be 0.
-        for (int i = CACHESIZE - 2; i >= 0; i -= 2) {
-            if ((pix = lookupcache[i]) == 0) {
-                break;
-            }
-            if (rgb == lookupcache[i+1]) {
-                return installpixel(pixel, ~pix);
-            }
-        }
-
-        if (allgrayopaque) {
-            // IndexColorModel objects are all tagged as
-            // non-premultiplied so ignore the alpha value
-            // of the incoming color, convert the
-            // non-premultiplied color components to a
-            // grayscale value and search for the closest
-            // gray value in the palette.  Since all colors
-            // in the palette are gray, we only need compare
-            // to one of the color components for a match
-            // using a simple linear distance formula.
-
-            int minDist = 256;
-            int d;
-            int gray = (int) (red*77 + green*150 + blue*29 + 128)/256;
-
-            for (int i = 0; i < map_size; i++) {
-                if (this.rgb[i] == 0x0) {
-                    // For allgrayopaque colormaps, entries are 0
-                    // iff they are an invalid color and should be
-                    // ignored during color searches.
-                    continue;
-                }
-                d = (this.rgb[i] & 0xff) - gray;
-                if (d < 0) d = -d;
-                if (d < minDist) {
-                    pix = i;
-                    if (d == 0) {
-                        break;
-                    }
-                    minDist = d;
-                }
-            }
-        } else if (transparency == OPAQUE) {
-            // IndexColorModel objects are all tagged as
-            // non-premultiplied so ignore the alpha value
-            // of the incoming color and search for closest
-            // color match independently using a 3 component
-            // Euclidean distance formula.
-            // For opaque colormaps, palette entries are 0
-            // iff they are an invalid color and should be
-            // ignored during color searches.
-            // As an optimization, exact color searches are
-            // likely to be fairly common in opaque colormaps
-            // so first we will do a quick search for an
-            // exact match.
-
-            int smallestError = Integer.MAX_VALUE;
-            int lut[] = this.rgb;
-            int lutrgb;
-            for (int i=0; i < map_size; i++) {
-                lutrgb = lut[i];
-                if (lutrgb == rgb && lutrgb != 0) {
-                    pix = i;
-                    smallestError = 0;
-                    break;
-                }
-            }
-
-            if (smallestError != 0) {
-                for (int i=0; i < map_size; i++) {
-                    lutrgb = lut[i];
-                    if (lutrgb == 0) {
-                        continue;
-                    }
-
-                    int tmp = ((lutrgb >> 16) & 0xff) - red;
-                    int currentError = tmp*tmp;
-                    if (currentError < smallestError) {
-                        tmp = ((lutrgb >> 8) & 0xff) - green;
-                        currentError += tmp * tmp;
-                        if (currentError < smallestError) {
-                            tmp = (lutrgb & 0xff) - blue;
-                            currentError += tmp * tmp;
-                            if (currentError < smallestError) {
-                                pix = i;
-                                smallestError = currentError;
-                            }
-                        }
-                    }
-                }
-            }
-        } else if (alpha == 0 && transparent_index >= 0) {
-            // Special case - transparent color maps to the
-            // specified transparent pixel, if there is one
-
-            pix = transparent_index;
-        } else {
-            // IndexColorModel objects are all tagged as
-            // non-premultiplied so use non-premultiplied
-            // color components in the distance calculations.
-            // Look for closest match using a 4 component
-            // Euclidean distance formula.
-
-            int smallestError = Integer.MAX_VALUE;
-            int lut[] = this.rgb;
-            for (int i=0; i < map_size; i++) {
-                int lutrgb = lut[i];
-                if (lutrgb == rgb) {
-                    if (validBits != null && !validBits.testBit(i)) {
-                        continue;
-                    }
-                    pix = i;
-                    break;
-                }
-
-                int tmp = ((lutrgb >> 16) & 0xff) - red;
-                int currentError = tmp*tmp;
-                if (currentError < smallestError) {
-                    tmp = ((lutrgb >> 8) & 0xff) - green;
-                    currentError += tmp * tmp;
-                    if (currentError < smallestError) {
-                        tmp = (lutrgb & 0xff) - blue;
-                        currentError += tmp * tmp;
-                        if (currentError < smallestError) {
-                            tmp = (lutrgb >>> 24) - alpha;
-                            currentError += tmp * tmp;
-                            if (currentError < smallestError &&
-                                (validBits == null || validBits.testBit(i)))
-                            {
-                                pix = i;
-                                smallestError = currentError;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        System.arraycopy(lookupcache, 2, lookupcache, 0, CACHESIZE - 2);
-        lookupcache[CACHESIZE - 1] = rgb;
-        lookupcache[CACHESIZE - 2] = ~pix;
-        return installpixel(pixel, pix);
-    }
-
-    private Object installpixel(Object pixel, int pix) {
-        switch (transferType) {
-        case DataBuffer.TYPE_INT:
-            int[] intObj;
-            if (pixel == null) {
-                pixel = intObj = new int[1];
-            } else {
-                intObj = (int[]) pixel;
-            }
-            intObj[0] = pix;
-            break;
-        case DataBuffer.TYPE_BYTE:
-            byte[] byteObj;
-            if (pixel == null) {
-                pixel = byteObj = new byte[1];
-            } else {
-                byteObj = (byte[]) pixel;
-            }
-            byteObj[0] = (byte) pix;
-            break;
-        case DataBuffer.TYPE_USHORT:
-            short[] shortObj;
-            if (pixel == null) {
-                pixel = shortObj = new short[1];
-            } else {
-                shortObj = (short[]) pixel;
-            }
-            shortObj[0] = (short) pix;
-            break;
-        default:
-            throw new UnsupportedOperationException("This method has not been "+
-                             "implemented for transferType " + transferType);
-        }
-        return pixel;
-    }
-
-    /**
-     * Returns an array of unnormalized color/alpha components for a
-     * specified pixel in this <code>ColorModel</code>.  The pixel value
-     * is specified as an int.  If the <code>components</code> array is <code>null</code>,
-     * a new array is allocated that contains
-     * <code>offset + getNumComponents()</code> elements.
-     * The <code>components</code> array is returned,
-     * with the alpha component included
-     * only if <code>hasAlpha</code> returns true.
-     * Color/alpha components are stored in the <code>components</code> array starting
-     * at <code>offset</code> even if the array is allocated by this method.
-     * An <code>ArrayIndexOutOfBoundsException</code>
-     * is thrown if  the <code>components</code> array is not <code>null</code> and is
-     * not large enough to hold all the color and alpha components
-     * starting at <code>offset</code>.
-     * @param pixel the specified pixel
-     * @param components the array to receive the color and alpha
-     * components of the specified pixel
-     * @param offset the offset into the <code>components</code> array at
-     * which to start storing the color and alpha components
-     * @return an array containing the color and alpha components of the
-     * specified pixel starting at the specified offset.
-     * @see ColorModel#hasAlpha
-     * @see ColorModel#getNumComponents
-     */
-    public int[] getComponents(int pixel, int[] components, int offset) {
-        if (components == null) {
-            components = new int[offset+numComponents];
-        }
-
-        // REMIND: Needs to change if different color space
-        components[offset+0] = getRed(pixel);
-        components[offset+1] = getGreen(pixel);
-        components[offset+2] = getBlue(pixel);
-        if (supportsAlpha && (components.length-offset) > 3) {
-            components[offset+3] = getAlpha(pixel);
-        }
-
-        return components;
-    }
-
-    /**
-     * Returns an array of unnormalized color/alpha components for
-     * a specified pixel in this <code>ColorModel</code>.  The pixel
-     * value is specified by an array of data elements of type
-     * <code>transferType</code> passed in as an object reference.
-     * If <code>pixel</code> is not a primitive array of type
-     * <code>transferType</code>, a <code>ClassCastException</code>
-     * is thrown.  An <code>ArrayIndexOutOfBoundsException</code>
-     * is thrown if <code>pixel</code> is not large enough to hold
-     * a pixel value for this <code>ColorModel</code>.  If the
-     * <code>components</code> array is <code>null</code>, a new array
-     * is allocated that contains
-     * <code>offset + getNumComponents()</code> elements.
-     * The <code>components</code> array is returned,
-     * with the alpha component included
-     * only if <code>hasAlpha</code> returns true.
-     * Color/alpha components are stored in the <code>components</code>
-     * array starting at <code>offset</code> even if the array is
-     * allocated by this method.  An
-     * <code>ArrayIndexOutOfBoundsException</code> is also
-     * thrown if  the <code>components</code> array is not
-     * <code>null</code> and is not large enough to hold all the color
-     * and alpha components starting at <code>offset</code>.
-     * <p>
-     * Since <code>IndexColorModel</code> can be subclassed, subclasses
-     * inherit the implementation of this method and if they don't
-     * override it then they throw an exception if they use an
-     * unsupported <code>transferType</code>.
-     *
-     * @param pixel the specified pixel
-     * @param components an array that receives the color and alpha
-     * components of the specified pixel
-     * @param offset the index into the <code>components</code> array at
-     * which to begin storing the color and alpha components of the
-     * specified pixel
-     * @return an array containing the color and alpha components of the
-     * specified pixel starting at the specified offset.
-     * @throws ArrayIndexOutOfBoundsException if <code>pixel</code>
-     *            is not large enough to hold a pixel value for this
-     *            <code>ColorModel</code> or if the
-     *            <code>components</code> array is not <code>null</code>
-     *            and is not large enough to hold all the color
-     *            and alpha components starting at <code>offset</code>
-     * @throws ClassCastException if <code>pixel</code> is not a
-     *            primitive array of type <code>transferType</code>
-     * @throws UnsupportedOperationException if <code>transferType</code>
-     *         is not one of the supported transer types
-     * @see ColorModel#hasAlpha
-     * @see ColorModel#getNumComponents
-     */
-    public int[] getComponents(Object pixel, int[] components, int offset) {
-        int intpixel;
-        switch (transferType) {
-            case DataBuffer.TYPE_BYTE:
-               byte bdata[] = (byte[])pixel;
-               intpixel = bdata[0] & 0xff;
-            break;
-            case DataBuffer.TYPE_USHORT:
-               short sdata[] = (short[])pixel;
-               intpixel = sdata[0] & 0xffff;
-            break;
-            case DataBuffer.TYPE_INT:
-               int idata[] = (int[])pixel;
-               intpixel = idata[0];
-            break;
-            default:
-               throw new UnsupportedOperationException("This method has not been "+
-                   "implemented for transferType " + transferType);
-        }
-        return getComponents(intpixel, components, offset);
-    }
-
-    /**
-     * Returns a pixel value represented as an int in this
-     * <code>ColorModel</code> given an array of unnormalized
-     * color/alpha components.  An
-     * <code>ArrayIndexOutOfBoundsException</code>
-     * is thrown if the <code>components</code> array is not large
-     * enough to hold all of the color and alpha components starting
-     * at <code>offset</code>.  Since
-     * <code>ColorModel</code> can be subclassed, subclasses inherit the
-     * implementation of this method and if they don't override it then
-     * they throw an exception if they use an unsupported transferType.
-     * @param components an array of unnormalized color and alpha
-     * components
-     * @param offset the index into <code>components</code> at which to
-     * begin retrieving the color and alpha components
-     * @return an <code>int</code> pixel value in this
-     * <code>ColorModel</code> corresponding to the specified components.
-     * @throws ArrayIndexOutOfBoundsException if
-     *  the <code>components</code> array is not large enough to
-     *  hold all of the color and alpha components starting at
-     *  <code>offset</code>
-     * @throws UnsupportedOperationException if <code>transferType</code>
-     *         is invalid
-     */
-    public int getDataElement(int[] components, int offset) {
-        int rgb = (components[offset+0]<<16)
-            | (components[offset+1]<<8) | (components[offset+2]);
-        if (supportsAlpha) {
-            rgb |= (components[offset+3]<<24);
-        }
-        else {
-            rgb |= 0xff000000;
-        }
-        Object inData = getDataElements(rgb, null);
-        int pixel;
-        switch (transferType) {
-            case DataBuffer.TYPE_BYTE:
-               byte bdata[] = (byte[])inData;
-               pixel = bdata[0] & 0xff;
-            break;
-            case DataBuffer.TYPE_USHORT:
-               short sdata[] = (short[])inData;
-               pixel = sdata[0];
-            break;
-            case DataBuffer.TYPE_INT:
-               int idata[] = (int[])inData;
-               pixel = idata[0];
-            break;
-            default:
-               throw new UnsupportedOperationException("This method has not been "+
-                   "implemented for transferType " + transferType);
-        }
-        return pixel;
-    }
-
-    /**
-     * Returns a data element array representation of a pixel in this
-     * <code>ColorModel</code> given an array of unnormalized color/alpha
-     * components.  This array can then be passed to the
-     * <code>setDataElements</code> method of a <code>WritableRaster</code>
-     * object.  An <code>ArrayIndexOutOfBoundsException</code> is
-     * thrown if the
-     * <code>components</code> array is not large enough to hold all of the
-     * color and alpha components starting at <code>offset</code>.
-     * If the pixel variable is <code>null</code>, a new array
-     * is allocated.  If <code>pixel</code> is not <code>null</code>,
-     * it must be a primitive array of type <code>transferType</code>;
-     * otherwise, a <code>ClassCastException</code> is thrown.
-     * An <code>ArrayIndexOutOfBoundsException</code> is thrown if pixel
-     * is not large enough to hold a pixel value for this
-     * <code>ColorModel</code>.
-     * <p>
-     * Since <code>IndexColorModel</code> can be subclassed, subclasses
-     * inherit the implementation of this method and if they don't
-     * override it then they throw an exception if they use an
-     * unsupported <code>transferType</code>
-     *
-     * @param components an array of unnormalized color and alpha
-     * components
-     * @param offset the index into <code>components</code> at which to
-     * begin retrieving color and alpha components
-     * @param pixel the <code>Object</code> representing an array of color
-     * and alpha components
-     * @return an <code>Object</code> representing an array of color and
-     * alpha components.
-     * @throws ClassCastException if <code>pixel</code>
-     *  is not a primitive array of type <code>transferType</code>
-     * @throws ArrayIndexOutOfBoundsException if
-     *  <code>pixel</code> is not large enough to hold a pixel value
-     *  for this <code>ColorModel</code> or the <code>components</code>
-     *  array is not large enough to hold all of the color and alpha
-     *  components starting at <code>offset</code>
-     * @throws UnsupportedOperationException if <code>transferType</code>
-     *         is not one of the supported transer types
-     * @see WritableRaster#setDataElements
-     * @see SampleModel#setDataElements
-     */
-    public Object getDataElements(int[] components, int offset, Object pixel) {
-        int rgb = (components[offset+0]<<16) | (components[offset+1]<<8)
-            | (components[offset+2]);
-        if (supportsAlpha) {
-            rgb |= (components[offset+3]<<24);
-        }
-        else {
-            rgb &= 0xff000000;
-        }
-        return getDataElements(rgb, pixel);
-    }
-
-    /**
-     * Creates a <code>WritableRaster</code> with the specified width
-     * and height that has a data layout (<code>SampleModel</code>)
-     * compatible with this <code>ColorModel</code>.  This method
-     * only works for color models with 16 or fewer bits per pixel.
-     * <p>
-     * Since <code>IndexColorModel</code> can be subclassed, any
-     * subclass that supports greater than 16 bits per pixel must
-     * override this method.
-     *
-     * @param w the width to apply to the new <code>WritableRaster</code>
-     * @param h the height to apply to the new <code>WritableRaster</code>
-     * @return a <code>WritableRaster</code> object with the specified
-     * width and height.
-     * @throws UnsupportedOperationException if the number of bits in a
-     *         pixel is greater than 16
-     * @see WritableRaster
-     * @see SampleModel
-     */
-    public WritableRaster createCompatibleWritableRaster(int w, int h) {
-        WritableRaster raster;
-
-        if (pixel_bits == 1 || pixel_bits == 2 || pixel_bits == 4) {
-            // TYPE_BINARY
-            raster = Raster.createPackedRaster(DataBuffer.TYPE_BYTE,
-                                               w, h, 1, pixel_bits, null);
-        }
-        else if (pixel_bits <= 8) {
-            raster = Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE,
-                                                  w,h,1,null);
-        }
-        else if (pixel_bits <= 16) {
-            raster = Raster.createInterleavedRaster(DataBuffer.TYPE_USHORT,
-                                                  w,h,1,null);
-        }
-        else {
-            throw new
-                UnsupportedOperationException("This method is not supported "+
-                                              " for pixel bits > 16.");
-        }
-        return raster;
-    }
-
-    /**
-      * Returns <code>true</code> if <code>raster</code> is compatible
-      * with this <code>ColorModel</code> or <code>false</code> if it
-      * is not compatible with this <code>ColorModel</code>.
-      * @param raster the {@link Raster} object to test for compatibility
-      * @return <code>true</code> if <code>raster</code> is compatible
-      * with this <code>ColorModel</code>; <code>false</code> otherwise.
-      *
-      */
-    public boolean isCompatibleRaster(Raster raster) {
-
-        int size = raster.getSampleModel().getSampleSize(0);
-        return ((raster.getTransferType() == transferType) &&
-                (raster.getNumBands() == 1) && ((1 << size) >= map_size));
-    }
-
-    /**
-     * Creates a <code>SampleModel</code> with the specified
-     * width and height that has a data layout compatible with
-     * this <code>ColorModel</code>.
-     * @param w the width to apply to the new <code>SampleModel</code>
-     * @param h the height to apply to the new <code>SampleModel</code>
-     * @return a <code>SampleModel</code> object with the specified
-     * width and height.
-     * @throws IllegalArgumentException if <code>w</code> or
-     *         <code>h</code> is not greater than 0
-     * @see SampleModel
-     */
-    public SampleModel createCompatibleSampleModel(int w, int h) {
-        int[] off = new int[1];
-        off[0] = 0;
-        if (pixel_bits == 1 || pixel_bits == 2 || pixel_bits == 4) {
-            return new MultiPixelPackedSampleModel(transferType, w, h,
-                                                   pixel_bits);
-        }
-        else {
-            return new ComponentSampleModel(transferType, w, h, 1, w,
-                                            off);
-        }
-    }
-
-    /**
-     * Checks if the specified <code>SampleModel</code> is compatible
-     * with this <code>ColorModel</code>.  If <code>sm</code> is
-     * <code>null</code>, this method returns <code>false</code>.
-     * @param sm the specified <code>SampleModel</code>,
-     *           or <code>null</code>
-     * @return <code>true</code> if the specified <code>SampleModel</code>
-     * is compatible with this <code>ColorModel</code>; <code>false</code>
-     * otherwise.
-     * @see SampleModel
-     */
-    public boolean isCompatibleSampleModel(SampleModel sm) {
-        // fix 4238629
-        if (! (sm instanceof ComponentSampleModel) &&
-            ! (sm instanceof MultiPixelPackedSampleModel)   ) {
-            return false;
-        }
-
-        // Transfer type must be the same
-        if (sm.getTransferType() != transferType) {
-            return false;
-        }
-
-        if (sm.getNumBands() != 1) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns a new <code>BufferedImage</code> of TYPE_INT_ARGB or
-     * TYPE_INT_RGB that has a <code>Raster</code> with pixel data
-     * computed by expanding the indices in the source <code>Raster</code>
-     * using the color/alpha component arrays of this <code>ColorModel</code>.
-     * Only the lower <em>n</em> bits of each index value in the source
-     * <code>Raster</code>, as specified in the
-     * <a href="#index_values">class description</a> above, are used to
-     * compute the color/alpha values in the returned image.
-     * If <code>forceARGB</code> is <code>true</code>, a TYPE_INT_ARGB image is
-     * returned regardless of whether or not this <code>ColorModel</code>
-     * has an alpha component array or a transparent pixel.
-     * @param raster the specified <code>Raster</code>
-     * @param forceARGB if <code>true</code>, the returned
-     *     <code>BufferedImage</code> is TYPE_INT_ARGB; otherwise it is
-     *     TYPE_INT_RGB
-     * @return a <code>BufferedImage</code> created with the specified
-     *     <code>Raster</code>
-     * @throws IllegalArgumentException if the raster argument is not
-     *           compatible with this IndexColorModel
-     */
-    public BufferedImage convertToIntDiscrete(Raster raster,
-                                              boolean forceARGB) {
-        ColorModel cm;
-
-        if (!isCompatibleRaster(raster)) {
-            throw new IllegalArgumentException("This raster is not compatible" +
-                 "with this IndexColorModel.");
-        }
-        if (forceARGB || transparency == TRANSLUCENT) {
-            cm = ColorModel.getRGBdefault();
-        }
-        else if (transparency == BITMASK) {
-            cm = new DirectColorModel(25, 0xff0000, 0x00ff00, 0x0000ff,
-                                      0x1000000);
-        }
-        else {
-            cm = new DirectColorModel(24, 0xff0000, 0x00ff00, 0x0000ff);
-        }
-
-        int w = raster.getWidth();
-        int h = raster.getHeight();
-        WritableRaster discreteRaster =
-                  cm.createCompatibleWritableRaster(w, h);
-        Object obj = null;
-        int[] data = null;
-
-        int rX = raster.getMinX();
-        int rY = raster.getMinY();
-
-        for (int y=0; y < h; y++, rY++) {
-            obj = raster.getDataElements(rX, rY, w, 1, obj);
-            if (obj instanceof int[]) {
-                data = (int[])obj;
-            } else {
-                data = DataBuffer.toIntArray(obj);
-            }
-            for (int x=0; x < w; x++) {
-                data[x] = rgb[data[x] & pixel_mask];
-            }
-            discreteRaster.setDataElements(0, y, w, 1, data);
-        }
-
-        return new BufferedImage(cm, discreteRaster, false, null);
-    }
-
-    /**
-     * Returns whether or not the pixel is valid.
-     * @param pixel the specified pixel value
-     * @return <code>true</code> if <code>pixel</code>
-     * is valid; <code>false</code> otherwise.
-     * @since 1.3
-     */
-    public boolean isValid(int pixel) {
-        return ((pixel >= 0 && pixel < map_size) &&
-                (validBits == null || validBits.testBit(pixel)));
-    }
-
-    /**
-     * Returns whether or not all of the pixels are valid.
-     * @return <code>true</code> if all pixels are valid;
-     * <code>false</code> otherwise.
-     * @since 1.3
-     */
-    public boolean isValid() {
-        return (validBits == null);
-    }
-
-    /**
-     * Returns a <code>BigInteger</code> that indicates the valid/invalid
-     * pixels in the colormap.  A bit is valid if the
-     * <code>BigInteger</code> value at that index is set, and is invalid
-     * if the <code>BigInteger</code> value at that index is not set.
-     * The only valid ranges to query in the <code>BigInteger</code> are
-     * between 0 and the map size.
-     * @return a <code>BigInteger</code> indicating the valid/invalid pixels.
-     * @since 1.3
-     */
-    public BigInteger getValidPixels() {
-        if (validBits == null) {
-            return getAllValid();
-        }
-        else {
-            return validBits;
-        }
-    }
-
-    /**
-     * Disposes of system resources associated with this
-     * <code>ColorModel</code> once this <code>ColorModel</code> is no
-     * longer referenced.
-     */
-    public void finalize() {
-    }
-
-    /**
-     * Returns the <code>String</code> representation of the contents of
-     * this <code>ColorModel</code>object.
-     * @return a <code>String</code> representing the contents of this
-     * <code>ColorModel</code> object.
-     */
-    public String toString() {
-       return new String("IndexColorModel: #pixelBits = "+pixel_bits
-                         + " numComponents = "+numComponents
-                         + " color space = "+colorSpace
-                         + " transparency = "+transparency
-                         + " transIndex   = "+transparent_index
-                         + " has alpha = "+supportsAlpha
-                         + " isAlphaPre = "+isAlphaPremultiplied
-                         );
-    }
-}
diff --git a/openjdk/java/awt/image/LookupOp.java b/openjdk/java/awt/image/LookupOp.java
deleted file mode 100644
index 5b0cf783..00000000
--- a/openjdk/java/awt/image/LookupOp.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/* LookupOp.java -- Filter that converts each pixel using a lookup table.
-   Copyright (C) 2004  Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-
-package java.awt.image;
-
-import java.awt.RenderingHints;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-
-/**
- * LookupOp is a filter that converts each pixel using a lookup table.
- * 
- * For filtering Rasters, the lookup table must have either one component
- * that is applied to all bands, or one component for every band in the
- * Rasters.
- * 
- * For BufferedImages, the lookup table may apply to both color and alpha
- * components.  If the lookup table contains one component, or if there are
- * the same number of components as color components in the source, the table
- * applies to all color components.  Otherwise the table applies to all
- * components including alpha.  Alpha premultiplication is ignored during the
- * lookup filtering.
- * 
- * After filtering, if color conversion is necessary, the conversion happens,
- * taking alpha premultiplication into account.
- * 
- * @author jlquinn
- */
-public class LookupOp implements BufferedImageOp, RasterOp
-{
-  private LookupTable lut;
-  private RenderingHints hints;
-  
-  /**
-   * Construct a new LookupOp using the given LookupTable.
-   * 
-   * @param lookup LookupTable to use.
-   * @param hints Rendering hints (can be null).
-   */
-  public LookupOp(LookupTable lookup, RenderingHints hints)
-  {
-    lut = lookup;
-    this.hints = hints;
-  }
-  
-  /**
-   * Converts the source image using the lookup table specified in the
-   * constructor.  The resulting image is stored in the destination image if one
-   * is provided; otherwise a new BufferedImage is created and returned. 
-   * 
-   * The source image cannot use an IndexColorModel, and the destination image
-   * (if one is provided) must have the same size.
-   *
-   * @param src The source image.
-   * @param dst The destination image.
-   * @throws IllegalArgumentException if the rasters and/or color spaces are
-   *            incompatible.
-   * @throws ArrayIndexOutOfBoundsException if a pixel in the source is not
-   *    contained in the LookupTable.
-   * @return The convolved image.
-   */
-  public final BufferedImage filter(BufferedImage src, BufferedImage dst)
-  {
-    if (src.getColorModel() instanceof IndexColorModel)
-      throw new IllegalArgumentException("LookupOp.filter: IndexColorModel "
-					 + "not allowed");
-    
-    if (lut.getNumComponents() != 1
-         && lut.getNumComponents() != src.getColorModel().getNumComponents()
-         && lut.getNumComponents() != src.getColorModel().getNumColorComponents())
-     throw new IllegalArgumentException("LookupOp.filter: Incompatible " +
-                "lookup table and source image");
-    
-    if (dst == null)
-      dst = createCompatibleDestImage(src, null);
-    
-    else if (src.getHeight() != dst.getHeight() || src.getWidth() != dst.getWidth())
-      throw new IllegalArgumentException("Source and destination images are " +
-                "different sizes.");
-
-    // Set up for potential colormodel mismatch
-    BufferedImage tgt;
-    if (dst.getColorModel().equals(src.getColorModel()))
-      tgt = dst;
-    else
-      tgt = createCompatibleDestImage(src, src.getColorModel());
-
-    Raster sr = src.getRaster();
-    WritableRaster dr = tgt.getRaster();
-
-    if (src.getColorModel().hasAlpha() &&
-        (lut.getNumComponents() == 1 ||
-         lut.getNumComponents() == src.getColorModel().getNumColorComponents()))
-    {
-      // Need to ignore alpha for lookup
-      int[] dbuf = new int[src.getColorModel().getNumComponents()];
-      int tmpBands = src.getColorModel().getNumColorComponents();
-      int[] tmp = new int[tmpBands];
-        
-      // Filter the pixels
-      for (int y = src.getMinY(); y < src.getHeight() + src.getMinY(); y++)
-        for (int x = src.getMinX(); x < src.getWidth() + src.getMinX(); x++)
-        {	
-          // Filter only color components, but also copy alpha
-          sr.getPixel(x, y, dbuf);
-          System.arraycopy(dbuf, 0, tmp, 0, tmpBands);
-          dr.setPixel(x, y, lut.lookupPixel(tmp, dbuf));
-          
-          /* The reference implementation does not use LookupTable.lookupPixel,
-           * but rather it seems to copy the table into a native array.  The
-           * effect of this (a probable bug in their implementation) is that
-           * an out-of-bounds lookup on a ByteLookupTable will *not* throw an
-           * out of bounds exception, but will instead return random garbage.
-           * A bad lookup on a ShortLookupTable, however, will throw an
-           * exception.
-           * 
-           * Instead of mimicing this behaviour, we always throw an
-           * ArrayOutofBoundsException by virtue of using
-           * LookupTable.lookupPixle.
-           */
-        }
-    }
-    else
-    {
-      // No alpha to ignore
-      int[] dbuf = new int[src.getColorModel().getNumComponents()];
-          
-      // Filter the pixels
-      for (int y = src.getMinY(); y < src.getHeight() + src.getMinY(); y++)
-        for (int x = src.getMinX(); x < src.getWidth() + src.getMinX(); x++)
-          dr.setPixel(x, y, lut.lookupPixel(sr.getPixel(x, y, dbuf), dbuf));
-    }
-    
-    if (tgt != dst)
-      new ColorConvertOp(hints).filter(tgt, dst);
-    
-    return dst;
-  }
-
-  /* (non-Javadoc)
-   * @see java.awt.image.BufferedImageOp#getBounds2D(java.awt.image.BufferedImage)
-   */
-  public final Rectangle2D getBounds2D(BufferedImage src)
-  {
-    return src.getRaster().getBounds();
-  }
-
-  /* (non-Javadoc)
-   * @see java.awt.image.BufferedImageOp#createCompatibleDestImage(java.awt.image.BufferedImage, java.awt.image.ColorModel)
-   */
-  public BufferedImage createCompatibleDestImage(BufferedImage src,
-						 ColorModel dstCM)
-  {
-    if (dstCM != null)
-      return new BufferedImage(dstCM,
-                               src.getRaster().createCompatibleWritableRaster(),
-                               src.isAlphaPremultiplied(), null);
-    
-    // This is a strange exception, done for compatibility with the reference
-    // (as demonstrated by a mauve testcase)
-    int imgType = src.getType();
-    if (imgType == BufferedImage.TYPE_USHORT_GRAY)
-      imgType = BufferedImage.TYPE_BYTE_GRAY;
-
-    return new BufferedImage(src.getWidth(), src.getHeight(), imgType);
-  }
-
-  /**
-   * Returns the corresponding destination point for a given source point.
-   * 
-   * This Op will return the source point unchanged.
-   * 
-   * @param src The source point.
-   * @param dst The destination point.
-   */
-  public final Point2D getPoint2D(Point2D src, Point2D dst)
-  {
-    if (dst == null)
-      return (Point2D) src.clone();
-
-    dst.setLocation(src);
-    return dst;
-  }
-
-  /**
-   * Return the LookupTable for this op.
-   * 
-   *  @return The lookup table.
-   */
-  public final LookupTable getTable()
-  {
-    return lut;
-  }
-
-  /* (non-Javadoc)
-   * @see java.awt.image.RasterOp#getRenderingHints()
-   */
-  public final RenderingHints getRenderingHints()
-  {
-    return hints;
-  }
-
-  /**
-   * Filter a raster through a lookup table.
-   * 
-   * Applies the lookup table for this Rasterop to each pixel of src and
-   * puts the results in dest.  If dest is null, a new Raster is created and
-   * returned.
-   * 
-   * @param src The source raster.
-   * @param dest The destination raster.
-   * @return The WritableRaster with the filtered pixels.
-   * @throws IllegalArgumentException if lookup table has more than one
-   *    component but not the same as src and dest.
-   * @throws ArrayIndexOutOfBoundsException if a pixel in the source is not
-   *    contained in the LookupTable.
-   */
-  public final WritableRaster filter(Raster src, WritableRaster dest)
-  {
-    if (dest == null) 
-      // Allocate a raster if needed
-      dest = createCompatibleDestRaster(src);
-    else
-      if (src.getNumBands() != dest.getNumBands())
-        throw new IllegalArgumentException("Source and destination rasters " +
-                "are incompatible.");
-
-    if (lut.getNumComponents() != 1 
-        && lut.getNumComponents() != src.getNumBands())
-      throw new IllegalArgumentException("Lookup table is incompatible with " +
-            "this raster.");
-   
-    // Allocate pixel storage. 
-    int[] tmp = new int[src.getNumBands()];
-    
-    // Filter the pixels
-    for (int y = src.getMinY(); y < src.getHeight() + src.getMinY(); y++)
-      for (int x = src.getMinX(); x < src.getWidth() + src.getMinX(); x++)
-        dest.setPixel(x, y, lut.lookupPixel(src.getPixel(x, y, tmp), tmp));
-    
-    /* The reference implementation does not use LookupTable.lookupPixel,
-     * but rather it seems to copy the table into a native array.  The
-     * effect of this (a probable bug in their implementation) is that
-     * an out-of-bounds lookup on a ByteLookupTable will *not* throw an
-     * out of bounds exception, but will instead return random garbage.
-     * A bad lookup on a ShortLookupTable, however, will throw an
-     * exception.
-     * 
-     * Instead of mimicing this behaviour, we always throw an
-     * ArrayOutofBoundsException by virtue of using
-     * LookupTable.lookupPixle.
-     */
-    return dest;
-  }
-
-  /* (non-Javadoc)
-   * @see java.awt.image.RasterOp#getBounds2D(java.awt.image.Raster)
-   */
-  public final Rectangle2D getBounds2D(Raster src)
-  {
-    return src.getBounds();
-  }
-
-  /* (non-Javadoc)
-   * @see java.awt.image.RasterOp#createCompatibleDestRaster(java.awt.image.Raster)
-   */
-  public WritableRaster createCompatibleDestRaster(Raster src)
-  {
-    return src.createCompatibleWritableRaster();
-  }
-
-}
diff --git a/openjdk/java/awt/image/RescaleOp.java b/openjdk/java/awt/image/RescaleOp.java
deleted file mode 100644
index d56b12cb..00000000
--- a/openjdk/java/awt/image/RescaleOp.java
+++ /dev/null
@@ -1,385 +0,0 @@
-/* Copyright (C) 2004, 2006  Free Software Foundation
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-
-package java.awt.image;
-
-import java.awt.RenderingHints;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.util.Arrays;
-
-/**
- * RescaleOp is a filter that changes each pixel by a scaling factor and offset.
- * 
- * For filtering Rasters, either one scaling factor and offset can be specified,
- * which will be applied to all bands; or a scaling factor and offset can be
- * specified for each band.
- * 
- * For BufferedImages, the scaling may apply to both color and alpha components.
- * If only one scaling factor is provided, or if the number of factors provided
- * equals the number of color components, the scaling is performed on all color
- * components.  Otherwise, the scaling is performed on all components including
- * alpha.  Alpha premultiplication is ignored.
- * 
- * After filtering, if color conversion is necessary, the conversion happens,
- * taking alpha premultiplication into account.
- * 
- * @author Jerry Quinn (jlquinn@optonline.net)
- * @author Francis Kung (fkung@redhat.com)
- */
-public class RescaleOp implements BufferedImageOp, RasterOp
-{
-  private float[] scale;
-  private float[] offsets;
-  private RenderingHints hints = null;
-  
-  /**
-   * Create a new RescaleOp object using the given scale factors and offsets.
-   * 
-   * The length of the arrays must be equal to the number of bands (or number of
-   * data or color components) of the raster/image that this Op will be used on,
-   * otherwise an IllegalArgumentException will be thrown when calling the
-   * filter method.
-   *  
-   * @param scaleFactors an array of scale factors.
-   * @param offsets an array of offsets.
-   * @param hints any rendering hints to use (can be null).
-   * @throws NullPointerException if the scaleFactors or offsets array is null.
-   */
-  public RescaleOp(float[] scaleFactors,
-		   float[] offsets,
-		   RenderingHints hints)
-  {
-    int length = Math.min(scaleFactors.length, offsets.length);
-    
-    scale = new float[length];
-    System.arraycopy(scaleFactors, 0, this.scale, 0, length);
-    
-    this.offsets = new float[length];
-    System.arraycopy(offsets, 0, this.offsets, 0, length);
-    
-    this.hints = hints;
-  }
-  
-  /**
-   * Create a new RescaleOp object using the given scale factor and offset.
-   * 
-   * The same scale factor and offset will be used on all bands/components.
-   *  
-   * @param scaleFactor the scale factor to use.
-   * @param offset the offset to use.
-   * @param hints any rendering hints to use (can be null).
-   */
-  public RescaleOp(float scaleFactor,
-		   float offset,
-		   RenderingHints hints)
-  {
-    scale = new float[]{ scaleFactor };
-    offsets = new float[]{offset};
-    this.hints = hints;
-  }
-
-  /**
-   * Returns the scaling factors.  This method accepts an optional array, which
-   * will be used to store the factors if not null (this avoids allocating a 
-   * new array).  If this array is too small to hold all the scaling factors,
-   * the array will be filled and the remaining factors discarded.
-   * 
-   * @param scaleFactors array to store the scaling factors in (can be null).
-   * @return an array of scaling factors.
-   */
-  public final float[] getScaleFactors(float[] scaleFactors)
-  {
-    if (scaleFactors == null)
-      scaleFactors = new float[scale.length];
-    System.arraycopy(scale, 0, scaleFactors, 0, Math.min(scale.length,
-                                                         scaleFactors.length));
-    return scaleFactors;
-  }
-
-  /**
-   * Returns the offsets.  This method accepts an optional array, which
-   * will be used to store the offsets if not null (this avoids allocating a 
-   * new array).  If this array is too small to hold all the offsets, the array 
-   * will be filled and the remaining factors discarded.
-   * 
-   * @param offsets array to store the offsets in (can be null).
-   * @return an array of offsets.
-   */
-  public final float[] getOffsets(float[] offsets)
-  {
-    if (offsets == null)
-      offsets = new float[this.offsets.length];
-    System.arraycopy(this.offsets, 0, offsets, 0, Math.min(this.offsets.length,
-                                                           offsets.length));
-    return offsets;
-  }
-
-  /**
-   * Returns the number of scaling factors / offsets.
-   * 
-   * @return the number of scaling factors / offsets.
-   */
-  public final int getNumFactors()
-  {
-    return scale.length;
-  }
-
-  /* (non-Javadoc)
-   * @see java.awt.image.BufferedImageOp#getRenderingHints()
-   */
-  public final RenderingHints getRenderingHints()
-  {
-    return hints;
-  }
-
-  /**
-   * Converts the source image using the scale factors and offsets specified in 
-   * the constructor.  The resulting image is stored in the destination image if 
-   * one is provided; otherwise a new BufferedImage is created and returned. 
-   * 
-   * The source image cannot use an IndexColorModel, and the destination image
-   * (if one is provided) must have the same size.
-   * 
-   * If the final value of a sample is beyond the range of the color model, it
-   * will be clipped to the appropriate maximum / minimum.
-   *
-   * @param src The source image.
-   * @param dst The destination image.
-   * @throws IllegalArgumentException if the rasters and/or color spaces are
-   *            incompatible.
-   * @return The rescaled image.
-   */
-  public final BufferedImage filter(BufferedImage src, BufferedImage dst)
-  {
-    // Initial checks
-    if (scale.length != 1
-        && scale.length != src.getColorModel().getNumComponents()
-        && (scale.length != src.getColorModel().getNumColorComponents()))
-      throw new IllegalArgumentException("Source image has wrong number of "
-                                         + "bands for these scaling factors.");
-
-    if (dst == null)
-      dst = createCompatibleDestImage(src, null);
-    else if (src.getHeight() != dst.getHeight()
-             || src.getWidth() != dst.getWidth())
-      throw new IllegalArgumentException("Source and destination images are "
-                                         + "different sizes.");
-
-    // Prepare for possible colorspace conversion
-    BufferedImage dst2 = dst;
-    if (dst.getColorModel().getColorSpace().getType() != src.getColorModel().getColorSpace().getType())
-      dst2 = createCompatibleDestImage(src, src.getColorModel());
-
-    // Figure out how many bands to scale
-    int numBands = scale.length;
-    if (scale.length == 1)
-      numBands = src.getColorModel().getNumColorComponents();
-    boolean[] bands = new boolean[numBands];
-    // this assumes the alpha, if present, is the last band
-    Arrays.fill(bands, true);
-
-    // Perform rescaling
-    filter(src.getRaster(), dst2.getRaster(), bands);
-
-    // Copy alpha band if needed (ie if it exists and wasn't scaled)
-    // NOTE: This assumes the alpha component is the last band!
-    if (src.getColorModel().hasAlpha()
-        && numBands == src.getColorModel().getNumColorComponents())
-      {
-
-        dst2.getRaster().setSamples(0, 0, src.getWidth(), src.getHeight(),
-                                    numBands,
-                                    src.getRaster().getSamples(0, 0,
-                                                               src.getWidth(),
-                                                               src.getHeight(),
-                                                               numBands,
-                                                               (int[]) null));
-      }
-
-    // Perform colorspace conversion if needed
-    if (dst != dst2)
-      new ColorConvertOp(hints).filter(dst2, dst);
-
-    return dst;
-  }
-
-  /* (non-Javadoc)
-   * @see java.awt.image.RasterOp#filter(java.awt.image.Raster, java.awt.image.WritableRaster)
-   */
-  public final WritableRaster filter(Raster src, WritableRaster dest)
-  {
-    // Required sanity checks
-    if (scale.length != 1 && scale.length != src.numBands)
-      throw new IllegalArgumentException("Number of rasters is incompatible "
-                                             + "with the number of scaling "
-                                             + "factors provided.");
-
-    if (dest == null)
-      dest = src.createCompatibleWritableRaster();
-    else if (src.getHeight() != dest.getHeight()
-             || src.getWidth() != dest.getWidth())
-      throw new IllegalArgumentException("Source and destination rasters are "
-                                         + "different sizes.");
-    else if (src.numBands != dest.numBands)
-      throw new IllegalArgumentException("Source and destination rasters "
-                                         + "are incompatible.");
-
-    // Filter all bands
-    boolean[] bands = new boolean[src.getNumBands()];
-    Arrays.fill(bands, true);
-    return filter(src, dest, bands);
-  }
-  
-  /**
-   * Perform raster-based filtering on a selected number of bands.
-   * 
-   * The length of the bands array should equal the number of bands; a true
-   * element indicates filtering should happen on the corresponding band, while
-   * a false element will skip the band.
-   * 
-   * The rasters are assumed to be compatible and non-null.
-   * 
-   * @param src the source raster.
-   * @param dest the destination raster.
-   * @param bands an array indicating which bands to filter.
-   * @throws NullPointerException if any parameter is null.
-   * @throws ArrayIndexOutOfBoundsException if the bands array is too small.
-   * @return the destination raster.
-   */
-  private WritableRaster filter(Raster src, WritableRaster dest, boolean[] bands)
-  {
-    int[] values = new int[src.getHeight() * src.getWidth()];
-    float scaleFactor, offset;
-    
-    // Find max sample value, to be used for clipping later
-    int[] maxValue = src.getSampleModel().getSampleSize();
-    for (int i = 0; i < maxValue.length; i++)
-      maxValue[i] = (int)Math.pow(2, maxValue[i]) - 1;
-    
-    // TODO: can this be optimized further?
-    // Filter all samples of all requested bands
-    for (int band = 0; band < bands.length; band++)
-      if (bands[band])
-        {
-          values = src.getSamples(src.getMinX(), src.getMinY(), src.getWidth(),
-                                  src.getHeight(), band, values);
-
-          if (scale.length == 1)
-            {
-              scaleFactor = scale[0];
-              offset = offsets[0];
-            }
-          else
-            {
-              scaleFactor = scale[band];
-              offset = offsets[band];
-            }
-
-          for (int i = 0; i < values.length; i++)
-            {
-              values[i] = (int) (values[i] * scaleFactor + offset);
-
-              // Clip if needed
-              if (values[i] < 0)
-                values[i] = 0;
-              if (values[i] > maxValue[band])
-                values[i] = maxValue[band];
-            }
-
-          dest.setSamples(dest.getMinX(), dest.getMinY(), dest.getWidth(),
-                          dest.getHeight(), band, values);
-        }
-    
-    return dest;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see java.awt.image.BufferedImageOp#createCompatibleDestImage(java.awt.image.BufferedImage,
-   *      java.awt.image.ColorModel)
-   */
-  public BufferedImage createCompatibleDestImage(BufferedImage src,
-						 ColorModel dstCM)
-  {
-    if (dstCM == null)
-      return new BufferedImage(src.getWidth(), src.getHeight(), src.getType());
-    
-    return new BufferedImage(dstCM,
-                             src.getRaster().createCompatibleWritableRaster(),
-                             src.isAlphaPremultiplied(), null);
-  }
-
-  /* (non-Javadoc)
-   * @see java.awt.image.RasterOp#createCompatibleDestRaster(java.awt.image.Raster)
-   */
-  public WritableRaster createCompatibleDestRaster(Raster src)
-  {
-    return src.createCompatibleWritableRaster();
-  }
-  
-  /* (non-Javadoc)
-   * @see java.awt.image.BufferedImageOp#getBounds2D(java.awt.image.BufferedImage)
-   */
-  public final Rectangle2D getBounds2D(BufferedImage src)
-  {
-    return src.getRaster().getBounds();
-  }
-
-  /* (non-Javadoc)
-   * @see java.awt.image.RasterOp#getBounds2D(java.awt.image.Raster)
-   */
-  public final Rectangle2D getBounds2D(Raster src)
-  {
-    return src.getBounds();
-  }
-
-  /* (non-Javadoc)
-   * @see java.awt.image.BufferedImageOp#getPoint2D(java.awt.geom.Point2D, java.awt.geom.Point2D)
-   */
-  public final Point2D getPoint2D(Point2D src, Point2D dst)
-  {
-    if (dst == null)
-      dst = (Point2D) src.clone();
-    else
-      dst.setLocation(src);
-    
-    return dst;
-  }
-
-}
diff --git a/openjdk/java/io/FileDescriptor.java b/openjdk/java/io/FileDescriptor.java
deleted file mode 100644
index af970b4c..00000000
--- a/openjdk/java/io/FileDescriptor.java
+++ /dev/null
@@ -1,731 +0,0 @@
-/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-import cli.System.IO.FileAccess;
-import cli.System.IO.FileMode;
-import cli.System.IO.FileShare;
-import cli.System.IO.FileStream;
-import cli.System.IO.SeekOrigin;
-import cli.System.Runtime.InteropServices.DllImportAttribute;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * Instances of the file descriptor class serve as an opaque handle
- * to the underlying machine-specific structure representing an
- * open file, an open socket, or another source or sink of bytes.
- * The main practical use for a file descriptor is to create a
- * {@link FileInputStream} or {@link FileOutputStream} to contain it.
- *
- * <p>Applications should not create their own file descriptors.
- *
- * @author  Pavani Diwanji
- * @since   JDK1.0
- */
-public final class FileDescriptor {
-
-    private volatile cli.System.IO.Stream stream;
-    private volatile cli.System.Net.Sockets.Socket socket;
-    private volatile boolean nonBlockingSocket;
-    private volatile cli.System.IAsyncResult asyncResult;
-
-    /**
-     * HACK
-     *   JRuby uses reflection to get at the handle (on Windows) and fd (on non-Windows)
-     *   fields to convert it into a native handle and query if it is a tty.
-     */
-    @ikvm.lang.Property(get = "get_handle")
-    private long handle;
-    
-    @ikvm.lang.Property(get = "get_fd")
-    private int fd;
-    
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    private long get_handle()
-    {
-        if (ikvm.internal.Util.WINDOWS)
-        {
-            if (stream instanceof cli.System.IO.FileStream)
-            {
-                cli.System.IO.FileStream fs = (cli.System.IO.FileStream)stream;
-                return fs.get_Handle().ToInt64();
-            }
-            else if (this == in)
-            {
-                return GetStdHandle(-10).ToInt64();
-            }
-            else if (this == out)
-            {
-                return GetStdHandle(-11).ToInt64();
-            }
-            else if (this == err)
-            {
-                return GetStdHandle(-12).ToInt64();
-            }
-        }
-        return -1;
-    }
-    
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    private int get_fd()
-    {
-        if (!ikvm.internal.Util.WINDOWS)
-        {
-            if (stream instanceof cli.System.IO.FileStream)
-            {
-                cli.System.IO.FileStream fs = (cli.System.IO.FileStream)stream;
-                return fs.get_Handle().ToInt32();
-            }
-            else if (this == in)
-            {
-                return 0;
-            }
-            else if (this == out)
-            {
-                return 1;
-            }
-            else if (this == err)
-            {
-                return 2;
-            }
-        }
-        return -1;
-    }
-    
-    @DllImportAttribute.Annotation("kernel32")
-    private static native cli.System.IntPtr GetStdHandle(int nStdHandle);
-
-    /**
-     * A use counter for tracking the FIS/FOS/RAF instances that
-     * use this FileDescriptor. The FIS/FOS.finalize() will not release
-     * the FileDescriptor if it is still under use by any stream.
-     */
-    private AtomicInteger useCount;
-
-
-    /**
-     * Constructs an (invalid) FileDescriptor
-     * object.
-     */
-    public /**/ FileDescriptor() {
-        useCount = new AtomicInteger();
-    }
-
-    /**
-     * A handle to the standard input stream. Usually, this file
-     * descriptor is not used directly, but rather via the input stream
-     * known as {@code System.in}.
-     *
-     * @see     java.lang.System#in
-     */
-    public static final FileDescriptor in = standardStream(0);
-
-    /**
-     * A handle to the standard output stream. Usually, this file
-     * descriptor is not used directly, but rather via the output stream
-     * known as {@code System.out}.
-     * @see     java.lang.System#out
-     */
-    public static final FileDescriptor out = standardStream(1);
-
-    /**
-     * A handle to the standard error stream. Usually, this file
-     * descriptor is not used directly, but rather via the output stream
-     * known as {@code System.err}.
-     *
-     * @see     java.lang.System#err
-     */
-    public static final FileDescriptor err = standardStream(2);
-
-    /**
-     * Tests if this file descriptor object is valid.
-     *
-     * @return  {@code true} if the file descriptor object represents a
-     *          valid, open file, socket, or other active I/O connection;
-     *          {@code false} otherwise.
-     */
-    public boolean valid() {
-        return stream != null || socket != null;
-    }
-
-    /**
-     * Force all system buffers to synchronize with the underlying
-     * device.  This method returns after all modified data and
-     * attributes of this FileDescriptor have been written to the
-     * relevant device(s).  In particular, if this FileDescriptor
-     * refers to a physical storage medium, such as a file in a file
-     * system, sync will not return until all in-memory modified copies
-     * of buffers associated with this FileDesecriptor have been
-     * written to the physical medium.
-     *
-     * sync is meant to be used by code that requires physical
-     * storage (such as a file) to be in a known state  For
-     * example, a class that provided a simple transaction facility
-     * might use sync to ensure that all changes to a file caused
-     * by a given transaction were recorded on a storage medium.
-     *
-     * sync only affects buffers downstream of this FileDescriptor.  If
-     * any in-memory buffering is being done by the application (for
-     * example, by a BufferedOutputStream object), those buffers must
-     * be flushed into the FileDescriptor (for example, by invoking
-     * OutputStream.flush) before that data will be affected by sync.
-     *
-     * @exception SyncFailedException
-     *        Thrown when the buffers cannot be flushed,
-     *        or because the system cannot guarantee that all the
-     *        buffers have been synchronized with physical media.
-     * @since     JDK1.1
-     */
-    public void sync() throws SyncFailedException
-    {
-        if (stream == null)
-        {
-            throw new SyncFailedException("sync failed");
-        }
-
-        if (!stream.get_CanWrite())
-        {
-            return;
-        }
-
-        try
-        {
-            if (false) throw new cli.System.IO.IOException();
-            stream.Flush();
-        }
-        catch (cli.System.IO.IOException x)
-        {
-            throw new SyncFailedException(x.getMessage());
-        }
-
-        if (stream instanceof FileStream)
-        {
-            FileStream fs = (FileStream)stream;
-            boolean ok = ikvm.internal.Util.WINDOWS ? flushWin32(fs) : flushPosix(fs);
-            if (!ok)
-            {
-                throw new SyncFailedException("sync failed");
-            }
-        }
-    }
-
-    private static native boolean flushPosix(FileStream fs);
-
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    private static boolean flushWin32(FileStream fs)
-    {
-        return FlushFileBuffers(fs.get_SafeFileHandle()) != 0;
-    }
-
-    @DllImportAttribute.Annotation("kernel32")
-    private static native int FlushFileBuffers(cli.Microsoft.Win32.SafeHandles.SafeFileHandle handle);
-
-    private static FileDescriptor standardStream(int fd) {
-        FileDescriptor desc = new FileDescriptor();
-        try
-        {
-            desc.stream = getStandardStream(fd);
-        }
-        catch (cli.System.MissingMethodException _)
-        {
-            desc.stream = cli.System.IO.Stream.Null;
-        }
-        return desc;
-    }
-
-    private static cli.System.IO.Stream getStandardStream(int fd) throws cli.System.MissingMethodException
-    {
-        switch (fd)
-        {
-            case 0:
-                return cli.System.Console.OpenStandardInput();
-            case 1:
-                return cli.System.Console.OpenStandardOutput();
-            case 2:
-                return cli.System.Console.OpenStandardError();
-            default:
-                throw new Error();
-        }
-    }
-
-    // package private methods used by FIS, FOS and RAF.
-
-    int incrementAndGetUseCount() {
-        return useCount.incrementAndGet();
-    }
-
-    int decrementAndGetUseCount() {
-        return useCount.decrementAndGet();
-    }
-
-    void openReadOnly(String name) throws FileNotFoundException
-    {
-        open(name, FileMode.Open, FileAccess.Read);
-    }
-
-    void openWriteOnly(String name) throws FileNotFoundException
-    {
-        open(name, FileMode.Create, FileAccess.Write);
-    }
-
-    void openReadWrite(String name) throws FileNotFoundException
-    {
-        open(name, FileMode.OpenOrCreate, FileAccess.ReadWrite);
-    }
-
-    void openAppend(String name) throws FileNotFoundException
-    {
-        open(name, FileMode.Append, FileAccess.Write);
-    }
-
-    private static native cli.System.IO.Stream open(String name, FileMode fileMode, FileAccess fileAccess)
-        throws cli.System.IO.IOException,
-            cli.System.Security.SecurityException,
-            cli.System.UnauthorizedAccessException,
-            cli.System.ArgumentException,
-            cli.System.NotSupportedException;
-    
-    private void open(String name, int fileMode, int fileAccess) throws FileNotFoundException
-    {
-        try
-        {
-            stream = open(name, FileMode.wrap(fileMode), FileAccess.wrap(fileAccess));
-        }
-        catch (cli.System.Security.SecurityException x1)
-        {
-            throw new SecurityException(x1.getMessage());
-        }
-        catch (cli.System.IO.IOException x2)
-        {
-            throw new FileNotFoundException(x2.getMessage());
-        }
-        catch (cli.System.UnauthorizedAccessException x3)
-        {
-            // this is caused by "name" being a directory instead of a file
-            // or by name being a read-only file
-            throw new FileNotFoundException(name + " (Access is denied)");
-        }
-        catch (cli.System.ArgumentException x4)
-        {
-            throw new FileNotFoundException(x4.getMessage());
-        }
-        catch (cli.System.NotSupportedException x5)
-        {
-            throw new FileNotFoundException(x5.getMessage());
-        }
-    }
-
-    private void checkOpen() throws IOException
-    {
-        if (stream == null)
-        {
-            throw new IOException("Stream Closed");
-        }
-    }
-
-    int read() throws IOException
-    {
-        checkOpen();
-        try
-        {
-            if (false) throw new cli.System.NotSupportedException();
-            if (false) throw new cli.System.IO.IOException();
-            if (false) throw new cli.System.ObjectDisposedException(null);
-            return stream.ReadByte();
-        }
-        catch (cli.System.NotSupportedException x)
-        {
-            throw new IOException(x.getMessage());
-        }
-        catch (cli.System.IO.IOException x)
-        {
-            throw new IOException(x.getMessage());
-        }
-        catch (cli.System.ObjectDisposedException x)
-        {
-            throw new java.nio.channels.ClosedChannelException();
-        }
-    }
-
-    @ikvm.lang.Internal
-    public int readBytes(byte buf[], int offset, int len) throws IOException
-    {
-        // NOTE we start by dereferencing buf, to make sure you get a NullPointerException first if you pass a null reference.
-        int bufLen = buf.length;
-        if ((offset < 0) || (offset > bufLen) || (len < 0) || (len > (bufLen - offset)))
-        {
-            throw new IndexOutOfBoundsException();
-        }
-
-        if (len == 0)
-        {
-            return 0;
-        }
-
-        checkOpen();
-
-        try
-        {
-            if (false) throw new cli.System.NotSupportedException();
-            if (false) throw new cli.System.IO.IOException();
-            if (false) throw new cli.System.ObjectDisposedException(null);
-            int count = stream.Read(buf, offset, len);
-            if (count == 0)
-            {
-                count = -1;
-            }
-            return count;
-        }
-        catch (cli.System.NotSupportedException x)
-        {
-            throw new IOException(x.getMessage());
-        }
-        catch (cli.System.IO.IOException x)
-        {
-            throw new IOException(x.getMessage());
-        }
-        catch (cli.System.ObjectDisposedException x)
-        {
-            throw new java.nio.channels.ClosedChannelException();
-        }
-    }
-
-    long skip(long n) throws IOException
-    {
-        checkOpen();
-        if (!stream.get_CanSeek())
-        {
-            // in a somewhat bizar twist, for non-seekable streams the JDK throws an exception
-            throw new IOException("The handle is invalid");
-        }
-        try
-        {
-            if (false) throw new cli.System.IO.IOException();
-            if (false) throw new cli.System.NotSupportedException();
-            if (false) throw new cli.System.ObjectDisposedException(null);
-            long cur = stream.get_Position();
-            long end = stream.Seek(n, SeekOrigin.wrap(SeekOrigin.Current));
-            return end - cur;
-        }
-        catch (cli.System.IO.IOException x)
-        {
-            throw new IOException(x.getMessage());
-        }
-        catch (cli.System.NotSupportedException x1)
-        {
-            // this means we have a broken Stream, because if CanSeek returns true, it must
-            // support Length and Position
-            throw new IOException(x1);
-        }
-        catch (cli.System.ObjectDisposedException x)
-        {
-            throw new java.nio.channels.ClosedChannelException();
-        }
-    }
-
-    @ikvm.lang.Internal
-    public int available() throws IOException
-    {
-        checkOpen();
-        try
-        {
-            if (false) throw new cli.System.IO.IOException();
-            if (false) throw new cli.System.NotSupportedException();
-            if (false) throw new cli.System.ObjectDisposedException(null);
-            if (stream.get_CanSeek())
-            {
-                return (int)Math.min(Integer.MAX_VALUE, Math.max(0, stream.get_Length() - stream.get_Position()));
-            }
-            return 0;
-        }
-        catch (cli.System.IO.IOException x)
-        {
-            throw new IOException(x.getMessage());
-        }
-        catch (cli.System.NotSupportedException x1)
-        {
-            // this means we have a broken Stream, because if CanSeek returns true, it must
-            // support Length and Position
-            throw new IOException(x1);
-        }
-        catch (cli.System.ObjectDisposedException x)
-        {
-            throw new java.nio.channels.ClosedChannelException();
-        }
-    }
-
-    void write(int b) throws IOException
-    {
-        checkOpen();
-        try
-        {
-            if (false) throw new cli.System.NotSupportedException();
-            if (false) throw new cli.System.IO.IOException();
-            if (false) throw new cli.System.ObjectDisposedException(null);
-            stream.WriteByte((byte)b);
-            // NOTE FileStream buffers the output, so we have to flush explicitly
-            stream.Flush();
-        }
-        catch (cli.System.NotSupportedException x)
-        {
-            throw new IOException(x.getMessage());
-        }
-        catch (cli.System.IO.IOException x)
-        {
-            throw new IOException(x.getMessage());
-        }
-        catch (cli.System.ObjectDisposedException x)
-        {
-            throw new java.nio.channels.ClosedChannelException();
-        }
-    }
-
-    @ikvm.lang.Internal
-    public void writeBytes(byte buf[], int offset, int len) throws IOException
-    {
-        // NOTE we start by dereferencing buf, to make sure you get a NullPointerException first if you pass a null reference.
-        int bufLen = buf.length;
-        if ((offset < 0) || (offset > bufLen) || (len < 0) || (len > (bufLen - offset)))
-        {
-            throw new IndexOutOfBoundsException();
-        }
-
-        if (len == 0)
-        {
-            return;
-        }
-
-        checkOpen();
-
-        try
-        {
-            if (false) throw new cli.System.NotSupportedException();
-            if (false) throw new cli.System.IO.IOException();
-            if (false) throw new cli.System.ObjectDisposedException(null);
-            stream.Write(buf, offset, len);
-            // NOTE FileStream buffers the output, so we have to flush explicitly
-            stream.Flush();
-        }
-        catch (cli.System.NotSupportedException x)
-        {
-            throw new IOException(x.getMessage());
-        }
-        catch (cli.System.IO.IOException x)
-        {
-            throw new IOException(x.getMessage());
-        }
-        catch (cli.System.ObjectDisposedException x)
-        {
-            throw new java.nio.channels.ClosedChannelException();
-        }
-    }
-
-    @ikvm.lang.Internal
-    public long getFilePointer() throws IOException
-    {
-        checkOpen();
-        try
-        {
-            if (false) throw new cli.System.IO.IOException();
-            if (false) throw new cli.System.NotSupportedException();
-            if (false) throw new cli.System.ObjectDisposedException(null);
-            return stream.get_Position();
-        }
-        catch (cli.System.IO.IOException x)
-        {
-            throw new IOException(x.getMessage());
-        }
-        catch (cli.System.NotSupportedException x1)
-        {
-            throw new IOException(x1);
-        }
-        catch (cli.System.ObjectDisposedException x)
-        {
-            throw new java.nio.channels.ClosedChannelException();
-        }
-    }
-
-    @ikvm.lang.Internal
-    public void seek(long newPosition) throws IOException
-    {
-        checkOpen();
-        try
-        {
-            if (false) throw new cli.System.IO.IOException();
-            if (false) throw new cli.System.NotSupportedException();
-            if (false) throw new cli.System.ObjectDisposedException(null);
-            if (false) throw new cli.System.ArgumentOutOfRangeException();
-            stream.set_Position(newPosition);
-        }
-        catch (cli.System.IO.IOException x)
-        {
-            throw new IOException(x.getMessage());
-        }
-        catch (cli.System.NotSupportedException x1)
-        {
-            throw new IOException(x1);
-        }
-        catch (cli.System.ObjectDisposedException x)
-        {
-            throw new java.nio.channels.ClosedChannelException();
-        }
-        catch (cli.System.ArgumentOutOfRangeException _)
-        {
-            throw new IOException("Negative seek offset");
-        }
-    }
-
-    @ikvm.lang.Internal
-    public long length() throws IOException
-    {
-        checkOpen();
-        try
-        {
-            if (false) throw new cli.System.IO.IOException();
-            if (false) throw new cli.System.NotSupportedException();
-            if (false) throw new cli.System.ObjectDisposedException(null);
-            return stream.get_Length();
-        }
-        catch (cli.System.IO.IOException x)
-        {
-            throw new IOException(x.getMessage());
-        }
-        catch (cli.System.NotSupportedException x1)
-        {
-            throw new IOException(x1);
-        }
-        catch (cli.System.ObjectDisposedException x)
-        {
-            throw new java.nio.channels.ClosedChannelException();
-        }
-    }
-
-    @ikvm.lang.Internal
-    public void setLength(long newLength) throws IOException
-    {
-        checkOpen();
-        try
-        {
-            if (false) throw new cli.System.IO.IOException();
-            if (false) throw new cli.System.NotSupportedException();
-            if (false) throw new cli.System.ObjectDisposedException(null);
-            stream.SetLength(newLength);
-        }
-        catch (cli.System.IO.IOException x)
-        {
-            throw new IOException(x.getMessage());
-        }
-        catch (cli.System.NotSupportedException x1)
-        {
-            throw new IOException(x1);
-        }
-        catch (cli.System.ObjectDisposedException x)
-        {
-            throw new java.nio.channels.ClosedChannelException();
-        }
-    }
-
-    @ikvm.lang.Internal
-    public void close() throws IOException
-    {
-        cli.System.IO.Stream s = stream;
-        stream = null;
-        if (s != null)
-        {
-            s.Close();
-        }
-    }
-
-    @ikvm.lang.Internal
-    public cli.System.IO.Stream getStream()
-    {
-        return stream;
-    }
-
-    @ikvm.lang.Internal
-    public static FileDescriptor fromStream(cli.System.IO.Stream stream)
-    {
-        FileDescriptor desc = new FileDescriptor();
-        desc.stream = stream;
-        return desc;
-    }
-
-    @ikvm.lang.Internal
-    public cli.System.Net.Sockets.Socket getSocket()
-    {
-        return socket;
-    }
-
-    @ikvm.lang.Internal
-    public void setSocket(cli.System.Net.Sockets.Socket socket)
-    {
-        this.socket = socket;
-    }
-
-    @ikvm.lang.Internal
-    public void setSocketBlocking(boolean blocking) throws IOException
-    {
-        this.nonBlockingSocket = !blocking;
-        try
-        {
-            if (false) throw new cli.System.Net.Sockets.SocketException();
-            if (false) throw new cli.System.ObjectDisposedException("");
-            socket.set_Blocking(blocking);
-        }
-        catch (cli.System.Net.Sockets.SocketException x)
-        {
-            if (x.get_ErrorCode() == java.net.SocketUtil.WSAEINVAL)
-            {
-                // Work around for winsock issue. You can't set a socket to blocking if a connection request is pending,
-                // so we'll have to set the blocking again in SocketChannelImpl.checkConnect().
-                return;
-            }
-            throw java.net.SocketUtil.convertSocketExceptionToIOException(x);
-        }
-        catch (cli.System.ObjectDisposedException _)
-        {
-            throw new java.net.SocketException("Socket is closed");
-        }
-    }
-    
-    @ikvm.lang.Internal
-    public boolean isSocketBlocking()
-    {
-        return !nonBlockingSocket;
-    }
-
-    @ikvm.lang.Internal
-    public cli.System.IAsyncResult getAsyncResult()
-    {
-        return asyncResult;
-    }
-
-    @ikvm.lang.Internal
-    public void setAsyncResult(cli.System.IAsyncResult asyncResult)
-    {
-        this.asyncResult = asyncResult;
-    }
-}
diff --git a/openjdk/java/io/FileInputStream.java b/openjdk/java/io/FileInputStream.java
deleted file mode 100644
index 3547947f..00000000
--- a/openjdk/java/io/FileInputStream.java
+++ /dev/null
@@ -1,451 +0,0 @@
-/*
- * Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-import java.nio.channels.FileChannel;
-import sun.nio.ch.FileChannelImpl;
-import sun.misc.IoTrace;
-
-
-/**
- * A <code>FileInputStream</code> obtains input bytes
- * from a file in a file system. What files
- * are  available depends on the host environment.
- *
- * <p><code>FileInputStream</code> is meant for reading streams of raw bytes
- * such as image data. For reading streams of characters, consider using
- * <code>FileReader</code>.
- *
- * @author  Arthur van Hoff
- * @see     java.io.File
- * @see     java.io.FileDescriptor
- * @see     java.io.FileOutputStream
- * @see     java.nio.file.Files#newInputStream
- * @since   JDK1.0
- */
-public
-class FileInputStream extends InputStream
-{
-    /* File Descriptor - handle to the open file */
-    private final FileDescriptor fd;
-
-    /* The path of the referenced file (null if the stream is created with a file descriptor) */
-    private final String path;
-
-    private FileChannel channel = null;
-
-    private final Object closeLock = new Object();
-    private volatile boolean closed = false;
-
-    private static final ThreadLocal<Boolean> runningFinalize =
-        new ThreadLocal<>();
-
-    private static boolean isRunningFinalize() {
-        Boolean val;
-        if ((val = runningFinalize.get()) != null)
-            return val.booleanValue();
-        return false;
-    }
-
-    /**
-     * Creates a <code>FileInputStream</code> by
-     * opening a connection to an actual file,
-     * the file named by the path name <code>name</code>
-     * in the file system.  A new <code>FileDescriptor</code>
-     * object is created to represent this file
-     * connection.
-     * <p>
-     * First, if there is a security
-     * manager, its <code>checkRead</code> method
-     * is called with the <code>name</code> argument
-     * as its argument.
-     * <p>
-     * If the named file does not exist, is a directory rather than a regular
-     * file, or for some other reason cannot be opened for reading then a
-     * <code>FileNotFoundException</code> is thrown.
-     *
-     * @param      name   the system-dependent file name.
-     * @exception  FileNotFoundException  if the file does not exist,
-     *                   is a directory rather than a regular file,
-     *                   or for some other reason cannot be opened for
-     *                   reading.
-     * @exception  SecurityException      if a security manager exists and its
-     *               <code>checkRead</code> method denies read access
-     *               to the file.
-     * @see        java.lang.SecurityManager#checkRead(java.lang.String)
-     */
-    public FileInputStream(String name) throws FileNotFoundException {
-        this(name != null ? new File(name) : null);
-    }
-
-    /**
-     * Creates a <code>FileInputStream</code> by
-     * opening a connection to an actual file,
-     * the file named by the <code>File</code>
-     * object <code>file</code> in the file system.
-     * A new <code>FileDescriptor</code> object
-     * is created to represent this file connection.
-     * <p>
-     * First, if there is a security manager,
-     * its <code>checkRead</code> method  is called
-     * with the path represented by the <code>file</code>
-     * argument as its argument.
-     * <p>
-     * If the named file does not exist, is a directory rather than a regular
-     * file, or for some other reason cannot be opened for reading then a
-     * <code>FileNotFoundException</code> is thrown.
-     *
-     * @param      file   the file to be opened for reading.
-     * @exception  FileNotFoundException  if the file does not exist,
-     *                   is a directory rather than a regular file,
-     *                   or for some other reason cannot be opened for
-     *                   reading.
-     * @exception  SecurityException      if a security manager exists and its
-     *               <code>checkRead</code> method denies read access to the file.
-     * @see        java.io.File#getPath()
-     * @see        java.lang.SecurityManager#checkRead(java.lang.String)
-     */
-    public FileInputStream(File file) throws FileNotFoundException {
-        String name = (file != null ? file.getPath() : null);
-        SecurityManager security = System.getSecurityManager();
-        if (security != null) {
-            security.checkRead(name);
-        }
-        if (name == null) {
-            throw new NullPointerException();
-        }
-        /*
-        if (file.isInvalid()) {
-            throw new FileNotFoundException("Invalid file path");
-        }
-        */
-        fd = new FileDescriptor();
-        fd.incrementAndGetUseCount();
-        this.path = name;
-        open(name);
-    }
-
-    /**
-     * Creates a <code>FileInputStream</code> by using the file descriptor
-     * <code>fdObj</code>, which represents an existing connection to an
-     * actual file in the file system.
-     * <p>
-     * If there is a security manager, its <code>checkRead</code> method is
-     * called with the file descriptor <code>fdObj</code> as its argument to
-     * see if it's ok to read the file descriptor. If read access is denied
-     * to the file descriptor a <code>SecurityException</code> is thrown.
-     * <p>
-     * If <code>fdObj</code> is null then a <code>NullPointerException</code>
-     * is thrown.
-     * <p>
-     * This constructor does not throw an exception if <code>fdObj</code>
-     * is {@link java.io.FileDescriptor#valid() invalid}.
-     * However, if the methods are invoked on the resulting stream to attempt
-     * I/O on the stream, an <code>IOException</code> is thrown.
-     *
-     * @param      fdObj   the file descriptor to be opened for reading.
-     * @throws     SecurityException      if a security manager exists and its
-     *                 <code>checkRead</code> method denies read access to the
-     *                 file descriptor.
-     * @see        SecurityManager#checkRead(java.io.FileDescriptor)
-     */
-    public FileInputStream(FileDescriptor fdObj) {
-        SecurityManager security = System.getSecurityManager();
-        if (fdObj == null) {
-            throw new NullPointerException();
-        }
-        if (security != null) {
-            security.checkRead(fdObj);
-        }
-        fd = fdObj;
-        path = null;
-
-        /*
-         * FileDescriptor is being shared by streams.
-         * Ensure that it's GC'ed only when all the streams/channels are done
-         * using it.
-         */
-        fd.incrementAndGetUseCount();
-    }
-
-    /**
-     * Opens the specified file for reading.
-     * @param name the name of the file
-     */
-    private void open(String name) throws FileNotFoundException
-    {
-        fd.openReadOnly(name);
-    }
-
-    /**
-     * Reads a byte of data from this input stream. This method blocks
-     * if no input is yet available.
-     *
-     * @return     the next byte of data, or <code>-1</code> if the end of the
-     *             file is reached.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public int read() throws IOException {
-        Object traceContext = IoTrace.fileReadBegin(path);
-        int b = 0;
-        try {
-            b = fd.read();
-        } finally {
-            IoTrace.fileReadEnd(traceContext, b == -1 ? 0 : 1);
-        }
-        return b;
-    }
-
-    /**
-     * Reads a subarray as a sequence of bytes.
-     * @param b the data to be written
-     * @param off the start offset in the data
-     * @param len the number of bytes that are written
-     * @exception IOException If an I/O error has occurred.
-     */
-    private int readBytes(byte b[], int off, int len) throws IOException
-    {
-        return fd.readBytes(b, off, len);
-    }
-
-    /**
-     * Reads up to <code>b.length</code> bytes of data from this input
-     * stream into an array of bytes. This method blocks until some input
-     * is available.
-     *
-     * @param      b   the buffer into which the data is read.
-     * @return     the total number of bytes read into the buffer, or
-     *             <code>-1</code> if there is no more data because the end of
-     *             the file has been reached.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public int read(byte b[]) throws IOException {
-        Object traceContext = IoTrace.fileReadBegin(path);
-        int bytesRead = 0;
-        try {
-            bytesRead = readBytes(b, 0, b.length);
-        } finally {
-            IoTrace.fileReadEnd(traceContext, bytesRead == -1 ? 0 : bytesRead);
-        }
-        return bytesRead;
-    }
-
-    /**
-     * Reads up to <code>len</code> bytes of data from this input stream
-     * into an array of bytes. If <code>len</code> is not zero, the method
-     * blocks until some input is available; otherwise, no
-     * bytes are read and <code>0</code> is returned.
-     *
-     * @param      b     the buffer into which the data is read.
-     * @param      off   the start offset in the destination array <code>b</code>
-     * @param      len   the maximum number of bytes read.
-     * @return     the total number of bytes read into the buffer, or
-     *             <code>-1</code> if there is no more data because the end of
-     *             the file has been reached.
-     * @exception  NullPointerException If <code>b</code> is <code>null</code>.
-     * @exception  IndexOutOfBoundsException If <code>off</code> is negative,
-     * <code>len</code> is negative, or <code>len</code> is greater than
-     * <code>b.length - off</code>
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public int read(byte b[], int off, int len) throws IOException {
-        Object traceContext = IoTrace.fileReadBegin(path);
-        int bytesRead = 0;
-        try {
-            bytesRead = readBytes(b, off, len);
-        } finally {
-            IoTrace.fileReadEnd(traceContext, bytesRead == -1 ? 0 : bytesRead);
-        }
-        return bytesRead;
-    }
-
-    /**
-     * Skips over and discards <code>n</code> bytes of data from the
-     * input stream.
-     *
-     * <p>The <code>skip</code> method may, for a variety of
-     * reasons, end up skipping over some smaller number of bytes,
-     * possibly <code>0</code>. If <code>n</code> is negative, an
-     * <code>IOException</code> is thrown, even though the <code>skip</code>
-     * method of the {@link InputStream} superclass does nothing in this case.
-     * The actual number of bytes skipped is returned.
-     *
-     * <p>This method may skip more bytes than are remaining in the backing
-     * file. This produces no exception and the number of bytes skipped
-     * may include some number of bytes that were beyond the EOF of the
-     * backing file. Attempting to read from the stream after skipping past
-     * the end will result in -1 indicating the end of the file.
-     *
-     * @param      n   the number of bytes to be skipped.
-     * @return     the actual number of bytes skipped.
-     * @exception  IOException  if n is negative, if the stream does not
-     *             support seek, or if an I/O error occurs.
-     */
-    public long skip(long n) throws IOException
-    {
-        return fd.skip(n);
-    }
-
-    /**
-     * Returns an estimate of the number of remaining bytes that can be read (or
-     * skipped over) from this input stream without blocking by the next
-     * invocation of a method for this input stream. The next invocation might be
-     * the same thread or another thread.  A single read or skip of this
-     * many bytes will not block, but may read or skip fewer bytes.
-     *
-     * <p> In some cases, a non-blocking read (or skip) may appear to be
-     * blocked when it is merely slow, for example when reading large
-     * files over slow networks.
-     *
-     * @return     an estimate of the number of remaining bytes that can be read
-     *             (or skipped over) from this input stream without blocking.
-     * @exception  IOException  if this file input stream has been closed by calling
-     *             {@code close} or an I/O error occurs.
-     */
-    public int available() throws IOException
-    {
-        return fd.available();
-    }
-
-    /**
-     * Closes this file input stream and releases any system resources
-     * associated with the stream.
-     *
-     * <p> If this stream has an associated channel then the channel is closed
-     * as well.
-     *
-     * @exception  IOException  if an I/O error occurs.
-     *
-     * @revised 1.4
-     * @spec JSR-51
-     */
-    public void close() throws IOException {
-        synchronized (closeLock) {
-            if (closed) {
-                return;
-            }
-            closed = true;
-        }
-        if (channel != null) {
-            /*
-             * Decrement the FD use count associated with the channel
-             * The use count is incremented whenever a new channel
-             * is obtained from this stream.
-             */
-           fd.decrementAndGetUseCount();
-           channel.close();
-        }
-
-        /*
-         * Decrement the FD use count associated with this stream
-         */
-        int useCount = fd.decrementAndGetUseCount();
-
-        /*
-         * If FileDescriptor is still in use by another stream, the finalizer
-         * will not close it.
-         */
-        if ((useCount <= 0) || !isRunningFinalize()) {
-            close0();
-        }
-    }
-
-    /**
-     * Returns the <code>FileDescriptor</code>
-     * object  that represents the connection to
-     * the actual file in the file system being
-     * used by this <code>FileInputStream</code>.
-     *
-     * @return     the file descriptor object associated with this stream.
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.FileDescriptor
-     */
-    public final FileDescriptor getFD() throws IOException {
-        if (fd != null) return fd;
-        throw new IOException();
-    }
-
-    /**
-     * Returns the unique {@link java.nio.channels.FileChannel FileChannel}
-     * object associated with this file input stream.
-     *
-     * <p> The initial {@link java.nio.channels.FileChannel#position()
-     * </code>position<code>} of the returned channel will be equal to the
-     * number of bytes read from the file so far.  Reading bytes from this
-     * stream will increment the channel's position.  Changing the channel's
-     * position, either explicitly or by reading, will change this stream's
-     * file position.
-     *
-     * @return  the file channel associated with this file input stream
-     *
-     * @since 1.4
-     * @spec JSR-51
-     */
-    public FileChannel getChannel() {
-        synchronized (this) {
-            if (channel == null) {
-                channel = FileChannelImpl.open(fd, path, true, false, this);
-
-                /*
-                 * Increment fd's use count. Invoking the channel's close()
-                 * method will result in decrementing the use count set for
-                 * the channel.
-                 */
-                fd.incrementAndGetUseCount();
-            }
-            return channel;
-        }
-    }
-
-    private void close0() throws IOException
-    {
-        fd.close();
-    }
-
-    /**
-     * Ensures that the <code>close</code> method of this file input stream is
-     * called when there are no more references to it.
-     *
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.FileInputStream#close()
-     */
-    protected void finalize() throws IOException {
-        if ((fd != null) &&  (fd != FileDescriptor.in)) {
-
-            /*
-             * Finalizer should not release the FileDescriptor if another
-             * stream is still using it. If the user directly invokes
-             * close() then the FileDescriptor is also released.
-             */
-            runningFinalize.set(Boolean.TRUE);
-            try {
-                close();
-            } finally {
-                runningFinalize.set(Boolean.FALSE);
-            }
-        }
-    }
-}
diff --git a/openjdk/java/io/FileOutputStream.java b/openjdk/java/io/FileOutputStream.java
deleted file mode 100644
index dae9d4bc..00000000
--- a/openjdk/java/io/FileOutputStream.java
+++ /dev/null
@@ -1,491 +0,0 @@
-/*
- * Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-import java.nio.channels.FileChannel;
-import sun.nio.ch.FileChannelImpl;
-import sun.misc.IoTrace;
-
-
-/**
- * A file output stream is an output stream for writing data to a
- * <code>File</code> or to a <code>FileDescriptor</code>. Whether or not
- * a file is available or may be created depends upon the underlying
- * platform.  Some platforms, in particular, allow a file to be opened
- * for writing by only one <tt>FileOutputStream</tt> (or other
- * file-writing object) at a time.  In such situations the constructors in
- * this class will fail if the file involved is already open.
- *
- * <p><code>FileOutputStream</code> is meant for writing streams of raw bytes
- * such as image data. For writing streams of characters, consider using
- * <code>FileWriter</code>.
- *
- * @author  Arthur van Hoff
- * @see     java.io.File
- * @see     java.io.FileDescriptor
- * @see     java.io.FileInputStream
- * @see     java.nio.file.Files#newOutputStream
- * @since   JDK1.0
- */
-public
-class FileOutputStream extends OutputStream
-{
-    /**
-     * The system dependent file descriptor.
-     */
-    private final FileDescriptor fd;
-
-    /**
-     * The path of the referenced file (null if the stream is created with a file descriptor)
-     */
-    private final String path;
-
-    /**
-     * True if the file is opened for append.
-     */
-    private final boolean append;
-
-    /**
-     * The associated channel, initalized lazily.
-     */
-    private FileChannel channel;
-
-    private final Object closeLock = new Object();
-    private volatile boolean closed = false;
-    private static final ThreadLocal<Boolean> runningFinalize =
-        new ThreadLocal<>();
-
-    private static boolean isRunningFinalize() {
-        Boolean val;
-        if ((val = runningFinalize.get()) != null)
-            return val.booleanValue();
-        return false;
-    }
-
-    /**
-     * Creates a file output stream to write to the file with the
-     * specified name. A new <code>FileDescriptor</code> object is
-     * created to represent this file connection.
-     * <p>
-     * First, if there is a security manager, its <code>checkWrite</code>
-     * method is called with <code>name</code> as its argument.
-     * <p>
-     * If the file exists but is a directory rather than a regular file, does
-     * not exist but cannot be created, or cannot be opened for any other
-     * reason then a <code>FileNotFoundException</code> is thrown.
-     *
-     * @param      name   the system-dependent filename
-     * @exception  FileNotFoundException  if the file exists but is a directory
-     *                   rather than a regular file, does not exist but cannot
-     *                   be created, or cannot be opened for any other reason
-     * @exception  SecurityException  if a security manager exists and its
-     *               <code>checkWrite</code> method denies write access
-     *               to the file.
-     * @see        java.lang.SecurityManager#checkWrite(java.lang.String)
-     */
-    public FileOutputStream(String name) throws FileNotFoundException {
-        this(name != null ? new File(name) : null, false);
-    }
-
-    /**
-     * Creates a file output stream to write to the file with the specified
-     * name.  If the second argument is <code>true</code>, then
-     * bytes will be written to the end of the file rather than the beginning.
-     * A new <code>FileDescriptor</code> object is created to represent this
-     * file connection.
-     * <p>
-     * First, if there is a security manager, its <code>checkWrite</code>
-     * method is called with <code>name</code> as its argument.
-     * <p>
-     * If the file exists but is a directory rather than a regular file, does
-     * not exist but cannot be created, or cannot be opened for any other
-     * reason then a <code>FileNotFoundException</code> is thrown.
-     *
-     * @param     name        the system-dependent file name
-     * @param     append      if <code>true</code>, then bytes will be written
-     *                   to the end of the file rather than the beginning
-     * @exception  FileNotFoundException  if the file exists but is a directory
-     *                   rather than a regular file, does not exist but cannot
-     *                   be created, or cannot be opened for any other reason.
-     * @exception  SecurityException  if a security manager exists and its
-     *               <code>checkWrite</code> method denies write access
-     *               to the file.
-     * @see        java.lang.SecurityManager#checkWrite(java.lang.String)
-     * @since     JDK1.1
-     */
-    public FileOutputStream(String name, boolean append)
-        throws FileNotFoundException
-    {
-        this(name != null ? new File(name) : null, append);
-    }
-
-    /**
-     * Creates a file output stream to write to the file represented by
-     * the specified <code>File</code> object. A new
-     * <code>FileDescriptor</code> object is created to represent this
-     * file connection.
-     * <p>
-     * First, if there is a security manager, its <code>checkWrite</code>
-     * method is called with the path represented by the <code>file</code>
-     * argument as its argument.
-     * <p>
-     * If the file exists but is a directory rather than a regular file, does
-     * not exist but cannot be created, or cannot be opened for any other
-     * reason then a <code>FileNotFoundException</code> is thrown.
-     *
-     * @param      file               the file to be opened for writing.
-     * @exception  FileNotFoundException  if the file exists but is a directory
-     *                   rather than a regular file, does not exist but cannot
-     *                   be created, or cannot be opened for any other reason
-     * @exception  SecurityException  if a security manager exists and its
-     *               <code>checkWrite</code> method denies write access
-     *               to the file.
-     * @see        java.io.File#getPath()
-     * @see        java.lang.SecurityException
-     * @see        java.lang.SecurityManager#checkWrite(java.lang.String)
-     */
-    public FileOutputStream(File file) throws FileNotFoundException {
-        this(file, false);
-    }
-
-    /**
-     * Creates a file output stream to write to the file represented by
-     * the specified <code>File</code> object. If the second argument is
-     * <code>true</code>, then bytes will be written to the end of the file
-     * rather than the beginning. A new <code>FileDescriptor</code> object is
-     * created to represent this file connection.
-     * <p>
-     * First, if there is a security manager, its <code>checkWrite</code>
-     * method is called with the path represented by the <code>file</code>
-     * argument as its argument.
-     * <p>
-     * If the file exists but is a directory rather than a regular file, does
-     * not exist but cannot be created, or cannot be opened for any other
-     * reason then a <code>FileNotFoundException</code> is thrown.
-     *
-     * @param      file               the file to be opened for writing.
-     * @param     append      if <code>true</code>, then bytes will be written
-     *                   to the end of the file rather than the beginning
-     * @exception  FileNotFoundException  if the file exists but is a directory
-     *                   rather than a regular file, does not exist but cannot
-     *                   be created, or cannot be opened for any other reason
-     * @exception  SecurityException  if a security manager exists and its
-     *               <code>checkWrite</code> method denies write access
-     *               to the file.
-     * @see        java.io.File#getPath()
-     * @see        java.lang.SecurityException
-     * @see        java.lang.SecurityManager#checkWrite(java.lang.String)
-     * @since 1.4
-     */
-    public FileOutputStream(File file, boolean append)
-        throws FileNotFoundException
-    {
-        String name = (file != null ? file.getPath() : null);
-        SecurityManager security = System.getSecurityManager();
-        if (security != null) {
-            security.checkWrite(name);
-        }
-        if (name == null) {
-            throw new NullPointerException();
-        }
-        /*
-        if (file.isInvalid()) {
-            throw new FileNotFoundException("Invalid file path");
-        }
-        */
-        this.fd = new FileDescriptor();
-        this.append = append;
-        this.path = name;
-        fd.incrementAndGetUseCount();
-        open(name, append);
-    }
-
-    /**
-     * Creates a file output stream to write to the specified file
-     * descriptor, which represents an existing connection to an actual
-     * file in the file system.
-     * <p>
-     * First, if there is a security manager, its <code>checkWrite</code>
-     * method is called with the file descriptor <code>fdObj</code>
-     * argument as its argument.
-     * <p>
-     * If <code>fdObj</code> is null then a <code>NullPointerException</code>
-     * is thrown.
-     * <p>
-     * This constructor does not throw an exception if <code>fdObj</code>
-     * is {@link java.io.FileDescriptor#valid() invalid}.
-     * However, if the methods are invoked on the resulting stream to attempt
-     * I/O on the stream, an <code>IOException</code> is thrown.
-     *
-     * @param      fdObj   the file descriptor to be opened for writing
-     * @exception  SecurityException  if a security manager exists and its
-     *               <code>checkWrite</code> method denies
-     *               write access to the file descriptor
-     * @see        java.lang.SecurityManager#checkWrite(java.io.FileDescriptor)
-     */
-    public FileOutputStream(FileDescriptor fdObj) {
-        SecurityManager security = System.getSecurityManager();
-        if (fdObj == null) {
-            throw new NullPointerException();
-        }
-        if (security != null) {
-            security.checkWrite(fdObj);
-        }
-        this.fd = fdObj;
-        this.path = null;
-        this.append = false;
-
-        /*
-         * FileDescriptor is being shared by streams.
-         * Ensure that it's GC'ed only when all the streams/channels are done
-         * using it.
-         */
-        fd.incrementAndGetUseCount();
-    }
-
-    /**
-     * Opens a file, with the specified name, for overwriting or appending.
-     * @param name name of file to be opened
-     * @param append whether the file is to be opened in append mode
-     */
-    private void open(String name, boolean append)
-        throws FileNotFoundException {
-        if (append) {
-            fd.openAppend(name);
-        } else {
-            fd.openWriteOnly(name);
-        }
-    }
-
-    /**
-     * Writes the specified byte to this file output stream.
-     *
-     * @param   b   the byte to be written.
-     * @param   append   {@code true} if the write operation first
-     *     advances the position to the end of file
-     */
-    private void write(int b, boolean append) throws IOException {
-        fd.write(b);
-    }
-
-    /**
-     * Writes the specified byte to this file output stream. Implements
-     * the <code>write</code> method of <code>OutputStream</code>.
-     *
-     * @param      b   the byte to be written.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public void write(int b) throws IOException {
-        Object traceContext = IoTrace.fileWriteBegin(path);
-        int bytesWritten = 0;
-        try {
-            write(b, append);
-            bytesWritten = 1;
-        } finally {
-            IoTrace.fileWriteEnd(traceContext, bytesWritten);
-        }
-    }
-
-    /**
-     * Writes a sub array as a sequence of bytes.
-     * @param b the data to be written
-     * @param off the start offset in the data
-     * @param len the number of bytes that are written
-     * @param append {@code true} to first advance the position to the
-     *     end of file
-     * @exception IOException If an I/O error has occurred.
-     */
-    private void writeBytes(byte b[], int off, int len, boolean append)
-        throws IOException {
-        fd.writeBytes(b, off, len);
-    }
-
-    /**
-     * Writes <code>b.length</code> bytes from the specified byte array
-     * to this file output stream.
-     *
-     * @param      b   the data.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public void write(byte b[]) throws IOException {
-        Object traceContext = IoTrace.fileWriteBegin(path);
-        int bytesWritten = 0;
-        try {
-            writeBytes(b, 0, b.length, append);
-            bytesWritten = b.length;
-        } finally {
-            IoTrace.fileWriteEnd(traceContext, bytesWritten);
-        }
-    }
-
-    /**
-     * Writes <code>len</code> bytes from the specified byte array
-     * starting at offset <code>off</code> to this file output stream.
-     *
-     * @param      b     the data.
-     * @param      off   the start offset in the data.
-     * @param      len   the number of bytes to write.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public void write(byte b[], int off, int len) throws IOException {
-        Object traceContext = IoTrace.fileWriteBegin(path);
-        int bytesWritten = 0;
-        try {
-            writeBytes(b, off, len, append);
-            bytesWritten = len;
-        } finally {
-            IoTrace.fileWriteEnd(traceContext, bytesWritten);
-        }
-    }
-
-    /**
-     * Closes this file output stream and releases any system resources
-     * associated with this stream. This file output stream may no longer
-     * be used for writing bytes.
-     *
-     * <p> If this stream has an associated channel then the channel is closed
-     * as well.
-     *
-     * @exception  IOException  if an I/O error occurs.
-     *
-     * @revised 1.4
-     * @spec JSR-51
-     */
-    public void close() throws IOException {
-        synchronized (closeLock) {
-            if (closed) {
-                return;
-            }
-            closed = true;
-        }
-
-        if (channel != null) {
-            /*
-             * Decrement FD use count associated with the channel
-             * The use count is incremented whenever a new channel
-             * is obtained from this stream.
-             */
-            fd.decrementAndGetUseCount();
-            channel.close();
-        }
-
-        /*
-         * Decrement FD use count associated with this stream
-         */
-        int useCount = fd.decrementAndGetUseCount();
-
-        /*
-         * If FileDescriptor is still in use by another stream, the finalizer
-         * will not close it.
-         */
-        if ((useCount <= 0) || !isRunningFinalize()) {
-            close0();
-        }
-    }
-
-    /**
-     * Returns the file descriptor associated with this stream.
-     *
-     * @return  the <code>FileDescriptor</code> object that represents
-     *          the connection to the file in the file system being used
-     *          by this <code>FileOutputStream</code> object.
-     *
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.FileDescriptor
-     */
-     public final FileDescriptor getFD()  throws IOException {
-        if (fd != null) return fd;
-        throw new IOException();
-     }
-
-    /**
-     * Returns the unique {@link java.nio.channels.FileChannel FileChannel}
-     * object associated with this file output stream. </p>
-     *
-     * <p> The initial {@link java.nio.channels.FileChannel#position()
-     * </code>position<code>} of the returned channel will be equal to the
-     * number of bytes written to the file so far unless this stream is in
-     * append mode, in which case it will be equal to the size of the file.
-     * Writing bytes to this stream will increment the channel's position
-     * accordingly.  Changing the channel's position, either explicitly or by
-     * writing, will change this stream's file position.
-     *
-     * @return  the file channel associated with this file output stream
-     *
-     * @since 1.4
-     * @spec JSR-51
-     */
-    public FileChannel getChannel() {
-        synchronized (this) {
-            if (channel == null) {
-                channel = FileChannelImpl.open(fd, path, false, true, append, this);
-
-                /*
-                 * Increment fd's use count. Invoking the channel's close()
-                 * method will result in decrementing the use count set for
-                 * the channel.
-                 */
-                fd.incrementAndGetUseCount();
-            }
-            return channel;
-        }
-    }
-
-    /**
-     * Cleans up the connection to the file, and ensures that the
-     * <code>close</code> method of this file output stream is
-     * called when there are no more references to this stream.
-     *
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.FileInputStream#close()
-     */
-    protected void finalize() throws IOException {
-        if (fd != null) {
-            if (fd == FileDescriptor.out || fd == FileDescriptor.err) {
-                flush();
-            } else {
-
-                /*
-                 * Finalizer should not release the FileDescriptor if another
-                 * stream is still using it. If the user directly invokes
-                 * close() then the FileDescriptor is also released.
-                 */
-                runningFinalize.set(Boolean.TRUE);
-                try {
-                    close();
-                } finally {
-                    runningFinalize.set(Boolean.FALSE);
-                }
-            }
-        }
-    }
-
-    private void close0() throws IOException
-    {
-        fd.close();
-    }
-
-}
diff --git a/openjdk/java/io/InteropObjectInputStream.java b/openjdk/java/io/InteropObjectInputStream.java
deleted file mode 100644
index de08fe3a..00000000
--- a/openjdk/java/io/InteropObjectInputStream.java
+++ /dev/null
@@ -1,740 +0,0 @@
-/*
- * Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2009 Jeroen Frijters
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.io;
-
-import cli.System.Runtime.Serialization.SerializationException;
-import cli.System.Runtime.Serialization.SerializationInfo;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-@ikvm.lang.Internal
-public final class InteropObjectInputStream extends ObjectInputStream
-{
-    private ObjectDataInputStream dis;
-    private CallbackContext curContext;
-    
-    public static void readObject(Object obj, SerializationInfo info)
-    {
-        try
-        {
-            new InteropObjectInputStream(obj, info);
-        }
-        catch (Exception x)
-        {
-            ikvm.runtime.Util.throwException(new SerializationException(x.getMessage(), x));
-        }
-    }
-    
-    private InteropObjectInputStream(Object obj, SerializationInfo info) throws IOException, ClassNotFoundException
-    {
-        dis = new ObjectDataInputStream(info);
-        if (obj instanceof ObjectStreamClass)
-        {
-            switch (readByte())
-            {
-                case TC_PROXYCLASSDESC:
-                    readProxyDesc((ObjectStreamClass)obj);
-                    break;
-                case TC_CLASSDESC:
-                    readNonProxyDesc((ObjectStreamClass)obj);
-                    break;
-                default:
-                    throw new StreamCorruptedException();
-            }
-        }
-        else
-        {
-            readOrdinaryObject(obj);
-        }
-    }
-    
-    private ObjectStreamClass readClassDesc() throws IOException, ClassNotFoundException
-    {
-        return (ObjectStreamClass)readObject();
-    }
-    
-    private void readProxyDesc(ObjectStreamClass desc) throws IOException, ClassNotFoundException
-    {
-        int numIfaces = readInt();
-        Class[] ifaces = new Class[numIfaces];
-        for (int i = 0; i < numIfaces; i++)
-        {
-            ifaces[i] = (Class)readObject();
-        }
-        Class cl = java.lang.reflect.Proxy.getProxyClass(Thread.currentThread().getContextClassLoader(), ifaces);
-        desc.initProxy(cl, null, readClassDesc());
-    }
-    
-    private void readNonProxyDesc(ObjectStreamClass desc) throws IOException, ClassNotFoundException
-    {
-        Class cl = (Class)readObject();
-        ObjectStreamClass readDesc = new ObjectStreamClass();
-        readDesc.readNonProxy(this);
-        desc.initNonProxy(readDesc, cl, null, readClassDesc());
-    }
-    
-    private void readOrdinaryObject(Object obj) throws IOException, ClassNotFoundException
-    {
-        ObjectStreamClass desc = readClassDesc();
-        desc.checkDeserialize();
-
-        if (obj instanceof InteropObjectOutputStream.DynamicProxy)
-        {
-            InteropObjectOutputStream.DynamicProxy pp = (InteropObjectOutputStream.DynamicProxy)obj;
-            try
-            {
-                obj = desc.newInstance();
-                pp.obj = obj;
-            }
-            catch (Exception ex)
-            {
-                throw (IOException) new InvalidClassException(
-                    desc.forClass().getName(),
-                    "unable to create instance").initCause(ex);
-            }
-        }
-        
-        if (desc.isExternalizable())
-        {
-            readExternalData((Externalizable)obj, desc);
-        }
-        else
-        {
-            readSerialData(obj, desc);
-        }
-    }
-    
-    private void readExternalData(Externalizable obj, ObjectStreamClass desc) throws IOException, ClassNotFoundException
-    {
-        CallbackContext oldContext = curContext;
-        curContext = null;
-        try {
-            obj.readExternal(this);
-            skipCustomData();
-        } finally {
-            curContext = oldContext;
-        }
-    }
-
-    private void readSerialData(Object obj, ObjectStreamClass desc) throws IOException, ClassNotFoundException
-    {
-        ObjectStreamClass.ClassDataSlot[] slots = desc.getClassDataLayout();
-        for (int i = 0; i < slots.length; i++)
-        {
-            ObjectStreamClass slotDesc = slots[i].desc;
-
-            if (slots[i].hasData)
-            {
-                if (slotDesc.hasReadObjectMethod())
-                {
-                    CallbackContext oldContext = curContext;
-                    try
-                    {
-                        curContext = new CallbackContext(obj, slotDesc);
-                        slotDesc.invokeReadObject(obj, this);
-                    }
-                    finally
-                    {
-                        curContext.setUsed();
-                        curContext = oldContext;
-                    }
-                }
-                else
-                {
-                    defaultReadFields(obj, slotDesc);
-                }
-                if (slotDesc.hasWriteObjectData())
-                {
-                    skipCustomData();
-                }
-            }
-            else if (slotDesc.hasReadObjectNoDataMethod())
-            {
-                slotDesc.invokeReadObjectNoData(obj);
-            }
-        }
-    }
-    
-    private void skipCustomData() throws IOException
-    {
-        dis.skipMarker();
-    }
-    
-    private void defaultReadFields(Object obj, ObjectStreamClass desc) throws IOException, ClassNotFoundException
-    {
-        byte[] primVals = new byte[desc.getPrimDataSize()];
-        readFully(primVals);
-        desc.setPrimFieldValues(obj, primVals);
-
-        Object[] objVals = new Object[desc.getNumObjFields()];
-        for (int i = 0; i < objVals.length; i++)
-        {
-            objVals[i] = readObject();
-        }
-        desc.setObjFieldValues(obj, objVals);
-    }
-    
-    @Override
-    public void defaultReadObject() throws IOException, ClassNotFoundException
-    {
-        if (curContext == null) {
-            throw new NotActiveException("not in call to readObject");
-        }
-        Object curObj = curContext.getObj();
-        ObjectStreamClass curDesc = curContext.getDesc();
-        defaultReadFields(curObj, curDesc);
-    }
-
-    @Override
-    protected Object readObjectOverride() throws IOException
-    {
-        return dis.readObject();
-    }
-
-    @Override
-    public Object readUnshared()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ObjectInputStream.GetField readFields() throws IOException, ClassNotFoundException
-    {
-        if (curContext == null) {
-            throw new NotActiveException("not in call to readObject");
-        }
-        Object curObj = curContext.getObj();
-        ObjectStreamClass curDesc = curContext.getDesc();
-        GetFieldImpl getField = new GetFieldImpl(curDesc);
-        getField.readFields();
-        return getField;
-    }
-
-    @Override
-    public void registerValidation(ObjectInputValidation obj, int prio)
-    {
-        throw new UnsupportedOperationException();
-    }
-    
-    @Override
-    public int read() throws IOException
-    {
-        return dis.read();
-    }
-
-    @Override
-    public int read(byte[] buf, int off, int len) throws IOException
-    {
-        return dis.read(buf, off, len);
-    }
-
-    @Override
-    public int available() throws IOException
-    {
-        return dis.available();
-    }
-
-    @Override
-    public void close() throws IOException
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean readBoolean() throws IOException
-    {
-        return dis.readBoolean();
-    }
-
-    @Override
-    public byte readByte() throws IOException
-    {
-        return dis.readByte();
-    }
-
-    @Override
-    public int readUnsignedByte() throws IOException
-    {
-        return dis.readUnsignedByte();
-    }
-
-    @Override
-    public char readChar() throws IOException
-    {
-        return dis.readChar();
-    }
-
-    @Override
-    public short readShort() throws IOException
-    {
-        return dis.readShort();
-    }
-
-    @Override
-    public int readUnsignedShort() throws IOException
-    {
-        return dis.readUnsignedShort();
-    }
-
-    @Override
-    public int readInt() throws IOException
-    {
-        return dis.readInt();
-    }
-
-    @Override
-    public long readLong() throws IOException
-    {
-        return dis.readLong();
-    }
-
-    @Override
-    public float readFloat() throws IOException
-    {
-        return dis.readFloat();
-    }
-
-    @Override
-    public double readDouble() throws IOException
-    {
-        return dis.readDouble();
-    }
-
-    @Override
-    public void readFully(byte[] buf) throws IOException
-    {
-        readFully(buf, 0, buf.length);
-    }
-
-    @Override
-    public void readFully(byte[] buf, int off, int len) throws IOException
-    {
-        dis.readFully(buf, off, len);
-    }
-
-    @Override
-    public int skipBytes(int len) throws IOException
-    {
-        return dis.skipBytes(len);
-    }
-
-    @Deprecated
-    @Override
-    public String readLine() throws IOException
-    {
-        return dis.readLine();
-    }
-
-    @Override
-    public String readUTF() throws IOException
-    {
-        return dis.readUTF();
-    }
-    
-    // private API used by ObjectStreamClass
-    @Override    
-    String readTypeString() throws IOException
-    {
-        return (String)readObjectOverride();
-    }
-
-    private final class GetFieldImpl extends GetField {
-
-        /** class descriptor describing serializable fields */
-        private final ObjectStreamClass desc;
-        /** primitive field values */
-        private final byte[] primVals;
-        /** object field values */
-        private final Object[] objVals;
-        /** object field value handles */
-        private final int[] objHandles;
-
-        /**
-         * Creates GetFieldImpl object for reading fields defined in given
-         * class descriptor.
-         */
-        GetFieldImpl(ObjectStreamClass desc) {
-            this.desc = desc;
-            primVals = new byte[desc.getPrimDataSize()];
-            objVals = new Object[desc.getNumObjFields()];
-            objHandles = new int[objVals.length];
-        }
-
-        public ObjectStreamClass getObjectStreamClass() {
-            return desc;
-        }
-
-        public boolean defaulted(String name) throws IOException {
-            return (getFieldOffset(name, null) < 0);
-        }
-
-        public boolean get(String name, boolean val) throws IOException {
-            int off = getFieldOffset(name, Boolean.TYPE);
-            return (off >= 0) ? Bits.getBoolean(primVals, off) : val;
-        }
-
-        public byte get(String name, byte val) throws IOException {
-            int off = getFieldOffset(name, Byte.TYPE);
-            return (off >= 0) ? primVals[off] : val;
-        }
-
-        public char get(String name, char val) throws IOException {
-            int off = getFieldOffset(name, Character.TYPE);
-            return (off >= 0) ? Bits.getChar(primVals, off) : val;
-        }
-
-        public short get(String name, short val) throws IOException {
-            int off = getFieldOffset(name, Short.TYPE);
-            return (off >= 0) ? Bits.getShort(primVals, off) : val;
-        }
-
-        public int get(String name, int val) throws IOException {
-            int off = getFieldOffset(name, Integer.TYPE);
-            return (off >= 0) ? Bits.getInt(primVals, off) : val;
-        }
-
-        public float get(String name, float val) throws IOException {
-            int off = getFieldOffset(name, Float.TYPE);
-            return (off >= 0) ? Bits.getFloat(primVals, off) : val;
-        }
-
-        public long get(String name, long val) throws IOException {
-            int off = getFieldOffset(name, Long.TYPE);
-            return (off >= 0) ? Bits.getLong(primVals, off) : val;
-        }
-
-        public double get(String name, double val) throws IOException {
-            int off = getFieldOffset(name, Double.TYPE);
-            return (off >= 0) ? Bits.getDouble(primVals, off) : val;
-        }
-
-        public Object get(String name, Object val) throws IOException {
-            int off = getFieldOffset(name, Object.class);
-            if (off >= 0) {
-                return objVals[off];
-            } else {
-                return val;
-            }
-        }
-
-        /**
-         * Reads primitive and object field values from stream.
-         */
-        void readFields() throws IOException {
-            readFully(primVals, 0, primVals.length);
-
-            for (int i = 0; i < objVals.length; i++) {
-                objVals[i] = readObjectOverride();
-            }
-        }
-
-        /**
-         * Returns offset of field with given name and type.  A specified type
-         * of null matches all types, Object.class matches all non-primitive
-         * types, and any other non-null type matches assignable types only.
-         * If no matching field is found in the (incoming) class
-         * descriptor but a matching field is present in the associated local
-         * class descriptor, returns -1.  Throws IllegalArgumentException if
-         * neither incoming nor local class descriptor contains a match.
-         */
-        private int getFieldOffset(String name, Class type) {
-            ObjectStreamField field = desc.getField(name, type);
-            if (field != null) {
-                return field.getOffset();
-            } else if (desc.getLocalDesc().getField(name, type) != null) {
-                return -1;
-            } else {
-                throw new IllegalArgumentException("no such field " + name +
-                                                   " with type " + type);
-            }
-        }
-    }
-
-    private final static class CallbackContext {
-        private final Object obj;
-        private final ObjectStreamClass desc;
-        private final AtomicBoolean used = new AtomicBoolean();
-
-        public CallbackContext(Object obj, ObjectStreamClass desc) {
-            this.obj = obj;
-            this.desc = desc;
-        }
-
-        public Object getObj() throws NotActiveException {
-            checkAndSetUsed();
-            return obj;
-        }
-
-        public ObjectStreamClass getDesc() {
-            return desc;
-        }
-
-        private void checkAndSetUsed() throws NotActiveException {
-            if (!used.compareAndSet(false, true)) {
-                 throw new NotActiveException(
-                      "not in readObject invocation or fields already read");
-            }
-        }
-
-        public void setUsed() {
-            used.set(true);
-        }
-    }
-
-    private static final class ObjectDataInputStream extends DataInputStream
-    {
-        private final static class Inp extends FilterInputStream
-        {
-            private static final byte MARKER = 0;
-            private static final byte OBJECTS = 10;
-            private static final byte BYTES = 20;
-            private final SerializationInfo info;
-            private byte[] buf;
-            private int pos;
-            private int blockEnd = -1;
-            private int objCount;
-            private int objId;
-
-            Inp(SerializationInfo info) throws IOException
-            {
-                super(null);
-                this.info = info;
-                buf = (byte[])info.GetValue("$data", ikvm.runtime.Util.getInstanceTypeFromClass(cli.System.Object.class));
-                modeSwitch();
-            }
-            
-            private void modeSwitch() throws IOException
-            {
-                if (pos == buf.length)
-                {
-                    // next read will report error
-                    blockEnd = -1;
-                    objCount = -1;
-                }
-                else if (buf[pos] == OBJECTS)
-                {
-                    pos++;
-                    objCount = readPacked();
-                    blockEnd = -1;
-                }
-                else if (buf[pos] == BYTES)
-                {
-                    pos++;
-                    switchToData();
-                }
-                else if (buf[pos] == MARKER)
-                {
-                }
-                else
-                {
-                    throw new StreamCorruptedException();
-                }
-            }
-            
-            private int packedLength(int val)
-            {
-                if (val < 0)
-                {
-                    // we only use packed integers for lengths or counts, so they can never be negative
-                    throw new Error();
-                }
-                else if (val < 128)
-                {
-                    return 1;
-                }
-                else if (val < 16129)
-                {
-                    return 2;
-                }
-                else
-                {
-                    return 5;
-                }
-            }
-            
-            private int readPacked()
-            {
-                int b1 = buf[pos++] & 0xFF;
-                if (b1 < 128)
-                {
-                    return b1;
-                }
-                else if (b1 != 128)
-                {
-                    return ((b1 & 127) << 7) + (buf[pos++] & 0xFF);
-                }
-                else
-                {
-                    int v = 0;
-                    v |= (buf[pos++] & 0xFF) << 24;
-                    v |= (buf[pos++] & 0xFF) << 16;
-                    v |= (buf[pos++] & 0xFF) <<  8;
-                    v |= (buf[pos++] & 0xFF) <<  0;
-                    return v;
-                }
-            }
-            
-            private void switchToData() throws IOException
-            {
-                if (blockEnd != -1 || objCount != 0 || buf[pos] == MARKER)
-                {
-                    throw new StreamCorruptedException();
-                }
-                int len = readPacked();
-                blockEnd = pos + len;
-                if (blockEnd > buf.length)
-                {
-                    throw new StreamCorruptedException();
-                }
-            }
-
-            public int read() throws IOException
-            {
-                if (blockEnd - pos < 1)
-                {
-                    switchToData();
-                }
-                return buf[pos++] & 0xFF;
-            }
-            
-            public int read(byte b[], int off, int len) throws IOException
-            {
-                if (len == 0)
-                {
-                    return 0;
-                }
-                if (blockEnd - pos < len)
-                {
-                    switchToData();
-                }
-                System.arraycopy(buf, pos, b, off, len);
-                pos += len;
-                return len;
-            }
-            
-            public long skip(long n) throws IOException
-            {
-                if (n == 0)
-                {
-                    return 0;
-                }
-                if (blockEnd - pos < n)
-                {
-                    switchToData();
-                }
-                pos += (int)n;
-                return n;
-            }
-            
-            public int available() throws IOException
-            {
-                return 0;
-            }
-            
-            public void close() throws IOException
-            {
-            }
-            
-            public void mark(int readlimit)
-            {
-            }
-            
-            public void reset() throws IOException
-            {
-            }
-            
-            public boolean markSupported()
-            {
-                return false;
-            }
-            
-            Object readObject() throws IOException
-            {
-                if (objCount <= 0)
-                {
-                    if (pos != blockEnd || buf[pos] == MARKER)
-                    {
-                        throw new StreamCorruptedException();
-                    }
-                    blockEnd = -1;
-                    objCount = readPacked();
-                }
-                objCount--;
-                return info.GetValue("$" + (objId++), ikvm.runtime.Util.getInstanceTypeFromClass(cli.System.Object.class));
-            }
-            
-            void skipMarker() throws IOException
-            {
-                for (;;)
-                {
-                    if (objCount > 0)
-                    {
-                        objId += objCount;
-                        objCount = 0;
-                        if (buf[pos] == MARKER)
-                        {
-                            pos++;
-                            modeSwitch();
-                            break;
-                        }
-                        switchToData();
-                    }
-                    if (blockEnd != -1)
-                    {
-                        pos = blockEnd;
-                        blockEnd = -1;
-                    }
-                    if (pos == buf.length)
-                    {
-                        throw new StreamCorruptedException();
-                    }
-                    if (buf[pos] == MARKER)
-                    {
-                        pos++;
-                        modeSwitch();
-                        break;
-                    }
-                    blockEnd = -1;
-                    objCount = readPacked();
-                }
-            }
-        }
-
-        ObjectDataInputStream(SerializationInfo info) throws IOException
-        {
-            super(new Inp(info));
-        }
-        
-        public Object readObject() throws IOException
-        {
-            return ((Inp)in).readObject();
-        }
-        
-        public void skipMarker() throws IOException
-        {
-            ((Inp)in).skipMarker();
-        }
-    }
-}
diff --git a/openjdk/java/io/InteropObjectOutputStream.java b/openjdk/java/io/InteropObjectOutputStream.java
deleted file mode 100644
index f32c98b1..00000000
--- a/openjdk/java/io/InteropObjectOutputStream.java
+++ /dev/null
@@ -1,738 +0,0 @@
-/*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2009 Jeroen Frijters
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.io;
-
-import cli.System.Runtime.Serialization.IObjectReference;
-import cli.System.Runtime.Serialization.SerializationException;
-import cli.System.Runtime.Serialization.SerializationInfo;
-import cli.System.Runtime.Serialization.StreamingContext;
-import cli.System.SerializableAttribute;
-import java.util.ArrayList;
-
-@ikvm.lang.Internal
-public final class InteropObjectOutputStream extends ObjectOutputStream
-{
-    private final ObjectDataOutputStream dos;
-    private Object curObj;
-    private ObjectStreamClass curDesc;
-    private PutFieldImpl curPut;
-    
-    @SerializableAttribute.Annotation
-    private static final class ReplaceProxy implements IObjectReference
-    {
-        private Object obj;
-
-        @cli.System.Security.SecurityCriticalAttribute.Annotation
-        public Object GetRealObject(StreamingContext context)
-        {
-            return obj;
-        }
-    }
-    
-    static final class DynamicProxy implements Serializable
-    {
-        Object obj;
-
-        private Object readResolve()
-        {
-            return obj;
-        }
-    }
-    
-    public static void writeObject(Object obj, SerializationInfo info)
-    {
-        try
-        {
-            boolean replaced = false;
-            Class cl = obj.getClass();
-            ObjectStreamClass desc;
-            for (;;)
-            {
-                Class repCl;
-                desc = ObjectStreamClass.lookup(cl, true);
-                if (!desc.hasWriteReplaceMethod() ||
-                    (obj = desc.invokeWriteReplace(obj)) == null ||
-                    (repCl = obj.getClass()) == cl)
-                {
-                    break;
-                }
-                cl = repCl;
-                replaced = true;
-            }
-            if (replaced)
-            {
-                info.AddValue("obj", obj);
-                info.SetType(ikvm.runtime.Util.getInstanceTypeFromClass(ReplaceProxy.class));
-            }
-            else
-            {
-                new InteropObjectOutputStream(info, obj, cl, desc);
-            }
-        }
-        catch (IOException x)
-        {
-            ikvm.runtime.Util.throwException(new SerializationException(x.getMessage(), x));
-        }
-    }
-    
-    private InteropObjectOutputStream(SerializationInfo info, Object obj, Class cl, ObjectStreamClass desc) throws IOException
-    {
-        dos = new ObjectDataOutputStream(info);
-        if (obj instanceof ObjectStreamClass)
-        {
-            ObjectStreamClass osc = (ObjectStreamClass)obj;
-            if (osc.isProxy())
-            {
-                writeProxyDesc(osc);
-            }
-            else
-            {
-                writeNonProxyDesc(osc);
-            }
-        }
-        else if (obj instanceof Serializable)
-        {
-            if (desc.isDynamicClass())
-            {
-                info.SetType(ikvm.runtime.Util.getInstanceTypeFromClass(DynamicProxy.class));
-            }
-            writeOrdinaryObject(obj, desc);
-        }
-        else
-        {
-            throw new NotSerializableException(cl.getName());
-        }
-        dos.close();
-    }
-    
-    private void writeProxyDesc(ObjectStreamClass desc) throws IOException
-    {
-        writeByte(TC_PROXYCLASSDESC);
-        Class cl = desc.forClass();
-        Class[] ifaces = cl.getInterfaces();
-        writeInt(ifaces.length);
-        for (int i = 0; i < ifaces.length; i++)
-        {
-            writeObject(ifaces[i]);
-        }
-        writeObject(desc.getSuperDesc());
-    }
-    
-    private void writeNonProxyDesc(ObjectStreamClass desc) throws IOException
-    {
-        writeByte(TC_CLASSDESC);
-        writeObject(desc.forClass());
-        desc.writeNonProxy(this);
-        writeObject(desc.getSuperDesc());
-    }
-    
-    private void writeOrdinaryObject(Object obj, ObjectStreamClass desc) throws IOException
-    {
-        desc.checkSerialize();
-        writeObject(desc);
-        if (desc.isExternalizable() && !desc.isProxy())
-        {
-            writeExternalData((Externalizable)obj);
-        }
-        else
-        {
-            writeSerialData(obj, desc);
-        }
-    }
-    
-    private void writeExternalData(Externalizable obj) throws IOException
-    {
-        Object oldObj = curObj;
-        ObjectStreamClass oldDesc = curDesc;
-        PutFieldImpl oldPut = curPut;
-        curObj = obj;
-        curDesc = null;
-        curPut = null;
-
-        obj.writeExternal(this);
-        dos.writeMarker();
-
-        curObj = oldObj;
-        curDesc = oldDesc;
-        curPut = oldPut;
-    }
-    
-    private void writeSerialData(Object obj, ObjectStreamClass desc) throws IOException
-    {
-        ObjectStreamClass.ClassDataSlot[] slots = desc.getClassDataLayout();
-        for (int i = 0; i < slots.length; i++)
-        {
-            ObjectStreamClass slotDesc = slots[i].desc;
-            if (slotDesc.hasWriteObjectMethod())
-            {
-                Object oldObj = curObj;
-                ObjectStreamClass oldDesc = curDesc;
-                PutFieldImpl oldPut = curPut;
-                curObj = obj;
-                curDesc = slotDesc;
-                curPut = null;
-                slotDesc.invokeWriteObject(obj, this);
-                dos.writeMarker();
-                curObj = oldObj;
-                curDesc = oldDesc;
-                curPut = oldPut;
-            }
-            else
-            {
-                defaultWriteFields(obj, slotDesc);
-            }
-        }
-    }
-
-    private void defaultWriteFields(Object obj, ObjectStreamClass desc) throws IOException
-    {
-        desc.checkDefaultSerialize();
-
-        byte[] primVals = new byte[desc.getPrimDataSize()];
-        desc.getPrimFieldValues(obj, primVals);
-        write(primVals);
-
-        Object[] objVals = new Object[desc.getNumObjFields()];
-        desc.getObjFieldValues(obj, objVals);
-        for (int i = 0; i < objVals.length; i++)
-        {
-            writeObject(objVals[i]);
-        }
-    }
-
-    @Override    
-    public void defaultWriteObject() throws IOException
-    {
-        defaultWriteFields(curObj, curDesc);
-    }
-
-    @Override    
-    public void close()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override    
-    public void flush()
-    {
-    }
-
-    @Override    
-    public ObjectOutputStream.PutField putFields() throws IOException
-    {
-        if (curPut == null)
-        {
-            if (curObj == null || curDesc == null)
-            {
-                throw new NotActiveException("not in call to writeObject");
-            }
-            curPut = new PutFieldImpl(curDesc);
-        }
-        return curPut;
-    }
-
-    @Override    
-    public void reset() throws IOException
-    {
-        throw new IOException("stream active");
-    }
-
-    @Override    
-    protected void writeObjectOverride(Object obj)
-    {
-        // TODO consider tagging ghost arrays
-        dos.writeObject(obj);
-    }
-
-    @Override    
-    public void writeFields() throws IOException
-    {
-        if (curPut == null)
-        {
-            throw new NotActiveException("no current PutField object");
-        }
-        curPut.writeFields();
-    }
-
-    @Override    
-    public void writeUnshared(Object obj)
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override    
-    public void useProtocolVersion(int version)
-    {
-        throw new IllegalStateException("stream non-empty");
-    }
-
-    @Override    
-    public void write(byte[] buf) throws IOException
-    {
-        write(buf, 0, buf.length);
-    }
-
-    @Override    
-    public void write(int val) throws IOException
-    {
-        dos.write(val);
-    }
-
-    @Override    
-    public void write(byte[] buf, int off, int len) throws IOException
-    {
-        dos.write(buf, off, len);
-    }
-
-    @Override    
-    public void writeBoolean(boolean val) throws IOException
-    {
-        dos.writeBoolean(val);
-    }
-
-    @Override    
-    public void writeByte(int val) throws IOException
-    {
-        dos.writeByte(val);
-    }
-
-    @Override    
-    public void writeBytes(String str) throws IOException
-    {
-        dos.writeBytes(str);
-    }
-
-    @Override    
-    public void writeChar(int val) throws IOException
-    {
-        dos.writeChar(val);
-    }
-
-    @Override    
-    public void writeChars(String str) throws IOException
-    {
-        dos.writeChars(str);
-    }
-
-    @Override    
-    public void writeDouble(double val) throws IOException
-    {
-        dos.writeDouble(val);
-    }
-
-    @Override    
-    public void writeFloat(float val) throws IOException
-    {
-        dos.writeFloat(val);
-    }
-
-    @Override    
-    public void writeInt(int val) throws IOException
-    {
-        dos.writeInt(val);
-    }
-
-    @Override    
-    public void writeLong(long val) throws IOException
-    {
-        dos.writeLong(val);
-    }
-
-    @Override    
-    public void writeShort(int val) throws IOException
-    {
-        dos.writeShort(val);
-    }
-
-    @Override    
-    public void writeUTF(String str) throws IOException
-    {
-        dos.writeUTF(str);
-    }
-    
-    // private API used by ObjectStreamClass
-    @Override    
-    void writeTypeString(String str) throws IOException
-    {
-        writeObject(str);
-    }
-
-    private final class PutFieldImpl extends PutField {
-
-        /** class descriptor describing serializable fields */
-        private final ObjectStreamClass desc;
-        /** primitive field values */
-        private final byte[] primVals;
-        /** object field values */
-        private final Object[] objVals;
-
-        /**
-         * Creates PutFieldImpl object for writing fields defined in given
-         * class descriptor.
-         */
-        PutFieldImpl(ObjectStreamClass desc) {
-            this.desc = desc;
-            primVals = new byte[desc.getPrimDataSize()];
-            objVals = new Object[desc.getNumObjFields()];
-        }
-
-        public void put(String name, boolean val) {
-            Bits.putBoolean(primVals, getFieldOffset(name, Boolean.TYPE), val);
-        }
-
-        public void put(String name, byte val) {
-            primVals[getFieldOffset(name, Byte.TYPE)] = val;
-        }
-
-        public void put(String name, char val) {
-            Bits.putChar(primVals, getFieldOffset(name, Character.TYPE), val);
-        }
-
-        public void put(String name, short val) {
-            Bits.putShort(primVals, getFieldOffset(name, Short.TYPE), val);
-        }
-
-        public void put(String name, int val) {
-            Bits.putInt(primVals, getFieldOffset(name, Integer.TYPE), val);
-        }
-
-        public void put(String name, float val) {
-            Bits.putFloat(primVals, getFieldOffset(name, Float.TYPE), val);
-        }
-
-        public void put(String name, long val) {
-            Bits.putLong(primVals, getFieldOffset(name, Long.TYPE), val);
-        }
-
-        public void put(String name, double val) {
-            Bits.putDouble(primVals, getFieldOffset(name, Double.TYPE), val);
-        }
-
-        public void put(String name, Object val) {
-            objVals[getFieldOffset(name, Object.class)] = val;
-        }
-
-        // deprecated in ObjectOutputStream.PutField
-        public void write(ObjectOutput out) throws IOException {
-            /*
-             * Applications should *not* use this method to write PutField
-             * data, as it will lead to stream corruption if the PutField
-             * object writes any primitive data (since block data mode is not
-             * unset/set properly, as is done in OOS.writeFields()).  This
-             * broken implementation is being retained solely for behavioral
-             * compatibility, in order to support applications which use
-             * OOS.PutField.write() for writing only non-primitive data.
-             *
-             * Serialization of unshared objects is not implemented here since
-             * it is not necessary for backwards compatibility; also, unshared
-             * semantics may not be supported by the given ObjectOutput
-             * instance.  Applications which write unshared objects using the
-             * PutField API must use OOS.writeFields().
-             */
-            if (InteropObjectOutputStream.this != out) {
-                throw new IllegalArgumentException("wrong stream");
-            }
-            out.write(primVals, 0, primVals.length);
-
-            ObjectStreamField[] fields = desc.getFields(false);
-            int numPrimFields = fields.length - objVals.length;
-            // REMIND: warn if numPrimFields > 0?
-            for (int i = 0; i < objVals.length; i++) {
-                if (fields[numPrimFields + i].isUnshared()) {
-                    throw new IOException("cannot write unshared object");
-                }
-                out.writeObject(objVals[i]);
-            }
-        }
-
-        /**
-         * Writes buffered primitive data and object fields to stream.
-         */
-        void writeFields() throws IOException {
-            InteropObjectOutputStream.this.write(primVals, 0, primVals.length);
-
-            ObjectStreamField[] fields = desc.getFields(false);
-            int numPrimFields = fields.length - objVals.length;
-            for (int i = 0; i < objVals.length; i++) {
-                writeObject(objVals[i]);
-            }
-        }
-
-        /**
-         * Returns offset of field with given name and type.  A specified type
-         * of null matches all types, Object.class matches all non-primitive
-         * types, and any other non-null type matches assignable types only.
-         * Throws IllegalArgumentException if no matching field found.
-         */
-        private int getFieldOffset(String name, Class type) {
-            ObjectStreamField field = desc.getField(name, type);
-            if (field == null) {
-                throw new IllegalArgumentException("no such field " + name +
-                                                   " with type " + type);
-            }
-            return field.getOffset();
-        }
-    }
-
-    private static final class ObjectDataOutputStream extends DataOutputStream
-    {
-        /*
-         * States:
-         *  blockStart   objCount
-         *          -1          0       Previous byte was a marker (or we're at the start of the stream), next byte will be MARKER, OBJECTS or BYTES
-         *         >=0          0       We're currently writing a byte stream (that starts at blockStart + 1)
-         *          -1         >0       We're currently writing objects (just a count of objects really)
-         *
-         */
-        private static final byte MARKER = 0;
-        private static final byte OBJECTS = 10;
-        private static final byte BYTES = 20;
-        private final SerializationInfo info;
-        private byte[] buf = new byte[16];
-        private int pos;
-        private int blockStart = -1;
-        private int objCount;
-        private int objId;
-
-        ObjectDataOutputStream(SerializationInfo info)
-        {
-            super(null);
-            out = this;
-            this.info = info;
-        }
-        
-        private void grow(int minGrow)
-        {
-            int newSize = buf.length + Math.max(buf.length, minGrow);
-            byte[] newBuf = new byte[newSize];
-            System.arraycopy(buf, 0, newBuf, 0, pos);
-            buf = newBuf;
-        }
-        
-        private void switchToData()
-        {
-            if (objCount == 0)
-            {
-                if (pos == buf.length)
-                {
-                    grow(1);
-                }
-                buf[pos++] = BYTES;
-            }
-            else
-            {
-                int len = packedLength(objCount);
-                if (pos + len >= buf.length)
-                {
-                    grow(len);
-                }
-                writePacked(pos, objCount);
-                objCount = 0;
-                pos += len;
-            }
-            blockStart = pos;
-            // reserve space for the number of bytes
-            // (we assume that one byte will suffice, but if it won't the endData code will copy the data to make room)
-            if (pos == buf.length)
-            {
-                grow(1);
-            }
-            pos++;
-        }
-        
-        private void endData()
-        {
-            if (blockStart == -1)
-            {
-                if (pos == buf.length)
-                {
-                    grow(1);
-                }
-                buf[pos++] = OBJECTS;
-            }
-            else
-            {
-                int len = (pos - blockStart) - 1;
-                int lenlen = packedLength(len);
-                if (lenlen > 1)
-                {
-                    lenlen--;
-                    if (buf.length - pos <= lenlen)
-                    {
-                        grow(lenlen);
-                    }
-                    System.arraycopy(buf, blockStart + 1, buf, blockStart + 1 + lenlen, pos - (blockStart + 1));
-                    pos += lenlen;
-                }
-                writePacked(blockStart, len);
-                blockStart = -1;
-            }
-        }
-        
-        private int packedLength(int val)
-        {
-            if (val < 0)
-            {
-                // we only use packed integers for lengths or counts, so they can never be negative
-                throw new Error();
-            }
-            else if (val < 128)
-            {
-                return 1;
-            }
-            else if (val < 16129)
-            {
-                return 2;
-            }
-            else
-            {
-                return 5;
-            }
-        }
-        
-        private void writePacked(int pos, int v)
-        {
-            if (v < 128)
-            {
-                buf[pos] = (byte)v;
-            }
-            else if (v < 16129)
-            {
-                buf[pos + 0] = (byte)(128 | (v >> 7));
-                buf[pos + 1] = (byte)(v & 127);
-            }
-            else
-            {
-                buf[pos + 0] = (byte)128;
-                buf[pos + 1] = (byte)(v >>> 24);
-                buf[pos + 2] = (byte)(v >>> 16);
-                buf[pos + 3] = (byte)(v >>>  8);
-                buf[pos + 4] = (byte)(v >>>  0);
-            }
-        }
-        
-        @Override
-        public void write(int b)
-        {
-            if (blockStart == -1)
-            {
-                switchToData();
-            }
-            if (pos == buf.length)
-            {
-                grow(1);
-            }
-            buf[pos++] = (byte)b;
-        }
-        
-        @Override
-        public void write(byte[] b, int off, int len)
-        {
-            if (len == 0)
-            {
-                return;
-            }
-            if (blockStart == -1)
-            {
-                switchToData();
-            }
-            if (pos + len >= buf.length)
-            {
-                grow(len);
-            }
-            System.arraycopy(b, off, buf, pos, len);
-            pos += len;
-        }
-        
-        public void writeObject(Object obj)
-        {
-            if (objCount == 0)
-            {
-                endData();
-            }
-            objCount++;
-            info.AddValue("$" + (objId++), obj);
-        }
-        
-        @Override
-        public void close()
-        {
-            if (objCount == 0)
-            {
-                if (blockStart == -1)
-                {
-                    // we've just written a marker, so we don't need to do anything else
-                }
-                else
-                {
-                    endData();
-                }
-            }
-            else
-            {
-                switchToData();
-            }
-            trim();
-            info.AddValue("$data", buf);
-        }
-        
-        private void trim()
-        {
-            if (buf.length != pos)
-            {
-                byte[] newBuf = new byte[pos];
-                System.arraycopy(buf, 0, newBuf, 0, pos);
-                buf = newBuf;
-            }
-        }
-        
-        @Override
-        public void flush()
-        {
-        }
-        
-        public void writeMarker()
-        {
-            if (objCount == 0)
-            {
-                if (blockStart != -1)
-                {
-                    endData();
-                }
-                if (pos == buf.length)
-                {
-                    grow(1);
-                }
-                buf[pos++] = MARKER;
-            }
-            else
-            {
-                switchToData();
-            }
-            blockStart = -1;
-        }
-    }
-}
diff --git a/openjdk/java/io/ObjectStreamClass.java b/openjdk/java/io/ObjectStreamClass.java
deleted file mode 100644
index 97489b1e..00000000
--- a/openjdk/java/io/ObjectStreamClass.java
+++ /dev/null
@@ -1,2361 +0,0 @@
-/*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-import ikvm.internal.FieldReflectorBase;
-import java.lang.ref.Reference;
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.SoftReference;
-import java.lang.ref.WeakReference;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Member;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Proxy;
-import java.security.AccessController;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import sun.misc.Unsafe;
-import sun.reflect.CallerSensitive;
-import sun.reflect.Reflection;
-import sun.reflect.ReflectionFactory;
-import sun.reflect.misc.ReflectUtil;
-
-/**
- * Serialization's descriptor for classes.  It contains the name and
- * serialVersionUID of the class.  The ObjectStreamClass for a specific class
- * loaded in this Java VM can be found/created using the lookup method.
- *
- * <p>The algorithm to compute the SerialVersionUID is described in
- * <a href="../../../platform/serialization/spec/class.html#4100">Object
- * Serialization Specification, Section 4.6, Stream Unique Identifiers</a>.
- *
- * @author      Mike Warres
- * @author      Roger Riggs
- * @see ObjectStreamField
- * @see <a href="../../../platform/serialization/spec/class.html">Object Serialization Specification, Section 4, Class Descriptors</a>
- * @since   JDK1.1
- */
-public class ObjectStreamClass implements Serializable {
-
-    /** serialPersistentFields value indicating no serializable fields */
-    public static final ObjectStreamField[] NO_FIELDS =
-        new ObjectStreamField[0];
-
-    private static final long serialVersionUID = -6120832682080437368L;
-    private static final ObjectStreamField[] serialPersistentFields =
-        NO_FIELDS;
-
-    /** reflection factory for obtaining serialization constructors */
-    private static final ReflectionFactory reflFactory =
-        AccessController.doPrivileged(
-            new ReflectionFactory.GetReflectionFactoryAction());
-
-    private static class Caches {
-        /** cache mapping local classes -> descriptors */
-        static final ConcurrentMap<WeakClassKey,Reference<?>> localDescs =
-            new ConcurrentHashMap<>();
-
-        /** cache mapping field group/local desc pairs -> field reflectors */
-        static final ConcurrentMap<FieldReflectorKey,Reference<?>> reflectors =
-            new ConcurrentHashMap<>();
-
-        /** queue for WeakReferences to local classes */
-        private static final ReferenceQueue<Class<?>> localDescsQueue =
-            new ReferenceQueue<>();
-        /** queue for WeakReferences to field reflectors keys */
-        private static final ReferenceQueue<Class<?>> reflectorsQueue =
-            new ReferenceQueue<>();
-    }
-
-    /** class associated with this descriptor (if any) */
-    private Class<?> cl;
-    /** name of class represented by this descriptor */
-    private String name;
-    /** serialVersionUID of represented class (null if not computed yet) */
-    private volatile Long suid;
-
-    /** true if represents dynamic proxy class */
-    private boolean isProxy;
-    /** true if represents enum type */
-    private boolean isEnum;
-    /** true if represented class implements Serializable */
-    private boolean serializable;
-    /** true if represented class implements Externalizable */
-    private boolean externalizable;
-    /** true if desc has data written by class-defined writeObject method */
-    private boolean hasWriteObjectData;
-    /**
-     * true if desc has externalizable data written in block data format; this
-     * must be true by default to accommodate ObjectInputStream subclasses which
-     * override readClassDescriptor() to return class descriptors obtained from
-     * ObjectStreamClass.lookup() (see 4461737)
-     */
-    private boolean hasBlockExternalData = true;
-
-    /**
-     * Contains information about InvalidClassException instances to be thrown
-     * when attempting operations on an invalid class. Note that instances of
-     * this class are immutable and are potentially shared among
-     * ObjectStreamClass instances.
-     */
-    private static class ExceptionInfo {
-        private final String className;
-        private final String message;
-
-        ExceptionInfo(String cn, String msg) {
-            className = cn;
-            message = msg;
-        }
-
-        /**
-         * Returns (does not throw) an InvalidClassException instance created
-         * from the information in this object, suitable for being thrown by
-         * the caller.
-         */
-        InvalidClassException newInvalidClassException() {
-            return new InvalidClassException(className, message);
-        }
-    }
-
-    /** exception (if any) thrown while attempting to resolve class */
-    private ClassNotFoundException resolveEx;
-    /** exception (if any) to throw if non-enum deserialization attempted */
-    private ExceptionInfo deserializeEx;
-    /** exception (if any) to throw if non-enum serialization attempted */
-    private ExceptionInfo serializeEx;
-    /** exception (if any) to throw if default serialization attempted */
-    private ExceptionInfo defaultSerializeEx;
-
-    /** serializable fields */
-    private ObjectStreamField[] fields;
-    /** aggregate marshalled size of primitive fields */
-    private int primDataSize;
-    /** number of non-primitive fields */
-    private int numObjFields;
-    /** reflector for setting/getting serializable field values */
-    private FieldReflectorBase fieldRefl;
-    /** data layout of serialized objects described by this class desc */
-    private volatile ClassDataSlot[] dataLayout;
-
-    /** serialization-appropriate constructor, or null if none */
-    private Constructor cons;
-    /** class-defined writeObject method, or null if none */
-    private Method writeObjectMethod;
-    /** class-defined readObject method, or null if none */
-    private Method readObjectMethod;
-    /** class-defined readObjectNoData method, or null if none */
-    private Method readObjectNoDataMethod;
-    /** class-defined writeReplace method, or null if none */
-    private Method writeReplaceMethod;
-    /** class-defined readResolve method, or null if none */
-    private Method readResolveMethod;
-
-    /** local class descriptor for represented class (may point to self) */
-    private ObjectStreamClass localDesc;
-    /** superclass descriptor appearing in stream */
-    private ObjectStreamClass superDesc;
-    
-    /** [IKVM] true if the the class was dynamically loaded from Java bytecode */
-    private boolean dynamicClass;
-
-    /**
-     * Initializes native code.
-     */
-    private static native void initNative();
-    static {
-        initNative();
-    }
-
-    /**
-     * Find the descriptor for a class that can be serialized.  Creates an
-     * ObjectStreamClass instance if one does not exist yet for class. Null is
-     * returned if the specified class does not implement java.io.Serializable
-     * or java.io.Externalizable.
-     *
-     * @param   cl class for which to get the descriptor
-     * @return  the class descriptor for the specified class
-     */
-    public static ObjectStreamClass lookup(Class<?> cl) {
-        return lookup(cl, false);
-    }
-
-    /**
-     * Returns the descriptor for any class, regardless of whether it
-     * implements {@link Serializable}.
-     *
-     * @param        cl class for which to get the descriptor
-     * @return       the class descriptor for the specified class
-     * @since 1.6
-     */
-    public static ObjectStreamClass lookupAny(Class<?> cl) {
-        return lookup(cl, true);
-    }
-
-    /**
-     * Returns the name of the class described by this descriptor.
-     * This method returns the name of the class in the format that
-     * is used by the {@link Class#getName} method.
-     *
-     * @return a string representing the name of the class
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Return the serialVersionUID for this class.  The serialVersionUID
-     * defines a set of classes all with the same name that have evolved from a
-     * common root class and agree to be serialized and deserialized using a
-     * common format.  NonSerializable classes have a serialVersionUID of 0L.
-     *
-     * @return  the SUID of the class described by this descriptor
-     */
-    public long getSerialVersionUID() {
-        // REMIND: synchronize instead of relying on volatile?
-        if (suid == null) {
-            suid = AccessController.doPrivileged(
-                new PrivilegedAction<Long>() {
-                    public Long run() {
-                        return computeDefaultSUID(cl);
-                    }
-                }
-            );
-        }
-        return suid.longValue();
-    }
-
-    /**
-     * Return the class in the local VM that this version is mapped to.  Null
-     * is returned if there is no corresponding local class.
-     *
-     * @return  the <code>Class</code> instance that this descriptor represents
-     */
-    @CallerSensitive
-    public Class<?> forClass() {
-        if (cl == null) {
-            return null;
-        }
-        if (System.getSecurityManager() != null) {
-            Class<?> caller = Reflection.getCallerClass();
-            if (ReflectUtil.needsPackageAccessCheck(caller.getClassLoader(), cl.getClassLoader())) {
-                ReflectUtil.checkPackageAccess(cl);
-            }
-        }
-        return cl;
-    }
-
-    /**
-     * Return an array of the fields of this serializable class.
-     *
-     * @return  an array containing an element for each persistent field of
-     *          this class. Returns an array of length zero if there are no
-     *          fields.
-     * @since 1.2
-     */
-    public ObjectStreamField[] getFields() {
-        return getFields(true);
-    }
-
-    /**
-     * Get the field of this class by name.
-     *
-     * @param   name the name of the data field to look for
-     * @return  The ObjectStreamField object of the named field or null if
-     *          there is no such named field.
-     */
-    public ObjectStreamField getField(String name) {
-        return getField(name, null);
-    }
-
-    /**
-     * Return a string describing this ObjectStreamClass.
-     */
-    public String toString() {
-        return name + ": static final long serialVersionUID = " +
-            getSerialVersionUID() + "L;";
-    }
-
-    /**
-     * Looks up and returns class descriptor for given class, or null if class
-     * is non-serializable and "all" is set to false.
-     *
-     * @param   cl class to look up
-     * @param   all if true, return descriptors for all classes; if false, only
-     *          return descriptors for serializable classes
-     */
-    static ObjectStreamClass lookup(Class<?> cl, boolean all) {
-        if (!(all || Serializable.class.isAssignableFrom(cl))) {
-            return null;
-        }
-        processQueue(Caches.localDescsQueue, Caches.localDescs);
-        WeakClassKey key = new WeakClassKey(cl, Caches.localDescsQueue);
-        Reference<?> ref = Caches.localDescs.get(key);
-        Object entry = null;
-        if (ref != null) {
-            entry = ref.get();
-        }
-        EntryFuture future = null;
-        if (entry == null) {
-            EntryFuture newEntry = new EntryFuture();
-            Reference<?> newRef = new SoftReference<>(newEntry);
-            do {
-                if (ref != null) {
-                    Caches.localDescs.remove(key, ref);
-                }
-                ref = Caches.localDescs.putIfAbsent(key, newRef);
-                if (ref != null) {
-                    entry = ref.get();
-                }
-            } while (ref != null && entry == null);
-            if (entry == null) {
-                future = newEntry;
-            }
-        }
-
-        if (entry instanceof ObjectStreamClass) {  // check common case first
-            return (ObjectStreamClass) entry;
-        }
-        if (entry instanceof EntryFuture) {
-            future = (EntryFuture) entry;
-            if (future.getOwner() == Thread.currentThread()) {
-                /*
-                 * Handle nested call situation described by 4803747: waiting
-                 * for future value to be set by a lookup() call further up the
-                 * stack will result in deadlock, so calculate and set the
-                 * future value here instead.
-                 */
-                entry = null;
-            } else {
-                entry = future.get();
-            }
-        }
-        if (entry == null) {
-            try {
-                entry = new ObjectStreamClass(cl);
-            } catch (Throwable th) {
-                entry = th;
-            }
-            if (future.set(entry)) {
-                Caches.localDescs.put(key, new SoftReference<Object>(entry));
-            } else {
-                // nested lookup call already set future
-                entry = future.get();
-            }
-        }
-
-        if (entry instanceof ObjectStreamClass) {
-            return (ObjectStreamClass) entry;
-        } else if (entry instanceof RuntimeException) {
-            throw (RuntimeException) entry;
-        } else if (entry instanceof Error) {
-            throw (Error) entry;
-        } else {
-            throw new InternalError("unexpected entry: " + entry);
-        }
-    }
-
-    /**
-     * Placeholder used in class descriptor and field reflector lookup tables
-     * for an entry in the process of being initialized.  (Internal) callers
-     * which receive an EntryFuture belonging to another thread as the result
-     * of a lookup should call the get() method of the EntryFuture; this will
-     * return the actual entry once it is ready for use and has been set().  To
-     * conserve objects, EntryFutures synchronize on themselves.
-     */
-    private static class EntryFuture {
-
-        private static final Object unset = new Object();
-        private final Thread owner = Thread.currentThread();
-        private Object entry = unset;
-
-        /**
-         * Attempts to set the value contained by this EntryFuture.  If the
-         * EntryFuture's value has not been set already, then the value is
-         * saved, any callers blocked in the get() method are notified, and
-         * true is returned.  If the value has already been set, then no saving
-         * or notification occurs, and false is returned.
-         */
-        synchronized boolean set(Object entry) {
-            if (this.entry != unset) {
-                return false;
-            }
-            this.entry = entry;
-            notifyAll();
-            return true;
-        }
-
-        /**
-         * Returns the value contained by this EntryFuture, blocking if
-         * necessary until a value is set.
-         */
-        synchronized Object get() {
-            boolean interrupted = false;
-            while (entry == unset) {
-                try {
-                    wait();
-                } catch (InterruptedException ex) {
-                    interrupted = true;
-                }
-            }
-            if (interrupted) {
-                AccessController.doPrivileged(
-                    new PrivilegedAction<Void>() {
-                        public Void run() {
-                            Thread.currentThread().interrupt();
-                            return null;
-                        }
-                    }
-                );
-            }
-            return entry;
-        }
-
-        /**
-         * Returns the thread that created this EntryFuture.
-         */
-        Thread getOwner() {
-            return owner;
-        }
-    }
-
-    /**
-     * Creates local class descriptor representing given class.
-     */
-    private ObjectStreamClass(final Class<?> cl) {
-        this.cl = cl;
-        name = cl.getName();
-        isProxy = Proxy.isProxyClass(cl);
-        isEnum = Enum.class.isAssignableFrom(cl);
-        serializable = Serializable.class.isAssignableFrom(cl);
-        externalizable = Externalizable.class.isAssignableFrom(cl);
-        dynamicClass = isDynamicTypeWrapper(cl);
-
-        Class<?> superCl = cl.getSuperclass();
-        superDesc = (superCl != null) ? lookup(superCl, false) : null;
-        localDesc = this;
-
-        if (serializable) {
-            AccessController.doPrivileged(new PrivilegedAction<Void>() {
-                public Void run() {
-                    if (isEnum) {
-                        suid = Long.valueOf(0);
-                        fields = NO_FIELDS;
-                        return null;
-                    }
-                    if (cl.isArray()) {
-                        fields = NO_FIELDS;
-                        return null;
-                    }
-
-                    suid = getDeclaredSUID(cl);
-                    try {
-                        fields = getSerialFields(cl);
-                        computeFieldOffsets();
-                    } catch (InvalidClassException e) {
-                        serializeEx = deserializeEx =
-                            new ExceptionInfo(e.classname, e.getMessage());
-                        fields = NO_FIELDS;
-                    }
-
-                    if (externalizable) {
-                        cons = getExternalizableConstructor(cl);
-                    } else {
-                        cons = getSerializableConstructor(cl);
-                        writeObjectMethod = getPrivateMethod(cl, "writeObject",
-                            new Class<?>[] { ObjectOutputStream.class },
-                            Void.TYPE);
-                        readObjectMethod = getPrivateMethod(cl, "readObject",
-                            new Class<?>[] { ObjectInputStream.class },
-                            Void.TYPE);
-                        readObjectNoDataMethod = getPrivateMethod(
-                            cl, "readObjectNoData", null, Void.TYPE);
-                        hasWriteObjectData = (writeObjectMethod != null);
-                    }
-                    writeReplaceMethod = getInheritableMethod(
-                        cl, "writeReplace", null, Object.class);
-                    readResolveMethod = getInheritableMethod(
-                        cl, "readResolve", null, Object.class);
-                    return null;
-                }
-            });
-        } else {
-            suid = Long.valueOf(0);
-            fields = NO_FIELDS;
-        }
-
-        try {
-            fieldRefl = getReflector(fields, this);
-        } catch (InvalidClassException ex) {
-            // field mismatches impossible when matching local fields vs. self
-            throw new InternalError();
-        }
-
-        if (deserializeEx == null) {
-            if (isEnum) {
-                deserializeEx = new ExceptionInfo(name, "enum type");
-            } else if (cons == null) {
-                deserializeEx = new ExceptionInfo(name, "no valid constructor");
-            }
-        }
-        for (int i = 0; i < fields.length; i++) {
-            if (fields[i].getField() == null) {
-                defaultSerializeEx = new ExceptionInfo(
-                    name, "unmatched serializable field(s) declared");
-            }
-        }
-    }
-
-    /**
-     * Creates blank class descriptor which should be initialized via a
-     * subsequent call to initProxy(), initNonProxy() or readNonProxy().
-     */
-    ObjectStreamClass() {
-    }
-
-    /**
-     * Initializes class descriptor representing a proxy class.
-     */
-    void initProxy(Class<?> cl,
-                   ClassNotFoundException resolveEx,
-                   ObjectStreamClass superDesc)
-        throws InvalidClassException
-    {
-        this.cl = cl;
-        this.resolveEx = resolveEx;
-        this.superDesc = superDesc;
-        isProxy = true;
-        serializable = true;
-        suid = Long.valueOf(0);
-        fields = NO_FIELDS;
-
-        if (cl != null) {
-            localDesc = lookup(cl, true);
-            if (!localDesc.isProxy) {
-                throw new InvalidClassException(
-                    "cannot bind proxy descriptor to a non-proxy class");
-            }
-            name = localDesc.name;
-            externalizable = localDesc.externalizable;
-            cons = localDesc.cons;
-            writeReplaceMethod = localDesc.writeReplaceMethod;
-            readResolveMethod = localDesc.readResolveMethod;
-            deserializeEx = localDesc.deserializeEx;
-        }
-        fieldRefl = getReflector(fields, localDesc);
-    }
-
-    /**
-     * Initializes class descriptor representing a non-proxy class.
-     */
-    void initNonProxy(ObjectStreamClass model,
-                      Class<?> cl,
-                      ClassNotFoundException resolveEx,
-                      ObjectStreamClass superDesc)
-        throws InvalidClassException
-    {
-        this.cl = cl;
-        this.resolveEx = resolveEx;
-        this.superDesc = superDesc;
-        name = model.name;
-        suid = Long.valueOf(model.getSerialVersionUID());
-        isProxy = false;
-        isEnum = model.isEnum;
-        serializable = model.serializable;
-        externalizable = model.externalizable;
-        hasBlockExternalData = model.hasBlockExternalData;
-        hasWriteObjectData = model.hasWriteObjectData;
-        fields = model.fields;
-        primDataSize = model.primDataSize;
-        numObjFields = model.numObjFields;
-
-        if (cl != null) {
-            localDesc = lookup(cl, true);
-            if (localDesc.isProxy) {
-                throw new InvalidClassException(
-                    "cannot bind non-proxy descriptor to a proxy class");
-            }
-            if (isEnum != localDesc.isEnum) {
-                throw new InvalidClassException(isEnum ?
-                    "cannot bind enum descriptor to a non-enum class" :
-                    "cannot bind non-enum descriptor to an enum class");
-            }
-
-            if (serializable == localDesc.serializable &&
-                !cl.isArray() &&
-                suid.longValue() != localDesc.getSerialVersionUID())
-            {
-                throw new InvalidClassException(localDesc.name,
-                    "local class incompatible: " +
-                    "stream classdesc serialVersionUID = " + suid +
-                    ", local class serialVersionUID = " +
-                    localDesc.getSerialVersionUID());
-            }
-
-            if (!classNamesEqual(name, localDesc.name)) {
-                throw new InvalidClassException(localDesc.name,
-                    "local class name incompatible with stream class " +
-                    "name \"" + name + "\"");
-            }
-
-            if (!isEnum) {
-                if ((serializable == localDesc.serializable) &&
-                    (externalizable != localDesc.externalizable))
-                {
-                    throw new InvalidClassException(localDesc.name,
-                        "Serializable incompatible with Externalizable");
-                }
-
-                if ((serializable != localDesc.serializable) ||
-                    (externalizable != localDesc.externalizable) ||
-                    !(serializable || externalizable))
-                {
-                    deserializeEx = new ExceptionInfo(
-                        localDesc.name, "class invalid for deserialization");
-                }
-            }
-
-            cons = localDesc.cons;
-            writeObjectMethod = localDesc.writeObjectMethod;
-            readObjectMethod = localDesc.readObjectMethod;
-            readObjectNoDataMethod = localDesc.readObjectNoDataMethod;
-            writeReplaceMethod = localDesc.writeReplaceMethod;
-            readResolveMethod = localDesc.readResolveMethod;
-            if (deserializeEx == null) {
-                deserializeEx = localDesc.deserializeEx;
-            }
-        }
-        fieldRefl = getReflector(fields, localDesc);
-        // reassign to matched fields so as to reflect local unshared settings
-        fields = fieldRefl.getFields();
-    }
-
-    /**
-     * Reads non-proxy class descriptor information from given input stream.
-     * The resulting class descriptor is not fully functional; it can only be
-     * used as input to the ObjectInputStream.resolveClass() and
-     * ObjectStreamClass.initNonProxy() methods.
-     */
-    void readNonProxy(ObjectInputStream in)
-        throws IOException, ClassNotFoundException
-    {
-        name = in.readUTF();
-        suid = Long.valueOf(in.readLong());
-        isProxy = false;
-
-        byte flags = in.readByte();
-        hasWriteObjectData =
-            ((flags & ObjectStreamConstants.SC_WRITE_METHOD) != 0);
-        hasBlockExternalData =
-            ((flags & ObjectStreamConstants.SC_BLOCK_DATA) != 0);
-        externalizable =
-            ((flags & ObjectStreamConstants.SC_EXTERNALIZABLE) != 0);
-        boolean sflag =
-            ((flags & ObjectStreamConstants.SC_SERIALIZABLE) != 0);
-        if (externalizable && sflag) {
-            throw new InvalidClassException(
-                name, "serializable and externalizable flags conflict");
-        }
-        serializable = externalizable || sflag;
-        isEnum = ((flags & ObjectStreamConstants.SC_ENUM) != 0);
-        if (isEnum && suid.longValue() != 0L) {
-            throw new InvalidClassException(name,
-                "enum descriptor has non-zero serialVersionUID: " + suid);
-        }
-
-        int numFields = in.readShort();
-        if (isEnum && numFields != 0) {
-            throw new InvalidClassException(name,
-                "enum descriptor has non-zero field count: " + numFields);
-        }
-        fields = (numFields > 0) ?
-            new ObjectStreamField[numFields] : NO_FIELDS;
-        for (int i = 0; i < numFields; i++) {
-            char tcode = (char) in.readByte();
-            String fname = in.readUTF();
-            String signature = ((tcode == 'L') || (tcode == '[')) ?
-                in.readTypeString() : new String(new char[] { tcode });
-            try {
-                fields[i] = new ObjectStreamField(fname, signature, false);
-            } catch (RuntimeException e) {
-                throw (IOException) new InvalidClassException(name,
-                    "invalid descriptor for field " + fname).initCause(e);
-            }
-        }
-        computeFieldOffsets();
-    }
-
-    /**
-     * Writes non-proxy class descriptor information to given output stream.
-     */
-    void writeNonProxy(ObjectOutputStream out) throws IOException {
-        out.writeUTF(name);
-        out.writeLong(getSerialVersionUID());
-
-        byte flags = 0;
-        if (externalizable) {
-            flags |= ObjectStreamConstants.SC_EXTERNALIZABLE;
-            int protocol = out.getProtocolVersion();
-            if (protocol != ObjectStreamConstants.PROTOCOL_VERSION_1) {
-                flags |= ObjectStreamConstants.SC_BLOCK_DATA;
-            }
-        } else if (serializable) {
-            flags |= ObjectStreamConstants.SC_SERIALIZABLE;
-        }
-        if (hasWriteObjectData) {
-            flags |= ObjectStreamConstants.SC_WRITE_METHOD;
-        }
-        if (isEnum) {
-            flags |= ObjectStreamConstants.SC_ENUM;
-        }
-        out.writeByte(flags);
-
-        out.writeShort(fields.length);
-        for (int i = 0; i < fields.length; i++) {
-            ObjectStreamField f = fields[i];
-            out.writeByte(f.getTypeCode());
-            out.writeUTF(f.getName());
-            if (!f.isPrimitive()) {
-                out.writeTypeString(f.getTypeString());
-            }
-        }
-    }
-
-    /**
-     * Returns ClassNotFoundException (if any) thrown while attempting to
-     * resolve local class corresponding to this class descriptor.
-     */
-    ClassNotFoundException getResolveException() {
-        return resolveEx;
-    }
-
-    /**
-     * Throws an InvalidClassException if object instances referencing this
-     * class descriptor should not be allowed to deserialize.  This method does
-     * not apply to deserialization of enum constants.
-     */
-    void checkDeserialize() throws InvalidClassException {
-        if (deserializeEx != null) {
-            throw deserializeEx.newInvalidClassException();
-        }
-    }
-
-    /**
-     * Throws an InvalidClassException if objects whose class is represented by
-     * this descriptor should not be allowed to serialize.  This method does
-     * not apply to serialization of enum constants.
-     */
-    void checkSerialize() throws InvalidClassException {
-        if (serializeEx != null) {
-            throw serializeEx.newInvalidClassException();
-        }
-    }
-
-    /**
-     * Throws an InvalidClassException if objects whose class is represented by
-     * this descriptor should not be permitted to use default serialization
-     * (e.g., if the class declares serializable fields that do not correspond
-     * to actual fields, and hence must use the GetField API).  This method
-     * does not apply to deserialization of enum constants.
-     */
-    void checkDefaultSerialize() throws InvalidClassException {
-        if (defaultSerializeEx != null) {
-            throw defaultSerializeEx.newInvalidClassException();
-        }
-    }
-
-    /**
-     * Returns superclass descriptor.  Note that on the receiving side, the
-     * superclass descriptor may be bound to a class that is not a superclass
-     * of the subclass descriptor's bound class.
-     */
-    ObjectStreamClass getSuperDesc() {
-        return superDesc;
-    }
-
-    /**
-     * Returns the "local" class descriptor for the class associated with this
-     * class descriptor (i.e., the result of
-     * ObjectStreamClass.lookup(this.forClass())) or null if there is no class
-     * associated with this descriptor.
-     */
-    ObjectStreamClass getLocalDesc() {
-        return localDesc;
-    }
-
-    /**
-     * Returns arrays of ObjectStreamFields representing the serializable
-     * fields of the represented class.  If copy is true, a clone of this class
-     * descriptor's field array is returned, otherwise the array itself is
-     * returned.
-     */
-    ObjectStreamField[] getFields(boolean copy) {
-        return copy ? fields.clone() : fields;
-    }
-
-    /**
-     * Looks up a serializable field of the represented class by name and type.
-     * A specified type of null matches all types, Object.class matches all
-     * non-primitive types, and any other non-null type matches assignable
-     * types only.  Returns matching field, or null if no match found.
-     */
-    ObjectStreamField getField(String name, Class<?> type) {
-        for (int i = 0; i < fields.length; i++) {
-            ObjectStreamField f = fields[i];
-            if (f.getName().equals(name)) {
-                if (type == null ||
-                    (type == Object.class && !f.isPrimitive()))
-                {
-                    return f;
-                }
-                Class<?> ftype = f.getType();
-                if (ftype != null && type.isAssignableFrom(ftype)) {
-                    return f;
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns true if class descriptor represents a dynamic proxy class, false
-     * otherwise.
-     */
-    boolean isProxy() {
-        return isProxy;
-    }
-
-    /**
-     * Returns true if class descriptor represents an enum type, false
-     * otherwise.
-     */
-    boolean isEnum() {
-        return isEnum;
-    }
-
-    /**
-     * Returns true if represented class implements Externalizable, false
-     * otherwise.
-     */
-    boolean isExternalizable() {
-        return externalizable;
-    }
-
-    /**
-     * Returns true if represented class implements Serializable, false
-     * otherwise.
-     */
-    boolean isSerializable() {
-        return serializable;
-    }
-
-    /**
-     * Returns true if class descriptor represents externalizable class that
-     * has written its data in 1.2 (block data) format, false otherwise.
-     */
-    boolean hasBlockExternalData() {
-        return hasBlockExternalData;
-    }
-
-    /**
-     * Returns true if class descriptor represents serializable (but not
-     * externalizable) class which has written its data via a custom
-     * writeObject() method, false otherwise.
-     */
-    boolean hasWriteObjectData() {
-        return hasWriteObjectData;
-    }
-
-    /**
-     * Returns true if represented class is serializable/externalizable and can
-     * be instantiated by the serialization runtime--i.e., if it is
-     * externalizable and defines a public no-arg constructor, or if it is
-     * non-externalizable and its first non-serializable superclass defines an
-     * accessible no-arg constructor.  Otherwise, returns false.
-     */
-    boolean isInstantiable() {
-        return (cons != null);
-    }
-
-    /**
-     * Returns true if represented class is serializable (but not
-     * externalizable) and defines a conformant writeObject method.  Otherwise,
-     * returns false.
-     */
-    boolean hasWriteObjectMethod() {
-        return (writeObjectMethod != null);
-    }
-
-    /**
-     * Returns true if represented class is serializable (but not
-     * externalizable) and defines a conformant readObject method.  Otherwise,
-     * returns false.
-     */
-    boolean hasReadObjectMethod() {
-        return (readObjectMethod != null);
-    }
-
-    /**
-     * Returns true if represented class is serializable (but not
-     * externalizable) and defines a conformant readObjectNoData method.
-     * Otherwise, returns false.
-     */
-    boolean hasReadObjectNoDataMethod() {
-        return (readObjectNoDataMethod != null);
-    }
-
-    /**
-     * Returns true if represented class is serializable or externalizable and
-     * defines a conformant writeReplace method.  Otherwise, returns false.
-     */
-    boolean hasWriteReplaceMethod() {
-        return (writeReplaceMethod != null);
-    }
-
-    /**
-     * Returns true if represented class is serializable or externalizable and
-     * defines a conformant readResolve method.  Otherwise, returns false.
-     */
-    boolean hasReadResolveMethod() {
-        return (readResolveMethod != null);
-    }
-
-    /**
-     * Creates a new instance of the represented class.  If the class is
-     * externalizable, invokes its public no-arg constructor; otherwise, if the
-     * class is serializable, invokes the no-arg constructor of the first
-     * non-serializable superclass.  Throws UnsupportedOperationException if
-     * this class descriptor is not associated with a class, if the associated
-     * class is non-serializable or if the appropriate no-arg constructor is
-     * inaccessible/unavailable.
-     */
-    Object newInstance()
-        throws InstantiationException, InvocationTargetException,
-               UnsupportedOperationException
-    {
-        if (cons != null) {
-            try {
-                return cons.newInstance();
-            } catch (IllegalAccessException ex) {
-                // should not occur, as access checks have been suppressed
-                throw new InternalError();
-            }
-        } else {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    /**
-     * Invokes the writeObject method of the represented serializable class.
-     * Throws UnsupportedOperationException if this class descriptor is not
-     * associated with a class, or if the class is externalizable,
-     * non-serializable or does not define writeObject.
-     */
-    void invokeWriteObject(Object obj, ObjectOutputStream out)
-        throws IOException, UnsupportedOperationException
-    {
-        if (writeObjectMethod != null) {
-            try {
-                writeObjectMethod.invoke(obj, new Object[]{ out });
-            } catch (InvocationTargetException ex) {
-                Throwable th = ex.getTargetException();
-                if (th instanceof IOException) {
-                    throw (IOException) th;
-                } else {
-                    throwMiscException(th);
-                }
-            } catch (IllegalAccessException ex) {
-                // should not occur, as access checks have been suppressed
-                throw new InternalError();
-            }
-        } else {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    /**
-     * Invokes the readObject method of the represented serializable class.
-     * Throws UnsupportedOperationException if this class descriptor is not
-     * associated with a class, or if the class is externalizable,
-     * non-serializable or does not define readObject.
-     */
-    void invokeReadObject(Object obj, ObjectInputStream in)
-        throws ClassNotFoundException, IOException,
-               UnsupportedOperationException
-    {
-        if (readObjectMethod != null) {
-            try {
-                readObjectMethod.invoke(obj, new Object[]{ in });
-            } catch (InvocationTargetException ex) {
-                Throwable th = ex.getTargetException();
-                if (th instanceof ClassNotFoundException) {
-                    throw (ClassNotFoundException) th;
-                } else if (th instanceof IOException) {
-                    throw (IOException) th;
-                } else {
-                    throwMiscException(th);
-                }
-            } catch (IllegalAccessException ex) {
-                // should not occur, as access checks have been suppressed
-                throw new InternalError();
-            }
-        } else {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    /**
-     * Invokes the readObjectNoData method of the represented serializable
-     * class.  Throws UnsupportedOperationException if this class descriptor is
-     * not associated with a class, or if the class is externalizable,
-     * non-serializable or does not define readObjectNoData.
-     */
-    void invokeReadObjectNoData(Object obj)
-        throws IOException, UnsupportedOperationException
-    {
-        if (readObjectNoDataMethod != null) {
-            try {
-                readObjectNoDataMethod.invoke(obj, (Object[]) null);
-            } catch (InvocationTargetException ex) {
-                Throwable th = ex.getTargetException();
-                if (th instanceof ObjectStreamException) {
-                    throw (ObjectStreamException) th;
-                } else {
-                    throwMiscException(th);
-                }
-            } catch (IllegalAccessException ex) {
-                // should not occur, as access checks have been suppressed
-                throw new InternalError();
-            }
-        } else {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    /**
-     * Invokes the writeReplace method of the represented serializable class and
-     * returns the result.  Throws UnsupportedOperationException if this class
-     * descriptor is not associated with a class, or if the class is
-     * non-serializable or does not define writeReplace.
-     */
-    Object invokeWriteReplace(Object obj)
-        throws IOException, UnsupportedOperationException
-    {
-        if (writeReplaceMethod != null) {
-            try {
-                return writeReplaceMethod.invoke(obj, (Object[]) null);
-            } catch (InvocationTargetException ex) {
-                Throwable th = ex.getTargetException();
-                if (th instanceof ObjectStreamException) {
-                    throw (ObjectStreamException) th;
-                } else {
-                    throwMiscException(th);
-                    throw new InternalError();  // never reached
-                }
-            } catch (IllegalAccessException ex) {
-                // should not occur, as access checks have been suppressed
-                throw new InternalError();
-            }
-        } else {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    /**
-     * Invokes the readResolve method of the represented serializable class and
-     * returns the result.  Throws UnsupportedOperationException if this class
-     * descriptor is not associated with a class, or if the class is
-     * non-serializable or does not define readResolve.
-     */
-    Object invokeReadResolve(Object obj)
-        throws IOException, UnsupportedOperationException
-    {
-        if (readResolveMethod != null) {
-            try {
-                return readResolveMethod.invoke(obj, (Object[]) null);
-            } catch (InvocationTargetException ex) {
-                Throwable th = ex.getTargetException();
-                if (th instanceof ObjectStreamException) {
-                    throw (ObjectStreamException) th;
-                } else {
-                    throwMiscException(th);
-                    throw new InternalError();  // never reached
-                }
-            } catch (IllegalAccessException ex) {
-                // should not occur, as access checks have been suppressed
-                throw new InternalError();
-            }
-        } else {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    /**
-     * Class representing the portion of an object's serialized form allotted
-     * to data described by a given class descriptor.  If "hasData" is false,
-     * the object's serialized form does not contain data associated with the
-     * class descriptor.
-     */
-    static class ClassDataSlot {
-
-        /** class descriptor "occupying" this slot */
-        final ObjectStreamClass desc;
-        /** true if serialized form includes data for this slot's descriptor */
-        final boolean hasData;
-
-        ClassDataSlot(ObjectStreamClass desc, boolean hasData) {
-            this.desc = desc;
-            this.hasData = hasData;
-        }
-    }
-
-    /**
-     * Returns array of ClassDataSlot instances representing the data layout
-     * (including superclass data) for serialized objects described by this
-     * class descriptor.  ClassDataSlots are ordered by inheritance with those
-     * containing "higher" superclasses appearing first.  The final
-     * ClassDataSlot contains a reference to this descriptor.
-     */
-    ClassDataSlot[] getClassDataLayout() throws InvalidClassException {
-        // REMIND: synchronize instead of relying on volatile?
-        if (dataLayout == null) {
-            dataLayout = getClassDataLayout0();
-        }
-        return dataLayout;
-    }
-
-    private ClassDataSlot[] getClassDataLayout0()
-        throws InvalidClassException
-    {
-        ArrayList<ClassDataSlot> slots = new ArrayList<>();
-        Class<?> start = cl, end = cl;
-
-        // locate closest non-serializable superclass
-        while (end != null && Serializable.class.isAssignableFrom(end)) {
-            end = end.getSuperclass();
-        }
-
-        HashSet<String> oscNames = new HashSet<>(3);
-
-        for (ObjectStreamClass d = this; d != null; d = d.superDesc) {
-            if (oscNames.contains(d.name)) {
-                throw new InvalidClassException("Circular reference.");
-            } else {
-                oscNames.add(d.name);
-            }
-
-            // search up inheritance hierarchy for class with matching name
-            String searchName = (d.cl != null) ? d.cl.getName() : d.name;
-            Class<?> match = null;
-            for (Class<?> c = start; c != end; c = c.getSuperclass()) {
-                if (searchName.equals(c.getName())) {
-                    match = c;
-                    break;
-                }
-            }
-
-            // add "no data" slot for each unmatched class below match
-            if (match != null) {
-                for (Class<?> c = start; c != match; c = c.getSuperclass()) {
-                    slots.add(new ClassDataSlot(
-                        ObjectStreamClass.lookup(c, true), false));
-                }
-                start = match.getSuperclass();
-            }
-
-            // record descriptor/class pairing
-            slots.add(new ClassDataSlot(d.getVariantFor(match), true));
-        }
-
-        // add "no data" slot for any leftover unmatched classes
-        for (Class<?> c = start; c != end; c = c.getSuperclass()) {
-            slots.add(new ClassDataSlot(
-                ObjectStreamClass.lookup(c, true), false));
-        }
-
-        // order slots from superclass -> subclass
-        Collections.reverse(slots);
-        return slots.toArray(new ClassDataSlot[slots.size()]);
-    }
-
-    /**
-     * Returns aggregate size (in bytes) of marshalled primitive field values
-     * for represented class.
-     */
-    int getPrimDataSize() {
-        return primDataSize;
-    }
-
-    /**
-     * Returns number of non-primitive serializable fields of represented
-     * class.
-     */
-    int getNumObjFields() {
-        return numObjFields;
-    }
-
-    /**
-     * Fetches the serializable primitive field values of object obj and
-     * marshals them into byte array buf starting at offset 0.  It is the
-     * responsibility of the caller to ensure that obj is of the proper type if
-     * non-null.
-     */
-    void getPrimFieldValues(Object obj, byte[] buf) {
-        fieldRefl.getPrimFieldValues(obj, buf);
-    }
-
-    /**
-     * Sets the serializable primitive fields of object obj using values
-     * unmarshalled from byte array buf starting at offset 0.  It is the
-     * responsibility of the caller to ensure that obj is of the proper type if
-     * non-null.
-     */
-    void setPrimFieldValues(Object obj, byte[] buf) {
-        fieldRefl.setPrimFieldValues(obj, buf);
-    }
-
-    /**
-     * Fetches the serializable object field values of object obj and stores
-     * them in array vals starting at offset 0.  It is the responsibility of
-     * the caller to ensure that obj is of the proper type if non-null.
-     */
-    void getObjFieldValues(Object obj, Object[] vals) {
-        fieldRefl.getObjFieldValues(obj, vals);
-    }
-
-    /**
-     * Sets the serializable object fields of object obj using values from
-     * array vals starting at offset 0.  It is the responsibility of the caller
-     * to ensure that obj is of the proper type if non-null.
-     */
-    void setObjFieldValues(Object obj, Object[] vals) {
-        fieldRefl.setObjFieldValues(obj, vals);
-    }
-
-    /**
-     * Calculates and sets serializable field offsets, as well as primitive
-     * data size and object field count totals.  Throws InvalidClassException
-     * if fields are illegally ordered.
-     */
-    private void computeFieldOffsets() throws InvalidClassException {
-        primDataSize = 0;
-        numObjFields = 0;
-        int firstObjIndex = -1;
-
-        for (int i = 0; i < fields.length; i++) {
-            ObjectStreamField f = fields[i];
-            switch (f.getTypeCode()) {
-                case 'Z':
-                case 'B':
-                    f.setOffset(primDataSize++);
-                    break;
-
-                case 'C':
-                case 'S':
-                    f.setOffset(primDataSize);
-                    primDataSize += 2;
-                    break;
-
-                case 'I':
-                case 'F':
-                    f.setOffset(primDataSize);
-                    primDataSize += 4;
-                    break;
-
-                case 'J':
-                case 'D':
-                    f.setOffset(primDataSize);
-                    primDataSize += 8;
-                    break;
-
-                case '[':
-                case 'L':
-                    f.setOffset(numObjFields++);
-                    if (firstObjIndex == -1) {
-                        firstObjIndex = i;
-                    }
-                    break;
-
-                default:
-                    throw new InternalError();
-            }
-        }
-        if (firstObjIndex != -1 &&
-            firstObjIndex + numObjFields != fields.length)
-        {
-            throw new InvalidClassException(name, "illegal field order");
-        }
-    }
-
-    /**
-     * If given class is the same as the class associated with this class
-     * descriptor, returns reference to this class descriptor.  Otherwise,
-     * returns variant of this class descriptor bound to given class.
-     */
-    private ObjectStreamClass getVariantFor(Class<?> cl)
-        throws InvalidClassException
-    {
-        if (this.cl == cl) {
-            return this;
-        }
-        ObjectStreamClass desc = new ObjectStreamClass();
-        if (isProxy) {
-            desc.initProxy(cl, null, superDesc);
-        } else {
-            desc.initNonProxy(this, cl, null, superDesc);
-        }
-        return desc;
-    }
-
-    /**
-     * Returns public no-arg constructor of given class, or null if none found.
-     * Access checks are disabled on the returned constructor (if any), since
-     * the defining class may still be non-public.
-     */
-    private static Constructor getExternalizableConstructor(Class<?> cl) {
-        try {
-            Constructor cons = cl.getDeclaredConstructor((Class<?>[]) null);
-            cons.setAccessible(true);
-            return ((cons.getModifiers() & Modifier.PUBLIC) != 0) ?
-                cons : null;
-        } catch (NoSuchMethodException ex) {
-            return null;
-        }
-    }
-
-    /**
-     * Returns subclass-accessible no-arg constructor of first non-serializable
-     * superclass, or null if none found.  Access checks are disabled on the
-     * returned constructor (if any).
-     */
-    private static Constructor getSerializableConstructor(Class<?> cl) {
-        Class<?> initCl = cl;
-        while (Serializable.class.isAssignableFrom(initCl)) {
-            if ((initCl = initCl.getSuperclass()) == null) {
-                return null;
-            }
-        }
-        try {
-            Constructor cons = initCl.getDeclaredConstructor((Class<?>[]) null);
-            int mods = cons.getModifiers();
-            if ((mods & Modifier.PRIVATE) != 0 ||
-                ((mods & (Modifier.PUBLIC | Modifier.PROTECTED)) == 0 &&
-                 !packageEquals(cl, initCl)))
-            {
-                return null;
-            }
-            cons = reflFactory.newConstructorForSerialization(cl, cons);
-            cons.setAccessible(true);
-            return cons;
-        } catch (NoSuchMethodException ex) {
-            return null;
-        }
-    }
-
-    /**
-     * Returns non-static, non-abstract method with given signature provided it
-     * is defined by or accessible (via inheritance) by the given class, or
-     * null if no match found.  Access checks are disabled on the returned
-     * method (if any).
-     */
-    private static Method getInheritableMethod(Class<?> cl, String name,
-                                               Class<?>[] argTypes,
-                                               Class<?> returnType)
-    {
-        Method meth = null;
-        Class<?> defCl = cl;
-        while (defCl != null) {
-            try {
-                meth = defCl.getDeclaredMethod(name, argTypes);
-                break;
-            } catch (NoSuchMethodException ex) {
-                defCl = defCl.getSuperclass();
-            }
-        }
-
-        if ((meth == null) || (meth.getReturnType() != returnType)) {
-            return null;
-        }
-        meth.setAccessible(true);
-        int mods = meth.getModifiers();
-        if ((mods & (Modifier.STATIC | Modifier.ABSTRACT)) != 0) {
-            return null;
-        } else if ((mods & (Modifier.PUBLIC | Modifier.PROTECTED)) != 0) {
-            return meth;
-        } else if ((mods & Modifier.PRIVATE) != 0) {
-            return (cl == defCl) ? meth : null;
-        } else {
-            return packageEquals(cl, defCl) ? meth : null;
-        }
-    }
-
-    /**
-     * Returns non-static private method with given signature defined by given
-     * class, or null if none found.  Access checks are disabled on the
-     * returned method (if any).
-     */
-    private static Method getPrivateMethod(Class<?> cl, String name,
-                                           Class<?>[] argTypes,
-                                           Class<?> returnType)
-    {
-        try {
-            Method meth = cl.getDeclaredMethod(name, argTypes);
-            meth.setAccessible(true);
-            int mods = meth.getModifiers();
-            return ((meth.getReturnType() == returnType) &&
-                    ((mods & Modifier.STATIC) == 0) &&
-                    ((mods & Modifier.PRIVATE) != 0)) ? meth : null;
-        } catch (NoSuchMethodException ex) {
-            return null;
-        }
-    }
-
-    /**
-     * Returns true if classes are defined in the same runtime package, false
-     * otherwise.
-     */
-    private static boolean packageEquals(Class<?> cl1, Class<?> cl2) {
-        return (cl1.getClassLoader() == cl2.getClassLoader() &&
-                getPackageName(cl1).equals(getPackageName(cl2)));
-    }
-
-    /**
-     * Returns package name of given class.
-     */
-    private static String getPackageName(Class<?> cl) {
-        String s = cl.getName();
-        int i = s.lastIndexOf('[');
-        if (i >= 0) {
-            s = s.substring(i + 2);
-        }
-        i = s.lastIndexOf('.');
-        return (i >= 0) ? s.substring(0, i) : "";
-    }
-
-    /**
-     * Compares class names for equality, ignoring package names.  Returns true
-     * if class names equal, false otherwise.
-     */
-    private static boolean classNamesEqual(String name1, String name2) {
-        name1 = name1.substring(name1.lastIndexOf('.') + 1);
-        name2 = name2.substring(name2.lastIndexOf('.') + 1);
-        return name1.equals(name2);
-    }
-
-    /**
-     * Returns JVM type signature for given class.
-     */
-    private static String getClassSignature(Class<?> cl) {
-        StringBuilder sbuf = new StringBuilder();
-        while (cl.isArray()) {
-            sbuf.append('[');
-            cl = cl.getComponentType();
-        }
-        if (cl.isPrimitive()) {
-            if (cl == Integer.TYPE) {
-                sbuf.append('I');
-            } else if (cl == Byte.TYPE) {
-                sbuf.append('B');
-            } else if (cl == Long.TYPE) {
-                sbuf.append('J');
-            } else if (cl == Float.TYPE) {
-                sbuf.append('F');
-            } else if (cl == Double.TYPE) {
-                sbuf.append('D');
-            } else if (cl == Short.TYPE) {
-                sbuf.append('S');
-            } else if (cl == Character.TYPE) {
-                sbuf.append('C');
-            } else if (cl == Boolean.TYPE) {
-                sbuf.append('Z');
-            } else if (cl == Void.TYPE) {
-                sbuf.append('V');
-            } else {
-                throw new InternalError();
-            }
-        } else {
-            sbuf.append('L' + cl.getName().replace('.', '/') + ';');
-        }
-        return sbuf.toString();
-    }
-
-    /**
-     * Returns JVM type signature for given list of parameters and return type.
-     */
-    private static String getMethodSignature(Class<?>[] paramTypes,
-                                             Class<?> retType)
-    {
-        StringBuilder sbuf = new StringBuilder();
-        sbuf.append('(');
-        for (int i = 0; i < paramTypes.length; i++) {
-            sbuf.append(getClassSignature(paramTypes[i]));
-        }
-        sbuf.append(')');
-        sbuf.append(getClassSignature(retType));
-        return sbuf.toString();
-    }
-
-    /**
-     * Convenience method for throwing an exception that is either a
-     * RuntimeException, Error, or of some unexpected type (in which case it is
-     * wrapped inside an IOException).
-     */
-    private static void throwMiscException(Throwable th) throws IOException {
-        if (th instanceof RuntimeException) {
-            throw (RuntimeException) th;
-        } else if (th instanceof Error) {
-            throw (Error) th;
-        } else {
-            IOException ex = new IOException("unexpected exception type");
-            ex.initCause(th);
-            throw ex;
-        }
-    }
-
-    /**
-     * Returns ObjectStreamField array describing the serializable fields of
-     * the given class.  Serializable fields backed by an actual field of the
-     * class are represented by ObjectStreamFields with corresponding non-null
-     * Field objects.  Throws InvalidClassException if the (explicitly
-     * declared) serializable fields are invalid.
-     */
-    private static ObjectStreamField[] getSerialFields(Class<?> cl)
-        throws InvalidClassException
-    {
-        ObjectStreamField[] fields;
-        if (Serializable.class.isAssignableFrom(cl) &&
-            !Externalizable.class.isAssignableFrom(cl) &&
-            !Proxy.isProxyClass(cl) &&
-            !cl.isInterface())
-        {
-            if ((fields = getDeclaredSerialFields(cl)) == null) {
-                fields = getDefaultSerialFields(cl);
-            }
-            Arrays.sort(fields);
-        } else {
-            fields = NO_FIELDS;
-        }
-        return fields;
-    }
-
-    /**
-     * Returns serializable fields of given class as defined explicitly by a
-     * "serialPersistentFields" field, or null if no appropriate
-     * "serialPersistentFields" field is defined.  Serializable fields backed
-     * by an actual field of the class are represented by ObjectStreamFields
-     * with corresponding non-null Field objects.  For compatibility with past
-     * releases, a "serialPersistentFields" field with a null value is
-     * considered equivalent to not declaring "serialPersistentFields".  Throws
-     * InvalidClassException if the declared serializable fields are
-     * invalid--e.g., if multiple fields share the same name.
-     */
-    private static ObjectStreamField[] getDeclaredSerialFields(Class<?> cl)
-        throws InvalidClassException
-    {
-        ObjectStreamField[] serialPersistentFields = null;
-        try {
-            Field f = cl.getDeclaredField("serialPersistentFields");
-            int mask = Modifier.PRIVATE | Modifier.STATIC | Modifier.FINAL;
-            if ((f.getModifiers() & mask) == mask) {
-                f.setAccessible(true);
-                serialPersistentFields = (ObjectStreamField[]) f.get(null);
-            }
-        } catch (Exception ex) {
-        }
-        if (serialPersistentFields == null) {
-            return null;
-        } else if (serialPersistentFields.length == 0) {
-            return NO_FIELDS;
-        }
-
-        ObjectStreamField[] boundFields =
-            new ObjectStreamField[serialPersistentFields.length];
-        Set<String> fieldNames = new HashSet<>(serialPersistentFields.length);
-
-        for (int i = 0; i < serialPersistentFields.length; i++) {
-            ObjectStreamField spf = serialPersistentFields[i];
-
-            String fname = spf.getName();
-            if (fieldNames.contains(fname)) {
-                throw new InvalidClassException(
-                    "multiple serializable fields named " + fname);
-            }
-            fieldNames.add(fname);
-
-            try {
-                Field f = cl.getDeclaredField(fname);
-                if ((f.getType() == spf.getType()) &&
-                    ((f.getModifiers() & Modifier.STATIC) == 0))
-                {
-                    boundFields[i] =
-                        new ObjectStreamField(f, spf.isUnshared(), true);
-                }
-            } catch (NoSuchFieldException ex) {
-            }
-            if (boundFields[i] == null) {
-                boundFields[i] = new ObjectStreamField(
-                    fname, spf.getType(), spf.isUnshared());
-            }
-        }
-        return boundFields;
-    }
-
-    /**
-     * Returns array of ObjectStreamFields corresponding to all non-static
-     * non-transient fields declared by given class.  Each ObjectStreamField
-     * contains a Field object for the field it represents.  If no default
-     * serializable fields exist, NO_FIELDS is returned.
-     */
-    private static ObjectStreamField[] getDefaultSerialFields(Class<?> cl) {
-        Field[] clFields = cl.getDeclaredFields();
-        ArrayList<ObjectStreamField> list = new ArrayList<>();
-        int mask = Modifier.STATIC | Modifier.TRANSIENT;
-
-        for (int i = 0; i < clFields.length; i++) {
-            if ((clFields[i].getModifiers() & mask) == 0) {
-                list.add(new ObjectStreamField(clFields[i], false, true));
-            }
-        }
-        int size = list.size();
-        return (size == 0) ? NO_FIELDS :
-            list.toArray(new ObjectStreamField[size]);
-    }
-
-    /**
-     * Returns explicit serial version UID value declared by given class, or
-     * null if none.
-     */
-    private static Long getDeclaredSUID(Class<?> cl) {
-        try {
-            Field f = cl.getDeclaredField("serialVersionUID");
-            int mask = Modifier.STATIC | Modifier.FINAL;
-            if ((f.getModifiers() & mask) == mask) {
-                f.setAccessible(true);
-                return Long.valueOf(f.getLong(null));
-            }
-        } catch (Exception ex) {
-        }
-        return null;
-    }
-
-    /**
-     * Computes the default serial version UID value for the given class.
-     */
-    private static long computeDefaultSUID(Class<?> cl) {
-        if (!Serializable.class.isAssignableFrom(cl) || Proxy.isProxyClass(cl))
-        {
-            return 0L;
-        }
-
-        try {
-            ByteArrayOutputStream bout = new ByteArrayOutputStream();
-            DataOutputStream dout = new DataOutputStream(bout);
-
-            dout.writeUTF(cl.getName());
-
-            int classMods = cl.getModifiers() &
-                (Modifier.PUBLIC | Modifier.FINAL |
-                 Modifier.INTERFACE | Modifier.ABSTRACT);
-
-            /*
-             * compensate for javac bug in which ABSTRACT bit was set for an
-             * interface only if the interface declared methods
-             */
-            Method[] methods = cl.getDeclaredMethods();
-            if ((classMods & Modifier.INTERFACE) != 0) {
-                classMods = (methods.length > 0) ?
-                    (classMods | Modifier.ABSTRACT) :
-                    (classMods & ~Modifier.ABSTRACT);
-            }
-            dout.writeInt(classMods);
-
-            if (!cl.isArray()) {
-                /*
-                 * compensate for change in 1.2FCS in which
-                 * Class.getInterfaces() was modified to return Cloneable and
-                 * Serializable for array classes.
-                 */
-                Class<?>[] interfaces = cl.getInterfaces();
-                String[] ifaceNames = new String[interfaces.length];
-                for (int i = 0; i < interfaces.length; i++) {
-                    ifaceNames[i] = interfaces[i].getName();
-                }
-                Arrays.sort(ifaceNames);
-                for (int i = 0; i < ifaceNames.length; i++) {
-                    dout.writeUTF(ifaceNames[i]);
-                }
-            }
-
-            Field[] fields = cl.getDeclaredFields();
-            MemberSignature[] fieldSigs = new MemberSignature[fields.length];
-            for (int i = 0; i < fields.length; i++) {
-                fieldSigs[i] = new MemberSignature(fields[i]);
-            }
-            Arrays.sort(fieldSigs, new Comparator<MemberSignature>() {
-                public int compare(MemberSignature ms1, MemberSignature ms2) {
-                    return ms1.name.compareTo(ms2.name);
-                }
-            });
-            for (int i = 0; i < fieldSigs.length; i++) {
-                MemberSignature sig = fieldSigs[i];
-                int mods = sig.member.getModifiers() &
-                    (Modifier.PUBLIC | Modifier.PRIVATE | Modifier.PROTECTED |
-                     Modifier.STATIC | Modifier.FINAL | Modifier.VOLATILE |
-                     Modifier.TRANSIENT);
-                if (((mods & Modifier.PRIVATE) == 0) ||
-                    ((mods & (Modifier.STATIC | Modifier.TRANSIENT)) == 0))
-                {
-                    dout.writeUTF(sig.name);
-                    dout.writeInt(mods);
-                    dout.writeUTF(sig.signature);
-                }
-            }
-
-            if (hasStaticInitializer(cl)) {
-                dout.writeUTF("<clinit>");
-                dout.writeInt(Modifier.STATIC);
-                dout.writeUTF("()V");
-            }
-
-            Constructor[] cons = cl.getDeclaredConstructors();
-            MemberSignature[] consSigs = new MemberSignature[cons.length];
-            for (int i = 0; i < cons.length; i++) {
-                consSigs[i] = new MemberSignature(cons[i]);
-            }
-            Arrays.sort(consSigs, new Comparator<MemberSignature>() {
-                public int compare(MemberSignature ms1, MemberSignature ms2) {
-                    return ms1.signature.compareTo(ms2.signature);
-                }
-            });
-            for (int i = 0; i < consSigs.length; i++) {
-                MemberSignature sig = consSigs[i];
-                int mods = sig.member.getModifiers() &
-                    (Modifier.PUBLIC | Modifier.PRIVATE | Modifier.PROTECTED |
-                     Modifier.STATIC | Modifier.FINAL |
-                     Modifier.SYNCHRONIZED | Modifier.NATIVE |
-                     Modifier.ABSTRACT | Modifier.STRICT);
-                if ((mods & Modifier.PRIVATE) == 0) {
-                    dout.writeUTF("<init>");
-                    dout.writeInt(mods);
-                    dout.writeUTF(sig.signature.replace('/', '.'));
-                }
-            }
-
-            MemberSignature[] methSigs = new MemberSignature[methods.length];
-            for (int i = 0; i < methods.length; i++) {
-                methSigs[i] = new MemberSignature(methods[i]);
-            }
-            Arrays.sort(methSigs, new Comparator<MemberSignature>() {
-                public int compare(MemberSignature ms1, MemberSignature ms2) {
-                    int comp = ms1.name.compareTo(ms2.name);
-                    if (comp == 0) {
-                        comp = ms1.signature.compareTo(ms2.signature);
-                    }
-                    return comp;
-                }
-            });
-            for (int i = 0; i < methSigs.length; i++) {
-                MemberSignature sig = methSigs[i];
-                int mods = sig.member.getModifiers() &
-                    (Modifier.PUBLIC | Modifier.PRIVATE | Modifier.PROTECTED |
-                     Modifier.STATIC | Modifier.FINAL |
-                     Modifier.SYNCHRONIZED | Modifier.NATIVE |
-                     Modifier.ABSTRACT | Modifier.STRICT);
-                if ((mods & Modifier.PRIVATE) == 0) {
-                    dout.writeUTF(sig.name);
-                    dout.writeInt(mods);
-                    dout.writeUTF(sig.signature.replace('/', '.'));
-                }
-            }
-
-            dout.flush();
-
-            MessageDigest md = MessageDigest.getInstance("SHA");
-            byte[] hashBytes = md.digest(bout.toByteArray());
-            long hash = 0;
-            for (int i = Math.min(hashBytes.length, 8) - 1; i >= 0; i--) {
-                hash = (hash << 8) | (hashBytes[i] & 0xFF);
-            }
-            return hash;
-        } catch (IOException ex) {
-            throw new InternalError();
-        } catch (NoSuchAlgorithmException ex) {
-            throw new SecurityException(ex.getMessage());
-        }
-    }
-
-    /**
-     * Returns true if the given class defines a static initializer method,
-     * false otherwise.
-     */
-    private native static boolean hasStaticInitializer(Class<?> cl);
-
-    /**
-     * Class for computing and caching field/constructor/method signatures
-     * during serialVersionUID calculation.
-     */
-    private static class MemberSignature {
-
-        public final Member member;
-        public final String name;
-        public final String signature;
-
-        public MemberSignature(Field field) {
-            member = field;
-            name = field.getName();
-            signature = getClassSignature(field.getType());
-        }
-
-        public MemberSignature(Constructor cons) {
-            member = cons;
-            name = cons.getName();
-            signature = getMethodSignature(
-                cons.getParameterTypes(), Void.TYPE);
-        }
-
-        public MemberSignature(Method meth) {
-            member = meth;
-            name = meth.getName();
-            signature = getMethodSignature(
-                meth.getParameterTypes(), meth.getReturnType());
-        }
-    }
-
-    /**
-     * Class for setting and retrieving serializable field values in batch.
-     */
-    // REMIND: dynamically generate these?
-    private static class FieldReflector extends FieldReflectorBase {
-
-        /** handle for performing unsafe operations */
-        private static final Unsafe unsafe = Unsafe.getUnsafe();
-
-        /** fields to operate on */
-        private final ObjectStreamField[] fields;
-        /** number of primitive fields */
-        private final int numPrimFields;
-        /** unsafe field keys for reading fields - may contain dupes */
-        private final long[] readKeys;
-        /** unsafe fields keys for writing fields - no dupes */
-        private final long[] writeKeys;
-        /** field data offsets */
-        private final int[] offsets;
-        /** field type codes */
-        private final char[] typeCodes;
-        /** field types */
-        private final Class<?>[] types;
-
-        /**
-         * Constructs FieldReflector capable of setting/getting values from the
-         * subset of fields whose ObjectStreamFields contain non-null
-         * reflective Field objects.  ObjectStreamFields with null Fields are
-         * treated as filler, for which get operations return default values
-         * and set operations discard given values.
-         */
-        FieldReflector(ObjectStreamField[] fields) {
-            this.fields = fields;
-            int nfields = fields.length;
-            readKeys = new long[nfields];
-            writeKeys = new long[nfields];
-            offsets = new int[nfields];
-            typeCodes = new char[nfields];
-            ArrayList<Class<?>> typeList = new ArrayList<>();
-            Set<Long> usedKeys = new HashSet<>();
-
-
-            for (int i = 0; i < nfields; i++) {
-                ObjectStreamField f = fields[i];
-                Field rf = f.getField();
-                long key = (rf != null) ?
-                    unsafe.objectFieldOffset(rf) : Unsafe.INVALID_FIELD_OFFSET;
-                readKeys[i] = key;
-                writeKeys[i] = usedKeys.add(key) ?
-                    key : Unsafe.INVALID_FIELD_OFFSET;
-                offsets[i] = f.getOffset();
-                typeCodes[i] = f.getTypeCode();
-                if (!f.isPrimitive()) {
-                    typeList.add((rf != null) ? rf.getType() : null);
-                }
-            }
-
-            types = typeList.toArray(new Class<?>[typeList.size()]);
-            numPrimFields = nfields - types.length;
-        }
-
-        /**
-         * Returns list of ObjectStreamFields representing fields operated on
-         * by this reflector.  The shared/unshared values and Field objects
-         * contained by ObjectStreamFields in the list reflect their bindings
-         * to locally defined serializable fields.
-         */
-        public ObjectStreamField[] getFields() {
-            return fields;
-        }
-
-        /**
-         * Fetches the serializable primitive field values of object obj and
-         * marshals them into byte array buf starting at offset 0.  The caller
-         * is responsible for ensuring that obj is of the proper type.
-         */
-        public void getPrimFieldValues(Object obj, byte[] buf) {
-            if (obj == null) {
-                throw new NullPointerException();
-            }
-            /* assuming checkDefaultSerialize() has been called on the class
-             * descriptor this FieldReflector was obtained from, no field keys
-             * in array should be equal to Unsafe.INVALID_FIELD_OFFSET.
-             */
-            for (int i = 0; i < numPrimFields; i++) {
-                long key = readKeys[i];
-                int off = offsets[i];
-                switch (typeCodes[i]) {
-                    case 'Z':
-                        Bits.putBoolean(buf, off, unsafe.getBoolean(obj, key));
-                        break;
-
-                    case 'B':
-                        buf[off] = unsafe.getByte(obj, key);
-                        break;
-
-                    case 'C':
-                        Bits.putChar(buf, off, unsafe.getChar(obj, key));
-                        break;
-
-                    case 'S':
-                        Bits.putShort(buf, off, unsafe.getShort(obj, key));
-                        break;
-
-                    case 'I':
-                        Bits.putInt(buf, off, unsafe.getInt(obj, key));
-                        break;
-
-                    case 'F':
-                        Bits.putFloat(buf, off, unsafe.getFloat(obj, key));
-                        break;
-
-                    case 'J':
-                        Bits.putLong(buf, off, unsafe.getLong(obj, key));
-                        break;
-
-                    case 'D':
-                        Bits.putDouble(buf, off, unsafe.getDouble(obj, key));
-                        break;
-
-                    default:
-                        throw new InternalError();
-                }
-            }
-        }
-
-        /**
-         * Sets the serializable primitive fields of object obj using values
-         * unmarshalled from byte array buf starting at offset 0.  The caller
-         * is responsible for ensuring that obj is of the proper type.
-         */
-        public void setPrimFieldValues(Object obj, byte[] buf) {
-            if (obj == null) {
-                throw new NullPointerException();
-            }
-            for (int i = 0; i < numPrimFields; i++) {
-                long key = writeKeys[i];
-                if (key == Unsafe.INVALID_FIELD_OFFSET) {
-                    continue;           // discard value
-                }
-                int off = offsets[i];
-                switch (typeCodes[i]) {
-                    case 'Z':
-                        unsafe.putBoolean(obj, key, Bits.getBoolean(buf, off));
-                        break;
-
-                    case 'B':
-                        unsafe.putByte(obj, key, buf[off]);
-                        break;
-
-                    case 'C':
-                        unsafe.putChar(obj, key, Bits.getChar(buf, off));
-                        break;
-
-                    case 'S':
-                        unsafe.putShort(obj, key, Bits.getShort(buf, off));
-                        break;
-
-                    case 'I':
-                        unsafe.putInt(obj, key, Bits.getInt(buf, off));
-                        break;
-
-                    case 'F':
-                        unsafe.putFloat(obj, key, Bits.getFloat(buf, off));
-                        break;
-
-                    case 'J':
-                        unsafe.putLong(obj, key, Bits.getLong(buf, off));
-                        break;
-
-                    case 'D':
-                        unsafe.putDouble(obj, key, Bits.getDouble(buf, off));
-                        break;
-
-                    default:
-                        throw new InternalError();
-                }
-            }
-        }
-
-        /**
-         * Fetches the serializable object field values of object obj and
-         * stores them in array vals starting at offset 0.  The caller is
-         * responsible for ensuring that obj is of the proper type.
-         */
-        public void getObjFieldValues(Object obj, Object[] vals) {
-            if (obj == null) {
-                throw new NullPointerException();
-            }
-            /* assuming checkDefaultSerialize() has been called on the class
-             * descriptor this FieldReflector was obtained from, no field keys
-             * in array should be equal to Unsafe.INVALID_FIELD_OFFSET.
-             */
-            for (int i = numPrimFields; i < fields.length; i++) {
-                switch (typeCodes[i]) {
-                    case 'L':
-                    case '[':
-                        vals[offsets[i]] = unsafe.getObject(obj, readKeys[i]);
-                        break;
-
-                    default:
-                        throw new InternalError();
-                }
-            }
-        }
-
-        /**
-         * Sets the serializable object fields of object obj using values from
-         * array vals starting at offset 0.  The caller is responsible for
-         * ensuring that obj is of the proper type; however, attempts to set a
-         * field with a value of the wrong type will trigger an appropriate
-         * ClassCastException.
-         */
-        public void setObjFieldValues(Object obj, Object[] vals) {
-            if (obj == null) {
-                throw new NullPointerException();
-            }
-            for (int i = numPrimFields; i < fields.length; i++) {
-                long key = writeKeys[i];
-                if (key == Unsafe.INVALID_FIELD_OFFSET) {
-                    continue;           // discard value
-                }
-                switch (typeCodes[i]) {
-                    case 'L':
-                    case '[':
-                        Object val = vals[offsets[i]];
-                        if (val != null &&
-                            !types[i - numPrimFields].isInstance(val))
-                        {
-                            Field f = fields[i].getField();
-                            throw new ClassCastException(
-                                "cannot assign instance of " +
-                                val.getClass().getName() + " to field " +
-                                f.getDeclaringClass().getName() + "." +
-                                f.getName() + " of type " +
-                                f.getType().getName() + " in instance of " +
-                                obj.getClass().getName());
-                        }
-                        unsafe.putObject(obj, key, val);
-                        break;
-
-                    default:
-                        throw new InternalError();
-                }
-            }
-        }
-    }
-
-    /**
-     * Matches given set of serializable fields with serializable fields
-     * described by the given local class descriptor, and returns a
-     * FieldReflector instance capable of setting/getting values from the
-     * subset of fields that match (non-matching fields are treated as filler,
-     * for which get operations return default values and set operations
-     * discard given values).  Throws InvalidClassException if unresolvable
-     * type conflicts exist between the two sets of fields.
-     */
-    private static FieldReflectorBase getReflector(ObjectStreamField[] fields,
-                                               ObjectStreamClass localDesc)
-        throws InvalidClassException
-    {
-        // class irrelevant if no fields
-        Class<?> cl = (localDesc != null && fields.length > 0) ?
-            localDesc.cl : null;
-        processQueue(Caches.reflectorsQueue, Caches.reflectors);
-        FieldReflectorKey key = new FieldReflectorKey(cl, fields,
-                                                      Caches.reflectorsQueue);
-        Reference<?> ref = Caches.reflectors.get(key);
-        Object entry = null;
-        if (ref != null) {
-            entry = ref.get();
-        }
-        EntryFuture future = null;
-        if (entry == null) {
-            EntryFuture newEntry = new EntryFuture();
-            Reference<?> newRef = new SoftReference<>(newEntry);
-            do {
-                if (ref != null) {
-                    Caches.reflectors.remove(key, ref);
-                }
-                ref = Caches.reflectors.putIfAbsent(key, newRef);
-                if (ref != null) {
-                    entry = ref.get();
-                }
-            } while (ref != null && entry == null);
-            if (entry == null) {
-                future = newEntry;
-            }
-        }
-
-        if (entry instanceof FieldReflectorBase) {  // check common case first
-            return (FieldReflectorBase) entry;
-        } else if (entry instanceof EntryFuture) {
-            entry = ((EntryFuture) entry).get();
-        } else if (entry == null) {
-            try {
-                ObjectStreamField[] matchedFields = matchFields(fields, localDesc);
-                entry = getFastFieldReflector(matchedFields);
-                if (entry == null) {
-                    entry = new FieldReflector(matchedFields);
-                }
-            } catch (Throwable th) {
-                entry = th;
-            }
-            future.set(entry);
-            Caches.reflectors.put(key, new SoftReference<Object>(entry));
-        }
-
-        if (entry instanceof FieldReflectorBase) {
-            return (FieldReflectorBase) entry;
-        } else if (entry instanceof InvalidClassException) {
-            throw (InvalidClassException) entry;
-        } else if (entry instanceof RuntimeException) {
-            throw (RuntimeException) entry;
-        } else if (entry instanceof Error) {
-            throw (Error) entry;
-        } else {
-            throw new InternalError("unexpected entry: " + entry);
-        }
-    }
-
-    private static native Object getFastFieldReflector(ObjectStreamField[] fields);
-    
-    /**
-     * FieldReflector cache lookup key.  Keys are considered equal if they
-     * refer to the same class and equivalent field formats.
-     */
-    private static class FieldReflectorKey extends WeakReference<Class<?>> {
-
-        private final String sigs;
-        private final int hash;
-        private final boolean nullClass;
-
-        FieldReflectorKey(Class<?> cl, ObjectStreamField[] fields,
-                          ReferenceQueue<Class<?>> queue)
-        {
-            super(cl, queue);
-            nullClass = (cl == null);
-            StringBuilder sbuf = new StringBuilder();
-            for (int i = 0; i < fields.length; i++) {
-                ObjectStreamField f = fields[i];
-                sbuf.append(f.getName()).append(f.getSignature());
-            }
-            sigs = sbuf.toString();
-            hash = System.identityHashCode(cl) + sigs.hashCode();
-        }
-
-        public int hashCode() {
-            return hash;
-        }
-
-        public boolean equals(Object obj) {
-            if (obj == this) {
-                return true;
-            }
-
-            if (obj instanceof FieldReflectorKey) {
-                FieldReflectorKey other = (FieldReflectorKey) obj;
-                Class<?> referent;
-                return (nullClass ? other.nullClass
-                                  : ((referent = get()) != null) &&
-                                    (referent == other.get())) &&
-                    sigs.equals(other.sigs);
-            } else {
-                return false;
-            }
-        }
-    }
-
-    /**
-     * Matches given set of serializable fields with serializable fields
-     * obtained from the given local class descriptor (which contain bindings
-     * to reflective Field objects).  Returns list of ObjectStreamFields in
-     * which each ObjectStreamField whose signature matches that of a local
-     * field contains a Field object for that field; unmatched
-     * ObjectStreamFields contain null Field objects.  Shared/unshared settings
-     * of the returned ObjectStreamFields also reflect those of matched local
-     * ObjectStreamFields.  Throws InvalidClassException if unresolvable type
-     * conflicts exist between the two sets of fields.
-     */
-    private static ObjectStreamField[] matchFields(ObjectStreamField[] fields,
-                                                   ObjectStreamClass localDesc)
-        throws InvalidClassException
-    {
-        ObjectStreamField[] localFields = (localDesc != null) ?
-            localDesc.fields : NO_FIELDS;
-
-        /*
-         * Even if fields == localFields, we cannot simply return localFields
-         * here.  In previous implementations of serialization,
-         * ObjectStreamField.getType() returned Object.class if the
-         * ObjectStreamField represented a non-primitive field and belonged to
-         * a non-local class descriptor.  To preserve this (questionable)
-         * behavior, the ObjectStreamField instances returned by matchFields
-         * cannot report non-primitive types other than Object.class; hence
-         * localFields cannot be returned directly.
-         */
-
-        ObjectStreamField[] matches = new ObjectStreamField[fields.length];
-        for (int i = 0; i < fields.length; i++) {
-            ObjectStreamField f = fields[i], m = null;
-            for (int j = 0; j < localFields.length; j++) {
-                ObjectStreamField lf = localFields[j];
-                if (f.getName().equals(lf.getName())) {
-                    if ((f.isPrimitive() || lf.isPrimitive()) &&
-                        f.getTypeCode() != lf.getTypeCode())
-                    {
-                        throw new InvalidClassException(localDesc.name,
-                            "incompatible types for field " + f.getName());
-                    }
-                    if (lf.getField() != null) {
-                        m = new ObjectStreamField(
-                            lf.getField(), lf.isUnshared(), false);
-                    } else {
-                        m = new ObjectStreamField(
-                            lf.getName(), lf.getSignature(), lf.isUnshared());
-                    }
-                }
-            }
-            if (m == null) {
-                m = new ObjectStreamField(
-                    f.getName(), f.getSignature(), false);
-            }
-            m.setOffset(f.getOffset());
-            matches[i] = m;
-        }
-        return matches;
-    }
-
-    /**
-     * Removes from the specified map any keys that have been enqueued
-     * on the specified reference queue.
-     */
-    static void processQueue(ReferenceQueue<Class<?>> queue,
-                             ConcurrentMap<? extends
-                             WeakReference<Class<?>>, ?> map)
-    {
-        Reference<? extends Class<?>> ref;
-        while((ref = queue.poll()) != null) {
-            map.remove(ref);
-        }
-    }
-
-    /**
-     *  Weak key for Class objects.
-     *
-     **/
-    static class WeakClassKey extends WeakReference<Class<?>> {
-        /**
-         * saved value of the referent's identity hash code, to maintain
-         * a consistent hash code after the referent has been cleared
-         */
-        private final int hash;
-
-        /**
-         * Create a new WeakClassKey to the given object, registered
-         * with a queue.
-         */
-        WeakClassKey(Class<?> cl, ReferenceQueue<Class<?>> refQueue) {
-            super(cl, refQueue);
-            hash = System.identityHashCode(cl);
-        }
-
-        /**
-         * Returns the identity hash code of the original referent.
-         */
-        public int hashCode() {
-            return hash;
-        }
-
-        /**
-         * Returns true if the given object is this identical
-         * WeakClassKey instance, or, if this object's referent has not
-         * been cleared, if the given object is another WeakClassKey
-         * instance with the identical non-null referent as this one.
-         */
-        public boolean equals(Object obj) {
-            if (obj == this) {
-                return true;
-            }
-
-            if (obj instanceof WeakClassKey) {
-                Object referent = get();
-                return (referent != null) &&
-                       (referent == ((WeakClassKey) obj).get());
-            } else {
-                return false;
-            }
-        }
-    }
-    
-    // [IKVM] interop serialization support
-    boolean isDynamicClass() {
-        return dynamicClass;
-    }
-    
-    private static native boolean isDynamicTypeWrapper(Class cl);
-    
-    // to force us to be resolved early (by the .NET deserialization engine)
-    // we implement readResolve() (which results in us implementing IObjectReference)
-    private Object readResolve() {
-        return this;
-    }
-}
diff --git a/openjdk/java/io/ObjectStreamField.java b/openjdk/java/io/ObjectStreamField.java
deleted file mode 100644
index 1d7c2cdf..00000000
--- a/openjdk/java/io/ObjectStreamField.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-import java.lang.reflect.Field;
-import sun.reflect.CallerSensitive;
-import sun.reflect.Reflection;
-import sun.reflect.misc.ReflectUtil;
-
-/**
- * A description of a Serializable field from a Serializable class.  An array
- * of ObjectStreamFields is used to declare the Serializable fields of a class.
- *
- * @author      Mike Warres
- * @author      Roger Riggs
- * @see ObjectStreamClass
- * @since 1.2
- */
-public class ObjectStreamField
-    implements Comparable<Object>
-{
-
-    /** field name */
-    private final String name;
-    /** canonical JVM signature of field type */
-    private String signature;
-    /** field type (Object.class if unknown non-primitive type) */
-    private final Class<?> type;
-    /** whether or not to (de)serialize field values as unshared */
-    private final boolean unshared;
-    /** corresponding reflective field object, if any */
-    private final Field field;
-    /** offset of field value in enclosing field group */
-    private int offset = 0;
-
-    /**
-     * Create a Serializable field with the specified type.  This field should
-     * be documented with a <code>serialField</code> tag.
-     *
-     * @param   name the name of the serializable field
-     * @param   type the <code>Class</code> object of the serializable field
-     */
-    public ObjectStreamField(String name, Class<?> type) {
-        this(name, type, false);
-    }
-
-    /**
-     * Creates an ObjectStreamField representing a serializable field with the
-     * given name and type.  If unshared is false, values of the represented
-     * field are serialized and deserialized in the default manner--if the
-     * field is non-primitive, object values are serialized and deserialized as
-     * if they had been written and read by calls to writeObject and
-     * readObject.  If unshared is true, values of the represented field are
-     * serialized and deserialized as if they had been written and read by
-     * calls to writeUnshared and readUnshared.
-     *
-     * @param   name field name
-     * @param   type field type
-     * @param   unshared if false, write/read field values in the same manner
-     *          as writeObject/readObject; if true, write/read in the same
-     *          manner as writeUnshared/readUnshared
-     * @since   1.4
-     */
-    public ObjectStreamField(String name, Class<?> type, boolean unshared) {
-        if (name == null || type == null) {
-            throw new NullPointerException();
-        }
-        this.name = name;
-        this.type = type;
-        this.unshared = unshared;
-        field = null;
-    }
-    
-    // [IKVM] added lazy signature computation, to avoid the reflection hit, unless we really need it
-    private void lazyInitSignature() {
-        if (signature == null) {
-            signature = getClassSignature(type).intern();
-        }
-    }
-
-    /**
-     * Creates an ObjectStreamField representing a field with the given name,
-     * signature and unshared setting.
-     */
-    ObjectStreamField(String name, String signature, boolean unshared) {
-        if (name == null) {
-            throw new NullPointerException();
-        }
-        this.name = name;
-        this.signature = signature.intern();
-        this.unshared = unshared;
-        field = null;
-
-        switch (signature.charAt(0)) {
-            case 'Z': type = Boolean.TYPE; break;
-            case 'B': type = Byte.TYPE; break;
-            case 'C': type = Character.TYPE; break;
-            case 'S': type = Short.TYPE; break;
-            case 'I': type = Integer.TYPE; break;
-            case 'J': type = Long.TYPE; break;
-            case 'F': type = Float.TYPE; break;
-            case 'D': type = Double.TYPE; break;
-            case 'L':
-            case '[': type = Object.class; break;
-            default: throw new IllegalArgumentException("illegal signature");
-        }
-    }
-
-    /**
-     * Creates an ObjectStreamField representing the given field with the
-     * specified unshared setting.  For compatibility with the behavior of
-     * earlier serialization implementations, a "showType" parameter is
-     * necessary to govern whether or not a getType() call on this
-     * ObjectStreamField (if non-primitive) will return Object.class (as
-     * opposed to a more specific reference type).
-     */
-    ObjectStreamField(Field field, boolean unshared, boolean showType) {
-        this.field = field;
-        this.unshared = unshared;
-        name = field.getName();
-        Class<?> ftype = field.getType();
-        type = (showType || ftype.isPrimitive()) ? ftype : Object.class;
-        signature = getClassSignature(ftype).intern();
-    }
-
-    /**
-     * Get the name of this field.
-     *
-     * @return  a <code>String</code> representing the name of the serializable
-     *          field
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Get the type of the field.  If the type is non-primitive and this
-     * <code>ObjectStreamField</code> was obtained from a deserialized {@link
-     * ObjectStreamClass} instance, then <code>Object.class</code> is returned.
-     * Otherwise, the <code>Class</code> object for the type of the field is
-     * returned.
-     *
-     * @return  a <code>Class</code> object representing the type of the
-     *          serializable field
-     */
-    @CallerSensitive
-    public Class<?> getType() {
-        if (System.getSecurityManager() != null) {
-            Class<?> caller = Reflection.getCallerClass();
-            if (ReflectUtil.needsPackageAccessCheck(caller.getClassLoader(), type.getClassLoader())) {
-                ReflectUtil.checkPackageAccess(type);
-            }
-        }
-        return type;
-    }
-
-    /**
-     * Returns character encoding of field type.  The encoding is as follows:
-     * <blockquote><pre>
-     * B            byte
-     * C            char
-     * D            double
-     * F            float
-     * I            int
-     * J            long
-     * L            class or interface
-     * S            short
-     * Z            boolean
-     * [            array
-     * </pre></blockquote>
-     *
-     * @return  the typecode of the serializable field
-     */
-    // REMIND: deprecate?
-    public char getTypeCode() {
-        lazyInitSignature();
-        return signature.charAt(0);
-    }
-
-    /**
-     * Return the JVM type signature.
-     *
-     * @return  null if this field has a primitive type.
-     */
-    // REMIND: deprecate?
-    public String getTypeString() {
-        lazyInitSignature();
-        return isPrimitive() ? null : signature;
-    }
-
-    /**
-     * Offset of field within instance data.
-     *
-     * @return  the offset of this field
-     * @see #setOffset
-     */
-    // REMIND: deprecate?
-    public int getOffset() {
-        return offset;
-    }
-
-    /**
-     * Offset within instance data.
-     *
-     * @param   offset the offset of the field
-     * @see #getOffset
-     */
-    // REMIND: deprecate?
-    protected void setOffset(int offset) {
-        this.offset = offset;
-    }
-
-    /**
-     * Return true if this field has a primitive type.
-     *
-     * @return  true if and only if this field corresponds to a primitive type
-     */
-    // REMIND: deprecate?
-    public boolean isPrimitive() {
-        lazyInitSignature();
-        char tcode = signature.charAt(0);
-        return ((tcode != 'L') && (tcode != '['));
-    }
-
-    /**
-     * Returns boolean value indicating whether or not the serializable field
-     * represented by this ObjectStreamField instance is unshared.
-     *
-     * @since 1.4
-     */
-    public boolean isUnshared() {
-        return unshared;
-    }
-
-    /**
-     * Compare this field with another <code>ObjectStreamField</code>.  Return
-     * -1 if this is smaller, 0 if equal, 1 if greater.  Types that are
-     * primitives are "smaller" than object types.  If equal, the field names
-     * are compared.
-     */
-    // REMIND: deprecate?
-    public int compareTo(Object obj) {
-        ObjectStreamField other = (ObjectStreamField) obj;
-        boolean isPrim = isPrimitive();
-        if (isPrim != other.isPrimitive()) {
-            return isPrim ? -1 : 1;
-        }
-        return name.compareTo(other.name);
-    }
-
-    /**
-     * Return a string that describes this field.
-     */
-    public String toString() {
-        lazyInitSignature();
-        return signature + ' ' + name;
-    }
-
-    /**
-     * Returns field represented by this ObjectStreamField, or null if
-     * ObjectStreamField is not associated with an actual field.
-     */
-    Field getField() {
-        return field;
-    }
-
-    /**
-     * Returns JVM type signature of field (similar to getTypeString, except
-     * that signature strings are returned for primitive fields as well).
-     */
-    String getSignature() {
-        lazyInitSignature();
-        return signature;
-    }
-
-    /**
-     * Returns JVM type signature for given class.
-     */
-    private static String getClassSignature(Class<?> cl) {
-        StringBuilder sbuf = new StringBuilder();
-        while (cl.isArray()) {
-            sbuf.append('[');
-            cl = cl.getComponentType();
-        }
-        if (cl.isPrimitive()) {
-            if (cl == Integer.TYPE) {
-                sbuf.append('I');
-            } else if (cl == Byte.TYPE) {
-                sbuf.append('B');
-            } else if (cl == Long.TYPE) {
-                sbuf.append('J');
-            } else if (cl == Float.TYPE) {
-                sbuf.append('F');
-            } else if (cl == Double.TYPE) {
-                sbuf.append('D');
-            } else if (cl == Short.TYPE) {
-                sbuf.append('S');
-            } else if (cl == Character.TYPE) {
-                sbuf.append('C');
-            } else if (cl == Boolean.TYPE) {
-                sbuf.append('Z');
-            } else if (cl == Void.TYPE) {
-                sbuf.append('V');
-            } else {
-                throw new InternalError();
-            }
-        } else {
-            sbuf.append('L' + cl.getName().replace('.', '/') + ';');
-        }
-        return sbuf.toString();
-    }
-}
diff --git a/openjdk/java/io/RandomAccessFile.java b/openjdk/java/io/RandomAccessFile.java
deleted file mode 100644
index 61fc27a7..00000000
--- a/openjdk/java/io/RandomAccessFile.java
+++ /dev/null
@@ -1,1191 +0,0 @@
-/*
- * Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.io;
-
-import java.nio.channels.FileChannel;
-import sun.nio.ch.FileChannelImpl;
-import sun.misc.IoTrace;
-
-
-/**
- * Instances of this class support both reading and writing to a
- * random access file. A random access file behaves like a large
- * array of bytes stored in the file system. There is a kind of cursor,
- * or index into the implied array, called the <em>file pointer</em>;
- * input operations read bytes starting at the file pointer and advance
- * the file pointer past the bytes read. If the random access file is
- * created in read/write mode, then output operations are also available;
- * output operations write bytes starting at the file pointer and advance
- * the file pointer past the bytes written. Output operations that write
- * past the current end of the implied array cause the array to be
- * extended. The file pointer can be read by the
- * <code>getFilePointer</code> method and set by the <code>seek</code>
- * method.
- * <p>
- * It is generally true of all the reading routines in this class that
- * if end-of-file is reached before the desired number of bytes has been
- * read, an <code>EOFException</code> (which is a kind of
- * <code>IOException</code>) is thrown. If any byte cannot be read for
- * any reason other than end-of-file, an <code>IOException</code> other
- * than <code>EOFException</code> is thrown. In particular, an
- * <code>IOException</code> may be thrown if the stream has been closed.
- *
- * @author  unascribed
- * @since   JDK1.0
- */
-
-public class RandomAccessFile implements DataOutput, DataInput, Closeable {
-
-    private FileDescriptor fd;
-    private FileChannel channel = null;
-    private boolean rw;
-
-    /* The path of the referenced file */
-    private final String path;
-
-    private Object closeLock = new Object();
-    private volatile boolean closed = false;
-
-    private static final int O_RDONLY = 1;
-    private static final int O_RDWR =   2;
-    private static final int O_SYNC =   4;
-    private static final int O_DSYNC =  8;
-
-    /**
-     * Creates a random access file stream to read from, and optionally
-     * to write to, a file with the specified name. A new
-     * {@link FileDescriptor} object is created to represent the
-     * connection to the file.
-     *
-     * <p> The <tt>mode</tt> argument specifies the access mode with which the
-     * file is to be opened.  The permitted values and their meanings are as
-     * specified for the <a
-     * href="#mode"><tt>RandomAccessFile(File,String)</tt></a> constructor.
-     *
-     * <p>
-     * If there is a security manager, its <code>checkRead</code> method
-     * is called with the <code>name</code> argument
-     * as its argument to see if read access to the file is allowed.
-     * If the mode allows writing, the security manager's
-     * <code>checkWrite</code> method
-     * is also called with the <code>name</code> argument
-     * as its argument to see if write access to the file is allowed.
-     *
-     * @param      name   the system-dependent filename
-     * @param      mode   the access <a href="#mode">mode</a>
-     * @exception  IllegalArgumentException  if the mode argument is not equal
-     *               to one of <tt>"r"</tt>, <tt>"rw"</tt>, <tt>"rws"</tt>, or
-     *               <tt>"rwd"</tt>
-     * @exception FileNotFoundException
-     *            if the mode is <tt>"r"</tt> but the given string does not
-     *            denote an existing regular file, or if the mode begins with
-     *            <tt>"rw"</tt> but the given string does not denote an
-     *            existing, writable regular file and a new regular file of
-     *            that name cannot be created, or if some other error occurs
-     *            while opening or creating the file
-     * @exception  SecurityException         if a security manager exists and its
-     *               <code>checkRead</code> method denies read access to the file
-     *               or the mode is "rw" and the security manager's
-     *               <code>checkWrite</code> method denies write access to the file
-     * @see        java.lang.SecurityException
-     * @see        java.lang.SecurityManager#checkRead(java.lang.String)
-     * @see        java.lang.SecurityManager#checkWrite(java.lang.String)
-     * @revised 1.4
-     * @spec JSR-51
-     */
-    public RandomAccessFile(String name, String mode)
-        throws FileNotFoundException
-    {
-        this(name != null ? new File(name) : null, mode);
-    }
-
-    /**
-     * Creates a random access file stream to read from, and optionally to
-     * write to, the file specified by the {@link File} argument.  A new {@link
-     * FileDescriptor} object is created to represent this file connection.
-     *
-     * <a name="mode"><p> The <tt>mode</tt> argument specifies the access mode
-     * in which the file is to be opened.  The permitted values and their
-     * meanings are:
-     *
-     * <blockquote><table summary="Access mode permitted values and meanings">
-     * <tr><th><p align="left">Value</p></th><th><p align="left">Meaning</p></th></tr>
-     * <tr><td valign="top"><tt>"r"</tt></td>
-     *     <td> Open for reading only.  Invoking any of the <tt>write</tt>
-     *     methods of the resulting object will cause an {@link
-     *     java.io.IOException} to be thrown. </td></tr>
-     * <tr><td valign="top"><tt>"rw"</tt></td>
-     *     <td> Open for reading and writing.  If the file does not already
-     *     exist then an attempt will be made to create it. </td></tr>
-     * <tr><td valign="top"><tt>"rws"</tt></td>
-     *     <td> Open for reading and writing, as with <tt>"rw"</tt>, and also
-     *     require that every update to the file's content or metadata be
-     *     written synchronously to the underlying storage device.  </td></tr>
-     * <tr><td valign="top"><tt>"rwd"&nbsp;&nbsp;</tt></td>
-     *     <td> Open for reading and writing, as with <tt>"rw"</tt>, and also
-     *     require that every update to the file's content be written
-     *     synchronously to the underlying storage device. </td></tr>
-     * </table></blockquote>
-     *
-     * The <tt>"rws"</tt> and <tt>"rwd"</tt> modes work much like the {@link
-     * java.nio.channels.FileChannel#force(boolean) force(boolean)} method of
-     * the {@link java.nio.channels.FileChannel} class, passing arguments of
-     * <tt>true</tt> and <tt>false</tt>, respectively, except that they always
-     * apply to every I/O operation and are therefore often more efficient.  If
-     * the file resides on a local storage device then when an invocation of a
-     * method of this class returns it is guaranteed that all changes made to
-     * the file by that invocation will have been written to that device.  This
-     * is useful for ensuring that critical information is not lost in the
-     * event of a system crash.  If the file does not reside on a local device
-     * then no such guarantee is made.
-     *
-     * <p> The <tt>"rwd"</tt> mode can be used to reduce the number of I/O
-     * operations performed.  Using <tt>"rwd"</tt> only requires updates to the
-     * file's content to be written to storage; using <tt>"rws"</tt> requires
-     * updates to both the file's content and its metadata to be written, which
-     * generally requires at least one more low-level I/O operation.
-     *
-     * <p> If there is a security manager, its <code>checkRead</code> method is
-     * called with the pathname of the <code>file</code> argument as its
-     * argument to see if read access to the file is allowed.  If the mode
-     * allows writing, the security manager's <code>checkWrite</code> method is
-     * also called with the path argument to see if write access to the file is
-     * allowed.
-     *
-     * @param      file   the file object
-     * @param      mode   the access mode, as described
-     *                    <a href="#mode">above</a>
-     * @exception  IllegalArgumentException  if the mode argument is not equal
-     *               to one of <tt>"r"</tt>, <tt>"rw"</tt>, <tt>"rws"</tt>, or
-     *               <tt>"rwd"</tt>
-     * @exception FileNotFoundException
-     *            if the mode is <tt>"r"</tt> but the given file object does
-     *            not denote an existing regular file, or if the mode begins
-     *            with <tt>"rw"</tt> but the given file object does not denote
-     *            an existing, writable regular file and a new regular file of
-     *            that name cannot be created, or if some other error occurs
-     *            while opening or creating the file
-     * @exception  SecurityException         if a security manager exists and its
-     *               <code>checkRead</code> method denies read access to the file
-     *               or the mode is "rw" and the security manager's
-     *               <code>checkWrite</code> method denies write access to the file
-     * @see        java.lang.SecurityManager#checkRead(java.lang.String)
-     * @see        java.lang.SecurityManager#checkWrite(java.lang.String)
-     * @see        java.nio.channels.FileChannel#force(boolean)
-     * @revised 1.4
-     * @spec JSR-51
-     */
-    public RandomAccessFile(File file, String mode)
-        throws FileNotFoundException
-    {
-        String name = (file != null ? file.getPath() : null);
-        int imode = -1;
-        if (mode.equals("r"))
-            imode = O_RDONLY;
-        else if (mode.startsWith("rw")) {
-            imode = O_RDWR;
-            rw = true;
-            if (mode.length() > 2) {
-                if (mode.equals("rws"))
-                    imode |= O_SYNC;
-                else if (mode.equals("rwd"))
-                    imode |= O_DSYNC;
-                else
-                    imode = -1;
-            }
-        }
-        if (imode < 0)
-            throw new IllegalArgumentException("Illegal mode \"" + mode
-                                               + "\" must be one of "
-                                               + "\"r\", \"rw\", \"rws\","
-                                               + " or \"rwd\"");
-        SecurityManager security = System.getSecurityManager();
-        if (security != null) {
-            security.checkRead(name);
-            if (rw) {
-                security.checkWrite(name);
-            }
-        }
-        if (name == null) {
-            throw new NullPointerException();
-        }
-        /*
-        if (file.isInvalid()) {
-            throw new FileNotFoundException("Invalid file path");
-        }
-        */
-        fd = new FileDescriptor();
-        fd.incrementAndGetUseCount();
-        this.path = name;
-        open(name, imode);
-    }
-
-    /**
-     * Returns the opaque file descriptor object associated with this
-     * stream. </p>
-     *
-     * @return     the file descriptor object associated with this stream.
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.FileDescriptor
-     */
-    public final FileDescriptor getFD() throws IOException {
-        if (fd != null) return fd;
-        throw new IOException();
-    }
-
-    /**
-     * Returns the unique {@link java.nio.channels.FileChannel FileChannel}
-     * object associated with this file.
-     *
-     * <p> The {@link java.nio.channels.FileChannel#position()
-     * </code>position<code>} of the returned channel will always be equal to
-     * this object's file-pointer offset as returned by the {@link
-     * #getFilePointer getFilePointer} method.  Changing this object's
-     * file-pointer offset, whether explicitly or by reading or writing bytes,
-     * will change the position of the channel, and vice versa.  Changing the
-     * file's length via this object will change the length seen via the file
-     * channel, and vice versa.
-     *
-     * @return  the file channel associated with this file
-     *
-     * @since 1.4
-     * @spec JSR-51
-     */
-    public final FileChannel getChannel() {
-        synchronized (this) {
-            if (channel == null) {
-                channel = FileChannelImpl.open(fd, path, true, rw, this);
-
-                /*
-                 * FileDescriptor could be shared by FileInputStream or
-                 * FileOutputStream.
-                 * Ensure that FD is GC'ed only when all the streams/channels
-                 * are done using it.
-                 * Increment fd's use count. Invoking the channel's close()
-                 * method will result in decrementing the use count set for
-                 * the channel.
-                 */
-                fd.incrementAndGetUseCount();
-            }
-            return channel;
-        }
-    }
-
-    /**
-     * Opens a file and returns the file descriptor.  The file is
-     * opened in read-write mode if the O_RDWR bit in <code>mode</code>
-     * is true, else the file is opened as read-only.
-     * If the <code>name</code> refers to a directory, an IOException
-     * is thrown.
-     *
-     * @param name the name of the file
-     * @param mode the mode flags, a combination of the O_ constants
-     *             defined above
-     */
-    private void open(String name, int mode)
-        throws FileNotFoundException
-    {
-        if ((mode & O_RDWR) == O_RDWR)
-        {
-            fd.openReadWrite(name);
-        }
-        else
-        {
-            fd.openReadOnly(name);
-        }
-    }
-
-    // 'Read' primitives
-
-    /**
-     * Reads a byte of data from this file. The byte is returned as an
-     * integer in the range 0 to 255 (<code>0x00-0x0ff</code>). This
-     * method blocks if no input is yet available.
-     * <p>
-     * Although <code>RandomAccessFile</code> is not a subclass of
-     * <code>InputStream</code>, this method behaves in exactly the same
-     * way as the {@link InputStream#read()} method of
-     * <code>InputStream</code>.
-     *
-     * @return     the next byte of data, or <code>-1</code> if the end of the
-     *             file has been reached.
-     * @exception  IOException  if an I/O error occurs. Not thrown if
-     *                          end-of-file has been reached.
-     */
-    public int read() throws IOException {
-        Object traceContext = IoTrace.fileReadBegin(path);
-        int b = 0;
-        try {
-            b = fd.read();
-        } finally {
-            IoTrace.fileReadEnd(traceContext, b == -1 ? 0 : 1);
-        }
-        return b;
-    }
-
-    /**
-     * Reads a sub array as a sequence of bytes.
-     * @param b the buffer into which the data is read.
-     * @param off the start offset of the data.
-     * @param len the number of bytes to read.
-     * @exception IOException If an I/O error has occurred.
-     */
-    private int readBytes(byte b[], int off, int len) throws IOException
-    {
-        Object traceContext = IoTrace.fileReadBegin(path);
-        int bytesRead = 0;
-        try {
-            bytesRead = fd.readBytes(b, off, len);
-        } finally {
-            IoTrace.fileReadEnd(traceContext, bytesRead == -1 ? 0 : bytesRead);
-        }
-        return bytesRead;
-    }
-
-    /**
-     * Reads up to <code>len</code> bytes of data from this file into an
-     * array of bytes. This method blocks until at least one byte of input
-     * is available.
-     * <p>
-     * Although <code>RandomAccessFile</code> is not a subclass of
-     * <code>InputStream</code>, this method behaves in exactly the
-     * same way as the {@link InputStream#read(byte[], int, int)} method of
-     * <code>InputStream</code>.
-     *
-     * @param      b     the buffer into which the data is read.
-     * @param      off   the start offset in array <code>b</code>
-     *                   at which the data is written.
-     * @param      len   the maximum number of bytes read.
-     * @return     the total number of bytes read into the buffer, or
-     *             <code>-1</code> if there is no more data because the end of
-     *             the file has been reached.
-     * @exception  IOException If the first byte cannot be read for any reason
-     * other than end of file, or if the random access file has been closed, or if
-     * some other I/O error occurs.
-     * @exception  NullPointerException If <code>b</code> is <code>null</code>.
-     * @exception  IndexOutOfBoundsException If <code>off</code> is negative,
-     * <code>len</code> is negative, or <code>len</code> is greater than
-     * <code>b.length - off</code>
-     */
-    public int read(byte b[], int off, int len) throws IOException {
-        return readBytes(b, off, len);
-    }
-
-    /**
-     * Reads up to <code>b.length</code> bytes of data from this file
-     * into an array of bytes. This method blocks until at least one byte
-     * of input is available.
-     * <p>
-     * Although <code>RandomAccessFile</code> is not a subclass of
-     * <code>InputStream</code>, this method behaves in exactly the
-     * same way as the {@link InputStream#read(byte[])} method of
-     * <code>InputStream</code>.
-     *
-     * @param      b   the buffer into which the data is read.
-     * @return     the total number of bytes read into the buffer, or
-     *             <code>-1</code> if there is no more data because the end of
-     *             this file has been reached.
-     * @exception  IOException If the first byte cannot be read for any reason
-     * other than end of file, or if the random access file has been closed, or if
-     * some other I/O error occurs.
-     * @exception  NullPointerException If <code>b</code> is <code>null</code>.
-     */
-    public int read(byte b[]) throws IOException {
-        return readBytes(b, 0, b.length);
-    }
-
-    /**
-     * Reads <code>b.length</code> bytes from this file into the byte
-     * array, starting at the current file pointer. This method reads
-     * repeatedly from the file until the requested number of bytes are
-     * read. This method blocks until the requested number of bytes are
-     * read, the end of the stream is detected, or an exception is thrown.
-     *
-     * @param      b   the buffer into which the data is read.
-     * @exception  EOFException  if this file reaches the end before reading
-     *               all the bytes.
-     * @exception  IOException   if an I/O error occurs.
-     */
-    public final void readFully(byte b[]) throws IOException {
-        readFully(b, 0, b.length);
-    }
-
-    /**
-     * Reads exactly <code>len</code> bytes from this file into the byte
-     * array, starting at the current file pointer. This method reads
-     * repeatedly from the file until the requested number of bytes are
-     * read. This method blocks until the requested number of bytes are
-     * read, the end of the stream is detected, or an exception is thrown.
-     *
-     * @param      b     the buffer into which the data is read.
-     * @param      off   the start offset of the data.
-     * @param      len   the number of bytes to read.
-     * @exception  EOFException  if this file reaches the end before reading
-     *               all the bytes.
-     * @exception  IOException   if an I/O error occurs.
-     */
-    public final void readFully(byte b[], int off, int len) throws IOException {
-        int n = 0;
-        do {
-            int count = this.read(b, off + n, len - n);
-            if (count < 0)
-                throw new EOFException();
-            n += count;
-        } while (n < len);
-    }
-
-    /**
-     * Attempts to skip over <code>n</code> bytes of input discarding the
-     * skipped bytes.
-     * <p>
-     *
-     * This method may skip over some smaller number of bytes, possibly zero.
-     * This may result from any of a number of conditions; reaching end of
-     * file before <code>n</code> bytes have been skipped is only one
-     * possibility. This method never throws an <code>EOFException</code>.
-     * The actual number of bytes skipped is returned.  If <code>n</code>
-     * is negative, no bytes are skipped.
-     *
-     * @param      n   the number of bytes to be skipped.
-     * @return     the actual number of bytes skipped.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public int skipBytes(int n) throws IOException {
-        long pos;
-        long len;
-        long newpos;
-
-        if (n <= 0) {
-            return 0;
-        }
-        pos = getFilePointer();
-        len = length();
-        newpos = pos + n;
-        if (newpos > len) {
-            newpos = len;
-        }
-        seek(newpos);
-
-        /* return the actual number of bytes skipped */
-        return (int) (newpos - pos);
-    }
-
-    // 'Write' primitives
-
-    /**
-     * Writes the specified byte to this file. The write starts at
-     * the current file pointer.
-     *
-     * @param      b   the <code>byte</code> to be written.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public void write(int b) throws IOException {
-        Object traceContext = IoTrace.fileWriteBegin(path);
-        int bytesWritten = 0;
-        try {
-            fd.write(b);
-            bytesWritten = 1;
-        } finally {
-            IoTrace.fileWriteEnd(traceContext, bytesWritten);
-        }
-    }
-
-    /**
-     * Writes a sub array as a sequence of bytes.
-     * @param b the data to be written
-
-     * @param off the start offset in the data
-     * @param len the number of bytes that are written
-     * @exception IOException If an I/O error has occurred.
-     */
-    private void writeBytes(byte b[], int off, int len) throws IOException {
-        Object traceContext = IoTrace.fileWriteBegin(path);
-        int bytesWritten = 0;
-        try {
-            fd.writeBytes(b, off, len);
-            bytesWritten = len;
-        } finally {
-            IoTrace.fileWriteEnd(traceContext, bytesWritten);
-        }
-    }
-
-    /**
-     * Writes <code>b.length</code> bytes from the specified byte array
-     * to this file, starting at the current file pointer.
-     *
-     * @param      b   the data.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public void write(byte b[]) throws IOException {
-        writeBytes(b, 0, b.length);
-    }
-
-    /**
-     * Writes <code>len</code> bytes from the specified byte array
-     * starting at offset <code>off</code> to this file.
-     *
-     * @param      b     the data.
-     * @param      off   the start offset in the data.
-     * @param      len   the number of bytes to write.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public void write(byte b[], int off, int len) throws IOException {
-        writeBytes(b, off, len);
-    }
-
-    // 'Random access' stuff
-
-    /**
-     * Returns the current offset in this file.
-     *
-     * @return     the offset from the beginning of the file, in bytes,
-     *             at which the next read or write occurs.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public long getFilePointer() throws IOException
-    {
-        return fd.getFilePointer();
-    }
-
-    /**
-     * Sets the file-pointer offset, measured from the beginning of this
-     * file, at which the next read or write occurs.  The offset may be
-     * set beyond the end of the file. Setting the offset beyond the end
-     * of the file does not change the file length.  The file length will
-     * change only by writing after the offset has been set beyond the end
-     * of the file.
-     *
-     * @param      pos   the offset position, measured in bytes from the
-     *                   beginning of the file, at which to set the file
-     *                   pointer.
-     * @exception  IOException  if <code>pos</code> is less than
-     *                          <code>0</code> or if an I/O error occurs.
-     */
-    public void seek(long pos) throws IOException
-    {
-        fd.seek(pos);
-    }
-
-    /**
-     * Returns the length of this file.
-     *
-     * @return     the length of this file, measured in bytes.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public long length() throws IOException
-    {
-        return fd.length();
-    }
-
-    /**
-     * Sets the length of this file.
-     *
-     * <p> If the present length of the file as returned by the
-     * <code>length</code> method is greater than the <code>newLength</code>
-     * argument then the file will be truncated.  In this case, if the file
-     * offset as returned by the <code>getFilePointer</code> method is greater
-     * than <code>newLength</code> then after this method returns the offset
-     * will be equal to <code>newLength</code>.
-     *
-     * <p> If the present length of the file as returned by the
-     * <code>length</code> method is smaller than the <code>newLength</code>
-     * argument then the file will be extended.  In this case, the contents of
-     * the extended portion of the file are not defined.
-     *
-     * @param      newLength    The desired length of the file
-     * @exception  IOException  If an I/O error occurs
-     * @since      1.2
-     */
-    public void setLength(long newLength) throws IOException
-    {
-        fd.setLength(newLength);
-    }
-
-    /**
-     * Closes this random access file stream and releases any system
-     * resources associated with the stream. A closed random access
-     * file cannot perform input or output operations and cannot be
-     * reopened.
-     *
-     * <p> If this file has an associated channel then the channel is closed
-     * as well.
-     *
-     * @exception  IOException  if an I/O error occurs.
-     *
-     * @revised 1.4
-     * @spec JSR-51
-     */
-    public void close() throws IOException {
-        synchronized (closeLock) {
-            if (closed) {
-                return;
-            }
-            closed = true;
-        }
-        if (channel != null) {
-            /*
-             * Decrement FD use count associated with the channel. The FD use
-             * count is incremented whenever a new channel is obtained from
-             * this stream.
-             */
-            fd.decrementAndGetUseCount();
-            channel.close();
-        }
-
-        /*
-         * Decrement FD use count associated with this stream.
-         * The count got incremented by FileDescriptor during its construction.
-         */
-        fd.decrementAndGetUseCount();
-        close0();
-    }
-
-    //
-    //  Some "reading/writing Java data types" methods stolen from
-    //  DataInputStream and DataOutputStream.
-    //
-
-    /**
-     * Reads a <code>boolean</code> from this file. This method reads a
-     * single byte from the file, starting at the current file pointer.
-     * A value of <code>0</code> represents
-     * <code>false</code>. Any other value represents <code>true</code>.
-     * This method blocks until the byte is read, the end of the stream
-     * is detected, or an exception is thrown.
-     *
-     * @return     the <code>boolean</code> value read.
-     * @exception  EOFException  if this file has reached the end.
-     * @exception  IOException   if an I/O error occurs.
-     */
-    public final boolean readBoolean() throws IOException {
-        int ch = this.read();
-        if (ch < 0)
-            throw new EOFException();
-        return (ch != 0);
-    }
-
-    /**
-     * Reads a signed eight-bit value from this file. This method reads a
-     * byte from the file, starting from the current file pointer.
-     * If the byte read is <code>b</code>, where
-     * <code>0&nbsp;&lt;=&nbsp;b&nbsp;&lt;=&nbsp;255</code>,
-     * then the result is:
-     * <blockquote><pre>
-     *     (byte)(b)
-     * </pre></blockquote>
-     * <p>
-     * This method blocks until the byte is read, the end of the stream
-     * is detected, or an exception is thrown.
-     *
-     * @return     the next byte of this file as a signed eight-bit
-     *             <code>byte</code>.
-     * @exception  EOFException  if this file has reached the end.
-     * @exception  IOException   if an I/O error occurs.
-     */
-    public final byte readByte() throws IOException {
-        int ch = this.read();
-        if (ch < 0)
-            throw new EOFException();
-        return (byte)(ch);
-    }
-
-    /**
-     * Reads an unsigned eight-bit number from this file. This method reads
-     * a byte from this file, starting at the current file pointer,
-     * and returns that byte.
-     * <p>
-     * This method blocks until the byte is read, the end of the stream
-     * is detected, or an exception is thrown.
-     *
-     * @return     the next byte of this file, interpreted as an unsigned
-     *             eight-bit number.
-     * @exception  EOFException  if this file has reached the end.
-     * @exception  IOException   if an I/O error occurs.
-     */
-    public final int readUnsignedByte() throws IOException {
-        int ch = this.read();
-        if (ch < 0)
-            throw new EOFException();
-        return ch;
-    }
-
-    /**
-     * Reads a signed 16-bit number from this file. The method reads two
-     * bytes from this file, starting at the current file pointer.
-     * If the two bytes read, in order, are
-     * <code>b1</code> and <code>b2</code>, where each of the two values is
-     * between <code>0</code> and <code>255</code>, inclusive, then the
-     * result is equal to:
-     * <blockquote><pre>
-     *     (short)((b1 &lt;&lt; 8) | b2)
-     * </pre></blockquote>
-     * <p>
-     * This method blocks until the two bytes are read, the end of the
-     * stream is detected, or an exception is thrown.
-     *
-     * @return     the next two bytes of this file, interpreted as a signed
-     *             16-bit number.
-     * @exception  EOFException  if this file reaches the end before reading
-     *               two bytes.
-     * @exception  IOException   if an I/O error occurs.
-     */
-    public final short readShort() throws IOException {
-        int ch1 = this.read();
-        int ch2 = this.read();
-        if ((ch1 | ch2) < 0)
-            throw new EOFException();
-        return (short)((ch1 << 8) + (ch2 << 0));
-    }
-
-    /**
-     * Reads an unsigned 16-bit number from this file. This method reads
-     * two bytes from the file, starting at the current file pointer.
-     * If the bytes read, in order, are
-     * <code>b1</code> and <code>b2</code>, where
-     * <code>0&nbsp;&lt;=&nbsp;b1, b2&nbsp;&lt;=&nbsp;255</code>,
-     * then the result is equal to:
-     * <blockquote><pre>
-     *     (b1 &lt;&lt; 8) | b2
-     * </pre></blockquote>
-     * <p>
-     * This method blocks until the two bytes are read, the end of the
-     * stream is detected, or an exception is thrown.
-     *
-     * @return     the next two bytes of this file, interpreted as an unsigned
-     *             16-bit integer.
-     * @exception  EOFException  if this file reaches the end before reading
-     *               two bytes.
-     * @exception  IOException   if an I/O error occurs.
-     */
-    public final int readUnsignedShort() throws IOException {
-        int ch1 = this.read();
-        int ch2 = this.read();
-        if ((ch1 | ch2) < 0)
-            throw new EOFException();
-        return (ch1 << 8) + (ch2 << 0);
-    }
-
-    /**
-     * Reads a character from this file. This method reads two
-     * bytes from the file, starting at the current file pointer.
-     * If the bytes read, in order, are
-     * <code>b1</code> and <code>b2</code>, where
-     * <code>0&nbsp;&lt;=&nbsp;b1,&nbsp;b2&nbsp;&lt;=&nbsp;255</code>,
-     * then the result is equal to:
-     * <blockquote><pre>
-     *     (char)((b1 &lt;&lt; 8) | b2)
-     * </pre></blockquote>
-     * <p>
-     * This method blocks until the two bytes are read, the end of the
-     * stream is detected, or an exception is thrown.
-     *
-     * @return     the next two bytes of this file, interpreted as a
-     *                  <code>char</code>.
-     * @exception  EOFException  if this file reaches the end before reading
-     *               two bytes.
-     * @exception  IOException   if an I/O error occurs.
-     */
-    public final char readChar() throws IOException {
-        int ch1 = this.read();
-        int ch2 = this.read();
-        if ((ch1 | ch2) < 0)
-            throw new EOFException();
-        return (char)((ch1 << 8) + (ch2 << 0));
-    }
-
-    /**
-     * Reads a signed 32-bit integer from this file. This method reads 4
-     * bytes from the file, starting at the current file pointer.
-     * If the bytes read, in order, are <code>b1</code>,
-     * <code>b2</code>, <code>b3</code>, and <code>b4</code>, where
-     * <code>0&nbsp;&lt;=&nbsp;b1, b2, b3, b4&nbsp;&lt;=&nbsp;255</code>,
-     * then the result is equal to:
-     * <blockquote><pre>
-     *     (b1 &lt;&lt; 24) | (b2 &lt;&lt; 16) + (b3 &lt;&lt; 8) + b4
-     * </pre></blockquote>
-     * <p>
-     * This method blocks until the four bytes are read, the end of the
-     * stream is detected, or an exception is thrown.
-     *
-     * @return     the next four bytes of this file, interpreted as an
-     *             <code>int</code>.
-     * @exception  EOFException  if this file reaches the end before reading
-     *               four bytes.
-     * @exception  IOException   if an I/O error occurs.
-     */
-    public final int readInt() throws IOException {
-        int ch1 = this.read();
-        int ch2 = this.read();
-        int ch3 = this.read();
-        int ch4 = this.read();
-        if ((ch1 | ch2 | ch3 | ch4) < 0)
-            throw new EOFException();
-        return ((ch1 << 24) + (ch2 << 16) + (ch3 << 8) + (ch4 << 0));
-    }
-
-    /**
-     * Reads a signed 64-bit integer from this file. This method reads eight
-     * bytes from the file, starting at the current file pointer.
-     * If the bytes read, in order, are
-     * <code>b1</code>, <code>b2</code>, <code>b3</code>,
-     * <code>b4</code>, <code>b5</code>, <code>b6</code>,
-     * <code>b7</code>, and <code>b8,</code> where:
-     * <blockquote><pre>
-     *     0 &lt;= b1, b2, b3, b4, b5, b6, b7, b8 &lt;=255,
-     * </pre></blockquote>
-     * <p>
-     * then the result is equal to:
-     * <p><blockquote><pre>
-     *     ((long)b1 &lt;&lt; 56) + ((long)b2 &lt;&lt; 48)
-     *     + ((long)b3 &lt;&lt; 40) + ((long)b4 &lt;&lt; 32)
-     *     + ((long)b5 &lt;&lt; 24) + ((long)b6 &lt;&lt; 16)
-     *     + ((long)b7 &lt;&lt; 8) + b8
-     * </pre></blockquote>
-     * <p>
-     * This method blocks until the eight bytes are read, the end of the
-     * stream is detected, or an exception is thrown.
-     *
-     * @return     the next eight bytes of this file, interpreted as a
-     *             <code>long</code>.
-     * @exception  EOFException  if this file reaches the end before reading
-     *               eight bytes.
-     * @exception  IOException   if an I/O error occurs.
-     */
-    public final long readLong() throws IOException {
-        return ((long)(readInt()) << 32) + (readInt() & 0xFFFFFFFFL);
-    }
-
-    /**
-     * Reads a <code>float</code> from this file. This method reads an
-     * <code>int</code> value, starting at the current file pointer,
-     * as if by the <code>readInt</code> method
-     * and then converts that <code>int</code> to a <code>float</code>
-     * using the <code>intBitsToFloat</code> method in class
-     * <code>Float</code>.
-     * <p>
-     * This method blocks until the four bytes are read, the end of the
-     * stream is detected, or an exception is thrown.
-     *
-     * @return     the next four bytes of this file, interpreted as a
-     *             <code>float</code>.
-     * @exception  EOFException  if this file reaches the end before reading
-     *             four bytes.
-     * @exception  IOException   if an I/O error occurs.
-     * @see        java.io.RandomAccessFile#readInt()
-     * @see        java.lang.Float#intBitsToFloat(int)
-     */
-    public final float readFloat() throws IOException {
-        return Float.intBitsToFloat(readInt());
-    }
-
-    /**
-     * Reads a <code>double</code> from this file. This method reads a
-     * <code>long</code> value, starting at the current file pointer,
-     * as if by the <code>readLong</code> method
-     * and then converts that <code>long</code> to a <code>double</code>
-     * using the <code>longBitsToDouble</code> method in
-     * class <code>Double</code>.
-     * <p>
-     * This method blocks until the eight bytes are read, the end of the
-     * stream is detected, or an exception is thrown.
-     *
-     * @return     the next eight bytes of this file, interpreted as a
-     *             <code>double</code>.
-     * @exception  EOFException  if this file reaches the end before reading
-     *             eight bytes.
-     * @exception  IOException   if an I/O error occurs.
-     * @see        java.io.RandomAccessFile#readLong()
-     * @see        java.lang.Double#longBitsToDouble(long)
-     */
-    public final double readDouble() throws IOException {
-        return Double.longBitsToDouble(readLong());
-    }
-
-    /**
-     * Reads the next line of text from this file.  This method successively
-     * reads bytes from the file, starting at the current file pointer,
-     * until it reaches a line terminator or the end
-     * of the file.  Each byte is converted into a character by taking the
-     * byte's value for the lower eight bits of the character and setting the
-     * high eight bits of the character to zero.  This method does not,
-     * therefore, support the full Unicode character set.
-     *
-     * <p> A line of text is terminated by a carriage-return character
-     * (<code>'&#92;r'</code>), a newline character (<code>'&#92;n'</code>), a
-     * carriage-return character immediately followed by a newline character,
-     * or the end of the file.  Line-terminating characters are discarded and
-     * are not included as part of the string returned.
-     *
-     * <p> This method blocks until a newline character is read, a carriage
-     * return and the byte following it are read (to see if it is a newline),
-     * the end of the file is reached, or an exception is thrown.
-     *
-     * @return     the next line of text from this file, or null if end
-     *             of file is encountered before even one byte is read.
-     * @exception  IOException  if an I/O error occurs.
-     */
-
-    public final String readLine() throws IOException {
-        StringBuffer input = new StringBuffer();
-        int c = -1;
-        boolean eol = false;
-
-        while (!eol) {
-            switch (c = read()) {
-            case -1:
-            case '\n':
-                eol = true;
-                break;
-            case '\r':
-                eol = true;
-                long cur = getFilePointer();
-                if ((read()) != '\n') {
-                    seek(cur);
-                }
-                break;
-            default:
-                input.append((char)c);
-                break;
-            }
-        }
-
-        if ((c == -1) && (input.length() == 0)) {
-            return null;
-        }
-        return input.toString();
-    }
-
-    /**
-     * Reads in a string from this file. The string has been encoded
-     * using a
-     * <a href="DataInput.html#modified-utf-8">modified UTF-8</a>
-     * format.
-     * <p>
-     * The first two bytes are read, starting from the current file
-     * pointer, as if by
-     * <code>readUnsignedShort</code>. This value gives the number of
-     * following bytes that are in the encoded string, not
-     * the length of the resulting string. The following bytes are then
-     * interpreted as bytes encoding characters in the modified UTF-8 format
-     * and are converted into characters.
-     * <p>
-     * This method blocks until all the bytes are read, the end of the
-     * stream is detected, or an exception is thrown.
-     *
-     * @return     a Unicode string.
-     * @exception  EOFException            if this file reaches the end before
-     *               reading all the bytes.
-     * @exception  IOException             if an I/O error occurs.
-     * @exception  UTFDataFormatException  if the bytes do not represent
-     *               valid modified UTF-8 encoding of a Unicode string.
-     * @see        java.io.RandomAccessFile#readUnsignedShort()
-     */
-    public final String readUTF() throws IOException {
-        return DataInputStream.readUTF(this);
-    }
-
-    /**
-     * Writes a <code>boolean</code> to the file as a one-byte value. The
-     * value <code>true</code> is written out as the value
-     * <code>(byte)1</code>; the value <code>false</code> is written out
-     * as the value <code>(byte)0</code>. The write starts at
-     * the current position of the file pointer.
-     *
-     * @param      v   a <code>boolean</code> value to be written.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public final void writeBoolean(boolean v) throws IOException {
-        write(v ? 1 : 0);
-        //written++;
-    }
-
-    /**
-     * Writes a <code>byte</code> to the file as a one-byte value. The
-     * write starts at the current position of the file pointer.
-     *
-     * @param      v   a <code>byte</code> value to be written.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public final void writeByte(int v) throws IOException {
-        write(v);
-        //written++;
-    }
-
-    /**
-     * Writes a <code>short</code> to the file as two bytes, high byte first.
-     * The write starts at the current position of the file pointer.
-     *
-     * @param      v   a <code>short</code> to be written.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public final void writeShort(int v) throws IOException {
-        write((v >>> 8) & 0xFF);
-        write((v >>> 0) & 0xFF);
-        //written += 2;
-    }
-
-    /**
-     * Writes a <code>char</code> to the file as a two-byte value, high
-     * byte first. The write starts at the current position of the
-     * file pointer.
-     *
-     * @param      v   a <code>char</code> value to be written.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public final void writeChar(int v) throws IOException {
-        write((v >>> 8) & 0xFF);
-        write((v >>> 0) & 0xFF);
-        //written += 2;
-    }
-
-    /**
-     * Writes an <code>int</code> to the file as four bytes, high byte first.
-     * The write starts at the current position of the file pointer.
-     *
-     * @param      v   an <code>int</code> to be written.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public final void writeInt(int v) throws IOException {
-        write((v >>> 24) & 0xFF);
-        write((v >>> 16) & 0xFF);
-        write((v >>>  8) & 0xFF);
-        write((v >>>  0) & 0xFF);
-        //written += 4;
-    }
-
-    /**
-     * Writes a <code>long</code> to the file as eight bytes, high byte first.
-     * The write starts at the current position of the file pointer.
-     *
-     * @param      v   a <code>long</code> to be written.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public final void writeLong(long v) throws IOException {
-        write((int)(v >>> 56) & 0xFF);
-        write((int)(v >>> 48) & 0xFF);
-        write((int)(v >>> 40) & 0xFF);
-        write((int)(v >>> 32) & 0xFF);
-        write((int)(v >>> 24) & 0xFF);
-        write((int)(v >>> 16) & 0xFF);
-        write((int)(v >>>  8) & 0xFF);
-        write((int)(v >>>  0) & 0xFF);
-        //written += 8;
-    }
-
-    /**
-     * Converts the float argument to an <code>int</code> using the
-     * <code>floatToIntBits</code> method in class <code>Float</code>,
-     * and then writes that <code>int</code> value to the file as a
-     * four-byte quantity, high byte first. The write starts at the
-     * current position of the file pointer.
-     *
-     * @param      v   a <code>float</code> value to be written.
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.lang.Float#floatToIntBits(float)
-     */
-    public final void writeFloat(float v) throws IOException {
-        writeInt(Float.floatToIntBits(v));
-    }
-
-    /**
-     * Converts the double argument to a <code>long</code> using the
-     * <code>doubleToLongBits</code> method in class <code>Double</code>,
-     * and then writes that <code>long</code> value to the file as an
-     * eight-byte quantity, high byte first. The write starts at the current
-     * position of the file pointer.
-     *
-     * @param      v   a <code>double</code> value to be written.
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.lang.Double#doubleToLongBits(double)
-     */
-    public final void writeDouble(double v) throws IOException {
-        writeLong(Double.doubleToLongBits(v));
-    }
-
-    /**
-     * Writes the string to the file as a sequence of bytes. Each
-     * character in the string is written out, in sequence, by discarding
-     * its high eight bits. The write starts at the current position of
-     * the file pointer.
-     *
-     * @param      s   a string of bytes to be written.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public final void writeBytes(String s) throws IOException {
-        int len = s.length();
-        byte[] b = new byte[len];
-        s.getBytes(0, len, b, 0);
-        writeBytes(b, 0, len);
-    }
-
-    /**
-     * Writes a string to the file as a sequence of characters. Each
-     * character is written to the data output stream as if by the
-     * <code>writeChar</code> method. The write starts at the current
-     * position of the file pointer.
-     *
-     * @param      s   a <code>String</code> value to be written.
-     * @exception  IOException  if an I/O error occurs.
-     * @see        java.io.RandomAccessFile#writeChar(int)
-     */
-    public final void writeChars(String s) throws IOException {
-        int clen = s.length();
-        int blen = 2*clen;
-        byte[] b = new byte[blen];
-        char[] c = new char[clen];
-        s.getChars(0, clen, c, 0);
-        for (int i = 0, j = 0; i < clen; i++) {
-            b[j++] = (byte)(c[i] >>> 8);
-            b[j++] = (byte)(c[i] >>> 0);
-        }
-        writeBytes(b, 0, blen);
-    }
-
-    /**
-     * Writes a string to the file using
-     * <a href="DataInput.html#modified-utf-8">modified UTF-8</a>
-     * encoding in a machine-independent manner.
-     * <p>
-     * First, two bytes are written to the file, starting at the
-     * current file pointer, as if by the
-     * <code>writeShort</code> method giving the number of bytes to
-     * follow. This value is the number of bytes actually written out,
-     * not the length of the string. Following the length, each character
-     * of the string is output, in sequence, using the modified UTF-8 encoding
-     * for each character.
-     *
-     * @param      str   a string to be written.
-     * @exception  IOException  if an I/O error occurs.
-     */
-    public final void writeUTF(String str) throws IOException {
-        DataOutputStream.writeUTF(str, this);
-    }
-
-    private void close0() throws IOException
-    {
-        fd.close();
-    }
-}
diff --git a/openjdk/java/lang/Class.java b/openjdk/java/lang/Class.java
deleted file mode 100644
index 07fd7bd5..00000000
--- a/openjdk/java/lang/Class.java
+++ /dev/null
@@ -1,3601 +0,0 @@
-/*
- * Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Array;
-import java.lang.reflect.GenericArrayType;
-import java.lang.reflect.GenericDeclaration;
-import java.lang.reflect.Member;
-import java.lang.reflect.Field;
-import java.lang.reflect.Executable;
-import java.lang.reflect.Method;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.AnnotatedType;
-import java.lang.ref.SoftReference;
-import java.io.InputStream;
-import java.io.ObjectStreamField;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Set;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Objects;
-import sun.misc.Unsafe;
-import sun.reflect.CallerSensitive;
-import sun.reflect.ConstantPool;
-import sun.reflect.Reflection;
-import sun.reflect.ReflectionFactory;
-import sun.reflect.generics.factory.CoreReflectionFactory;
-import sun.reflect.generics.factory.GenericsFactory;
-import sun.reflect.generics.repository.ClassRepository;
-import sun.reflect.generics.repository.MethodRepository;
-import sun.reflect.generics.repository.ConstructorRepository;
-import sun.reflect.generics.scope.ClassScope;
-import sun.security.util.SecurityConstants;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Proxy;
-import sun.reflect.annotation.*;
-import sun.reflect.misc.ReflectUtil;
-import cli.System.Runtime.Serialization.IObjectReference;
-import cli.System.Runtime.Serialization.SerializationException;
-import cli.System.Runtime.Serialization.SerializationInfo;
-import cli.System.Runtime.Serialization.StreamingContext;
-
-@cli.System.SerializableAttribute.Annotation
-final class ClassSerializationProxy implements IObjectReference
-{
-    private cli.System.Type type;
-    private String sig;
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    public Object GetRealObject(StreamingContext context)
-    {
-        if (sig != null)
-        {
-            if (sig.length() == 1)
-            {
-                switch (sig.charAt(0))
-                {
-                    case 'B':
-                        return Byte.TYPE;
-                    case 'C':
-                        return Character.TYPE;
-                    case 'D':
-                        return Double.TYPE;
-                    case 'F':
-                        return Float.TYPE;
-                    case 'I':
-                        return Integer.TYPE;
-                    case 'J':
-                        return Long.TYPE;
-                    case 'S':
-                        return Short.TYPE;
-                    case 'Z':
-                        return Boolean.TYPE;
-                    case 'V':
-                        return Void.TYPE;
-                }
-            }
-            String className;
-            if (sig.charAt(0) == 'L')
-            {
-                className = sig.substring(1, sig.length() - 1);
-            }
-            else
-            {
-                className = sig;
-            }
-            try
-            {
-                return Class.forName(className, false, Thread.currentThread().getContextClassLoader());
-            }
-            catch (ClassNotFoundException x)
-            {
-                ikvm.runtime.Util.throwException(new SerializationException(x.getMessage(), x));
-            }
-        }
-        return ikvm.runtime.Util.getClassFromTypeHandle(type.get_TypeHandle());
-    }
-}
-
-/**
- * Instances of the class {@code Class} represent classes and
- * interfaces in a running Java application.  An enum is a kind of
- * class and an annotation is a kind of interface.  Every array also
- * belongs to a class that is reflected as a {@code Class} object
- * that is shared by all arrays with the same element type and number
- * of dimensions.  The primitive Java types ({@code boolean},
- * {@code byte}, {@code char}, {@code short},
- * {@code int}, {@code long}, {@code float}, and
- * {@code double}), and the keyword {@code void} are also
- * represented as {@code Class} objects.
- *
- * <p> {@code Class} has no public constructor. Instead {@code Class}
- * objects are constructed automatically by the Java Virtual Machine as classes
- * are loaded and by calls to the {@code defineClass} method in the class
- * loader.
- *
- * <p> The following example uses a {@code Class} object to print the
- * class name of an object:
- *
- * <blockquote><pre>
- *     void printClassName(Object obj) {
- *         System.out.println("The class of " + obj +
- *                            " is " + obj.getClass().getName());
- *     }
- * </pre></blockquote>
- *
- * <p> It is also possible to get the {@code Class} object for a named
- * type (or for void) using a class literal.  See Section 15.8.2 of
- * <cite>The Java&trade; Language Specification</cite>.
- * For example:
- *
- * <blockquote>
- *     {@code System.out.println("The name of class Foo is: "+Foo.class.getName());}
- * </blockquote>
- *
- * @param <T> the type of the class modeled by this {@code Class}
- * object.  For example, the type of {@code String.class} is {@code
- * Class<String>}.  Use {@code Class<?>} if the class being modeled is
- * unknown.
- *
- * @author  unascribed
- * @see     java.lang.ClassLoader#defineClass(byte[], int, int)
- * @since   JDK1.0
- */
-@cli.System.SerializableAttribute.Annotation
-public final class Class<T> implements java.io.Serializable,
-                              GenericDeclaration,
-                              Type,
-                              AnnotatedElement {
-    private static final int ANNOTATION= 0x00002000;
-    private static final int ENUM      = 0x00004000;
-    private static final int SYNTHETIC = 0x00001000;
-
-    // [IKVM] additional fields
-    java.security.ProtectionDomain pd;
-    Object[] signers;
-
-    // For types that live in a static .NET assembly (i.e. ikvmc compiled or .NET types)
-    // this field contains the type (used for .NET serialization of Class objects).
-    // This field is also used by fast class literals to remember the type that can then
-    // lazily be resolved to the corresponding TypeWrapper.
-    // For dynamically loaded classes and primitives it is null.
-    final cli.System.Type type;
-
-    /*
-     * Constructor. Only the Java Virtual Machine creates Class
-     * objects.
-     */
-    private Class()
-    {
-        // this constructor is not used, but exists for compatibility
-        // (otherwise it would look as if this class doesn't have a constructor, which might break some code)
-        throw new InternalError();
-    }
-
-    @cli.IKVM.Attributes.HideFromJavaAttribute.Annotation
-    Class(cli.System.Type type)
-    {
-        this.type = type;
-    }
-    
-    // We use custom serialization, because we want to deserialize a via proxy that properly resolves the Class singletons.
-    // Note that we don't implement ISerializable in this source, but in map.xml to avoid it being visible to Java code.
-    // We don't have a security demand, because the information exposed is harmless.
-    @cli.IKVM.Attributes.HideFromJavaAttribute.Annotation
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    public void GetObjectData(SerializationInfo info, StreamingContext context)
-    {
-        info.AddValue("type", type);
-        info.AddValue("sig", type == null ? getSigName() : null);
-        info.SetType(ikvm.runtime.Util.getInstanceTypeFromClass(ClassSerializationProxy.class));
-    }
-
-    private native String getSigName();
-
-    // [IKVM] this provides an implicit conversion operator from System.Type to java.lang.Class
-    @cli.System.Runtime.CompilerServices.SpecialNameAttribute.Annotation
-    @cli.IKVM.Attributes.HideFromJavaAttribute.Annotation
-    public static Class op_Implicit(cli.System.Type type)
-    {
-        return ikvm.runtime.Util.getFriendlyClassFromType(type);
-    }
-
-    /**
-     * Converts the object to a string. The string representation is the
-     * string "class" or "interface", followed by a space, and then by the
-     * fully qualified name of the class in the format returned by
-     * {@code getName}.  If this {@code Class} object represents a
-     * primitive type, this method returns the name of the primitive type.  If
-     * this {@code Class} object represents void this method returns
-     * "void".
-     *
-     * @return a string representation of this class object.
-     */
-    public String toString() {
-        return (isInterface() ? "interface " : (isPrimitive() ? "" : "class "))
-            + getName();
-    }
-
-    /**
-     * Returns a string describing this {@code Class}, including
-     * information about modifiers and type parameters.
-     *
-     * The string is formatted as a list of type modifiers, if any,
-     * followed by the kind of type (empty string for primitive types
-     * and {@code class}, {@code enum}, {@code interface}, or
-     * <code>&#64;</code>{@code interface}, as appropriate), followed
-     * by the type's name, followed by an angle-bracketed
-     * comma-separated list of the type's type parameters, if any.
-     *
-     * A space is used to separate modifiers from one another and to
-     * separate any modifiers from the kind of type. The modifiers
-     * occur in canonical order. If there are no type parameters, the
-     * type parameter list is elided.
-     *
-     * <p>Note that since information about the runtime representation
-     * of a type is being generated, modifiers not present on the
-     * originating source code or illegal on the originating source
-     * code may be present.
-     *
-     * @return a string describing this {@code Class}, including
-     * information about modifiers and type parameters
-     *
-     * @since 1.8
-     */
-    public String toGenericString() {
-        if (isPrimitive()) {
-            return toString();
-        } else {
-            StringBuilder sb = new StringBuilder();
-
-            // Class modifiers are a superset of interface modifiers
-            int modifiers = getModifiers() & Modifier.classModifiers();
-            if (modifiers != 0) {
-                sb.append(Modifier.toString(modifiers));
-                sb.append(' ');
-            }
-
-            if (isAnnotation()) {
-                sb.append('@');
-            }
-            if (isInterface()) { // Note: all annotation types are interfaces
-                sb.append("interface");
-            } else {
-                if (isEnum())
-                    sb.append("enum");
-                else
-                    sb.append("class");
-            }
-            sb.append(' ');
-            sb.append(getName());
-
-            TypeVariable<?>[] typeparms = getTypeParameters();
-            if (typeparms.length > 0) {
-                boolean first = true;
-                sb.append('<');
-                for(TypeVariable<?> typeparm: typeparms) {
-                    if (!first)
-                        sb.append(',');
-                    sb.append(typeparm.getTypeName());
-                    first = false;
-                }
-                sb.append('>');
-            }
-
-            return sb.toString();
-        }
-    }
-
-    /**
-     * Returns the {@code Class} object associated with the class or
-     * interface with the given string name.  Invoking this method is
-     * equivalent to:
-     *
-     * <blockquote>
-     *  {@code Class.forName(className, true, currentLoader)}
-     * </blockquote>
-     *
-     * where {@code currentLoader} denotes the defining class loader of
-     * the current class.
-     *
-     * <p> For example, the following code fragment returns the
-     * runtime {@code Class} descriptor for the class named
-     * {@code java.lang.Thread}:
-     *
-     * <blockquote>
-     *   {@code Class t = Class.forName("java.lang.Thread")}
-     * </blockquote>
-     * <p>
-     * A call to {@code forName("X")} causes the class named
-     * {@code X} to be initialized.
-     *
-     * @param      className   the fully qualified name of the desired class.
-     * @return     the {@code Class} object for the class with the
-     *             specified name.
-     * @exception LinkageError if the linkage fails
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *            by this method fails
-     * @exception ClassNotFoundException if the class cannot be located
-     */
-    @CallerSensitive
-    public static Class<?> forName(String className)
-                throws ClassNotFoundException {
-        return forName0(className, true,
-                        ClassLoader.getClassLoader(Reflection.getCallerClass()));
-    }
-
-
-    /**
-     * Returns the {@code Class} object associated with the class or
-     * interface with the given string name, using the given class loader.
-     * Given the fully qualified name for a class or interface (in the same
-     * format returned by {@code getName}) this method attempts to
-     * locate, load, and link the class or interface.  The specified class
-     * loader is used to load the class or interface.  If the parameter
-     * {@code loader} is null, the class is loaded through the bootstrap
-     * class loader.  The class is initialized only if the
-     * {@code initialize} parameter is {@code true} and if it has
-     * not been initialized earlier.
-     *
-     * <p> If {@code name} denotes a primitive type or void, an attempt
-     * will be made to locate a user-defined class in the unnamed package whose
-     * name is {@code name}. Therefore, this method cannot be used to
-     * obtain any of the {@code Class} objects representing primitive
-     * types or void.
-     *
-     * <p> If {@code name} denotes an array class, the component type of
-     * the array class is loaded but not initialized.
-     *
-     * <p> For example, in an instance method the expression:
-     *
-     * <blockquote>
-     *  {@code Class.forName("Foo")}
-     * </blockquote>
-     *
-     * is equivalent to:
-     *
-     * <blockquote>
-     *  {@code Class.forName("Foo", true, this.getClass().getClassLoader())}
-     * </blockquote>
-     *
-     * Note that this method throws errors related to loading, linking or
-     * initializing as specified in Sections 12.2, 12.3 and 12.4 of <em>The
-     * Java Language Specification</em>.
-     * Note that this method does not check whether the requested class
-     * is accessible to its caller.
-     *
-     * <p> If the {@code loader} is {@code null}, and a security
-     * manager is present, and the caller's class loader is not null, then this
-     * method calls the security manager's {@code checkPermission} method
-     * with a {@code RuntimePermission("getClassLoader")} permission to
-     * ensure it's ok to access the bootstrap class loader.
-     *
-     * @param name       fully qualified name of the desired class
-     * @param initialize if {@code true} the class will be initialized.
-     *                   See Section 12.4 of <em>The Java Language Specification</em>.
-     * @param loader     class loader from which the class must be loaded
-     * @return           class object representing the desired class
-     *
-     * @exception LinkageError if the linkage fails
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *            by this method fails
-     * @exception ClassNotFoundException if the class cannot be located by
-     *            the specified class loader
-     *
-     * @see       java.lang.Class#forName(String)
-     * @see       java.lang.ClassLoader
-     * @since     1.2
-     */
-    @CallerSensitive
-    public static Class<?> forName(String name, boolean initialize,
-                                   ClassLoader loader)
-        throws ClassNotFoundException
-    {
-        if (sun.misc.VM.isSystemDomainLoader(loader)) {
-            SecurityManager sm = System.getSecurityManager();
-            if (sm != null) {
-                ClassLoader ccl = ClassLoader.getClassLoader(Reflection.getCallerClass());
-                if (!sun.misc.VM.isSystemDomainLoader(ccl)) {
-                    sm.checkPermission(
-                        SecurityConstants.GET_CLASSLOADER_PERMISSION);
-                }
-            }
-        }
-        return forName0(name, initialize, loader);
-    }
-
-    /** Called after security checks have been made. */
-    private static native Class<?> forName0(String name, boolean initialize,
-                                            ClassLoader loader)
-        throws ClassNotFoundException;
-
-    /**
-     * Creates a new instance of the class represented by this {@code Class}
-     * object.  The class is instantiated as if by a {@code new}
-     * expression with an empty argument list.  The class is initialized if it
-     * has not already been initialized.
-     *
-     * <p>Note that this method propagates any exception thrown by the
-     * nullary constructor, including a checked exception.  Use of
-     * this method effectively bypasses the compile-time exception
-     * checking that would otherwise be performed by the compiler.
-     * The {@link
-     * java.lang.reflect.Constructor#newInstance(java.lang.Object...)
-     * Constructor.newInstance} method avoids this problem by wrapping
-     * any exception thrown by the constructor in a (checked) {@link
-     * java.lang.reflect.InvocationTargetException}.
-     *
-     * @return  a newly allocated instance of the class represented by this
-     *          object.
-     * @throws  IllegalAccessException  if the class or its nullary
-     *          constructor is not accessible.
-     * @throws  InstantiationException
-     *          if this {@code Class} represents an abstract class,
-     *          an interface, an array class, a primitive type, or void;
-     *          or if the class has no nullary constructor;
-     *          or if the instantiation fails for some other reason.
-     * @throws  ExceptionInInitializerError if the initialization
-     *          provoked by this method fails.
-     * @throws  SecurityException
-     *          If a security manager, <i>s</i>, is present and
-     *          the caller's class loader is not the same as or an
-     *          ancestor of the class loader for the current class and
-     *          invocation of {@link SecurityManager#checkPackageAccess
-     *          s.checkPackageAccess()} denies access to the package
-     *          of this class.
-     */
-    @CallerSensitive
-    public T newInstance()
-        throws InstantiationException, IllegalAccessException
-    {
-        if (System.getSecurityManager() != null) {
-            checkMemberAccess(Member.PUBLIC, Reflection.getCallerClass(), false);
-        }
-
-        // NOTE: the following code may not be strictly correct under
-        // the current Java memory model.
-
-        // Constructor lookup
-        if (cachedConstructor == null) {
-            if (this == Class.class) {
-                throw new IllegalAccessException(
-                    "Can not call newInstance() on the Class for java.lang.Class"
-                );
-            }
-            try {
-                Class<?>[] empty = {};
-                final Constructor<T> c = getConstructor0(empty, Member.DECLARED);
-                // Disable accessibility checks on the constructor
-                // since we have to do the security check here anyway
-                // (the stack depth is wrong for the Constructor's
-                // security check to work)
-                java.security.AccessController.doPrivileged(
-                    new java.security.PrivilegedAction<Void>() {
-                        public Void run() {
-                                c.setAccessible(true);
-                                return null;
-                            }
-                        });
-                cachedConstructor = c;
-            } catch (NoSuchMethodException e) {
-                throw (InstantiationException)
-                    new InstantiationException(getName()).initCause(e);
-            }
-        }
-        Constructor<T> tmpConstructor = cachedConstructor;
-        // Security check (same as in java.lang.reflect.Constructor)
-        int modifiers = tmpConstructor.getModifiers();
-        if (!Reflection.quickCheckMemberAccess(this, modifiers)) {
-            Class<?> caller = Reflection.getCallerClass();
-            if (newInstanceCallerCache != caller) {
-                Reflection.ensureMemberAccess(caller, this, null, modifiers);
-                newInstanceCallerCache = caller;
-            }
-        }
-        // Run constructor
-        try {
-            return tmpConstructor.newInstance((Object[])null);
-        } catch (InvocationTargetException e) {
-            Unsafe.getUnsafe().throwException(e.getTargetException());
-            // Not reached
-            return null;
-        }
-    }
-    private volatile transient Constructor<T> cachedConstructor;
-    private volatile transient Class<?>       newInstanceCallerCache;
-
-
-    /**
-     * Determines if the specified {@code Object} is assignment-compatible
-     * with the object represented by this {@code Class}.  This method is
-     * the dynamic equivalent of the Java language {@code instanceof}
-     * operator. The method returns {@code true} if the specified
-     * {@code Object} argument is non-null and can be cast to the
-     * reference type represented by this {@code Class} object without
-     * raising a {@code ClassCastException.} It returns {@code false}
-     * otherwise.
-     *
-     * <p> Specifically, if this {@code Class} object represents a
-     * declared class, this method returns {@code true} if the specified
-     * {@code Object} argument is an instance of the represented class (or
-     * of any of its subclasses); it returns {@code false} otherwise. If
-     * this {@code Class} object represents an array class, this method
-     * returns {@code true} if the specified {@code Object} argument
-     * can be converted to an object of the array class by an identity
-     * conversion or by a widening reference conversion; it returns
-     * {@code false} otherwise. If this {@code Class} object
-     * represents an interface, this method returns {@code true} if the
-     * class or any superclass of the specified {@code Object} argument
-     * implements this interface; it returns {@code false} otherwise. If
-     * this {@code Class} object represents a primitive type, this method
-     * returns {@code false}.
-     *
-     * @param   obj the object to check
-     * @return  true if {@code obj} is an instance of this class
-     *
-     * @since JDK1.1
-     */
-    public native boolean isInstance(Object obj);
-
-
-    /**
-     * Determines if the class or interface represented by this
-     * {@code Class} object is either the same as, or is a superclass or
-     * superinterface of, the class or interface represented by the specified
-     * {@code Class} parameter. It returns {@code true} if so;
-     * otherwise it returns {@code false}. If this {@code Class}
-     * object represents a primitive type, this method returns
-     * {@code true} if the specified {@code Class} parameter is
-     * exactly this {@code Class} object; otherwise it returns
-     * {@code false}.
-     *
-     * <p> Specifically, this method tests whether the type represented by the
-     * specified {@code Class} parameter can be converted to the type
-     * represented by this {@code Class} object via an identity conversion
-     * or via a widening reference conversion. See <em>The Java Language
-     * Specification</em>, sections 5.1.1 and 5.1.4 , for details.
-     *
-     * @param cls the {@code Class} object to be checked
-     * @return the {@code boolean} value indicating whether objects of the
-     * type {@code cls} can be assigned to objects of this class
-     * @exception NullPointerException if the specified Class parameter is
-     *            null.
-     * @since JDK1.1
-     */
-    public native boolean isAssignableFrom(Class<?> cls);
-
-
-    /**
-     * Determines if the specified {@code Class} object represents an
-     * interface type.
-     *
-     * @return  {@code true} if this object represents an interface;
-     *          {@code false} otherwise.
-     */
-    public native boolean isInterface();
-
-
-    /**
-     * Determines if this {@code Class} object represents an array class.
-     *
-     * @return  {@code true} if this object represents an array class;
-     *          {@code false} otherwise.
-     * @since   JDK1.1
-     */
-    public native boolean isArray();
-
-
-    /**
-     * Determines if the specified {@code Class} object represents a
-     * primitive type.
-     *
-     * <p> There are nine predefined {@code Class} objects to represent
-     * the eight primitive types and void.  These are created by the Java
-     * Virtual Machine, and have the same names as the primitive types that
-     * they represent, namely {@code boolean}, {@code byte},
-     * {@code char}, {@code short}, {@code int},
-     * {@code long}, {@code float}, and {@code double}.
-     *
-     * <p> These objects may only be accessed via the following public static
-     * final variables, and are the only {@code Class} objects for which
-     * this method returns {@code true}.
-     *
-     * @return true if and only if this class represents a primitive type
-     *
-     * @see     java.lang.Boolean#TYPE
-     * @see     java.lang.Character#TYPE
-     * @see     java.lang.Byte#TYPE
-     * @see     java.lang.Short#TYPE
-     * @see     java.lang.Integer#TYPE
-     * @see     java.lang.Long#TYPE
-     * @see     java.lang.Float#TYPE
-     * @see     java.lang.Double#TYPE
-     * @see     java.lang.Void#TYPE
-     * @since JDK1.1
-     */
-    public native boolean isPrimitive();
-
-    /**
-     * Returns true if this {@code Class} object represents an annotation
-     * type.  Note that if this method returns true, {@link #isInterface()}
-     * would also return true, as all annotation types are also interfaces.
-     *
-     * @return {@code true} if this class object represents an annotation
-     *      type; {@code false} otherwise
-     * @since 1.5
-     */
-    public boolean isAnnotation() {
-        return (getModifiers() & ANNOTATION) != 0;
-    }
-
-    /**
-     * Returns {@code true} if this class is a synthetic class;
-     * returns {@code false} otherwise.
-     * @return {@code true} if and only if this class is a synthetic class as
-     *         defined by the Java Language Specification.
-     * @jls 13.1 The Form of a Binary
-     * @since 1.5
-     */
-    public boolean isSynthetic() {
-        return (getModifiers() & SYNTHETIC) != 0;
-    }
-
-    /**
-     * Returns the  name of the entity (class, interface, array class,
-     * primitive type, or void) represented by this {@code Class} object,
-     * as a {@code String}.
-     *
-     * <p> If this class object represents a reference type that is not an
-     * array type then the binary name of the class is returned, as specified
-     * by
-     * <cite>The Java&trade; Language Specification</cite>.
-     *
-     * <p> If this class object represents a primitive type or void, then the
-     * name returned is a {@code String} equal to the Java language
-     * keyword corresponding to the primitive type or void.
-     *
-     * <p> If this class object represents a class of arrays, then the internal
-     * form of the name consists of the name of the element type preceded by
-     * one or more '{@code [}' characters representing the depth of the array
-     * nesting.  The encoding of element type names is as follows:
-     *
-     * <blockquote><table summary="Element types and encodings">
-     * <tr><th> Element Type <th> &nbsp;&nbsp;&nbsp; <th> Encoding
-     * <tr><td> boolean      <td> &nbsp;&nbsp;&nbsp; <td align=center> Z
-     * <tr><td> byte         <td> &nbsp;&nbsp;&nbsp; <td align=center> B
-     * <tr><td> char         <td> &nbsp;&nbsp;&nbsp; <td align=center> C
-     * <tr><td> class or interface
-     *                       <td> &nbsp;&nbsp;&nbsp; <td align=center> L<i>classname</i>;
-     * <tr><td> double       <td> &nbsp;&nbsp;&nbsp; <td align=center> D
-     * <tr><td> float        <td> &nbsp;&nbsp;&nbsp; <td align=center> F
-     * <tr><td> int          <td> &nbsp;&nbsp;&nbsp; <td align=center> I
-     * <tr><td> long         <td> &nbsp;&nbsp;&nbsp; <td align=center> J
-     * <tr><td> short        <td> &nbsp;&nbsp;&nbsp; <td align=center> S
-     * </table></blockquote>
-     *
-     * <p> The class or interface name <i>classname</i> is the binary name of
-     * the class specified above.
-     *
-     * <p> Examples:
-     * <blockquote><pre>
-     * String.class.getName()
-     *     returns "java.lang.String"
-     * byte.class.getName()
-     *     returns "byte"
-     * (new Object[3]).getClass().getName()
-     *     returns "[Ljava.lang.Object;"
-     * (new int[3][4][5][6][7][8][9]).getClass().getName()
-     *     returns "[[[[[[[I"
-     * </pre></blockquote>
-     *
-     * @return  the name of the class or interface
-     *          represented by this object.
-     */
-    public String getName() {
-        String name = this.name;
-        if (name == null)
-            this.name = name = getName0();
-        return name;
-    }
-
-    // cache the name to reduce the number of calls into the VM
-    private transient String name;
-    private native String getName0();
-
-    /**
-     * Returns the class loader for the class.  Some implementations may use
-     * null to represent the bootstrap class loader. This method will return
-     * null in such implementations if this class was loaded by the bootstrap
-     * class loader.
-     *
-     * <p> If a security manager is present, and the caller's class loader is
-     * not null and the caller's class loader is not the same as or an ancestor of
-     * the class loader for the class whose class loader is requested, then
-     * this method calls the security manager's {@code checkPermission}
-     * method with a {@code RuntimePermission("getClassLoader")}
-     * permission to ensure it's ok to access the class loader for the class.
-     *
-     * <p>If this object
-     * represents a primitive type or void, null is returned.
-     *
-     * @return  the class loader that loaded the class or interface
-     *          represented by this object.
-     * @throws SecurityException
-     *    if a security manager exists and its
-     *    {@code checkPermission} method denies
-     *    access to the class loader for the class.
-     * @see java.lang.ClassLoader
-     * @see SecurityManager#checkPermission
-     * @see java.lang.RuntimePermission
-     */
-    @CallerSensitive
-    public ClassLoader getClassLoader() {
-        ClassLoader cl = getClassLoader0();
-        if (cl == null)
-            return null;
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            ClassLoader.checkClassLoaderPermission(cl, Reflection.getCallerClass());
-        }
-        return cl;
-    }
-
-    // Package-private to allow ClassLoader access
-    native ClassLoader getClassLoader0();
-
-
-    /**
-     * Returns an array of {@code TypeVariable} objects that represent the
-     * type variables declared by the generic declaration represented by this
-     * {@code GenericDeclaration} object, in declaration order.  Returns an
-     * array of length 0 if the underlying generic declaration declares no type
-     * variables.
-     *
-     * @return an array of {@code TypeVariable} objects that represent
-     *     the type variables declared by this generic declaration
-     * @throws java.lang.reflect.GenericSignatureFormatError if the generic
-     *     signature of this generic declaration does not conform to
-     *     the format specified in
-     *     <cite>The Java&trade; Virtual Machine Specification</cite>
-     * @since 1.5
-     */
-    @SuppressWarnings("unchecked")
-    public TypeVariable<Class<T>>[] getTypeParameters() {
-        ClassRepository info = getGenericInfo();
-        if (info != null)
-            return (TypeVariable<Class<T>>[])info.getTypeParameters();
-        else
-            return (TypeVariable<Class<T>>[])new TypeVariable<?>[0];
-    }
-
-
-    /**
-     * Returns the {@code Class} representing the superclass of the entity
-     * (class, interface, primitive type or void) represented by this
-     * {@code Class}.  If this {@code Class} represents either the
-     * {@code Object} class, an interface, a primitive type, or void, then
-     * null is returned.  If this object represents an array class then the
-     * {@code Class} object representing the {@code Object} class is
-     * returned.
-     *
-     * @return the superclass of the class represented by this object.
-     */
-    public native Class<? super T> getSuperclass();
-
-
-    /**
-     * Returns the {@code Type} representing the direct superclass of
-     * the entity (class, interface, primitive type or void) represented by
-     * this {@code Class}.
-     *
-     * <p>If the superclass is a parameterized type, the {@code Type}
-     * object returned must accurately reflect the actual type
-     * parameters used in the source code. The parameterized type
-     * representing the superclass is created if it had not been
-     * created before. See the declaration of {@link
-     * java.lang.reflect.ParameterizedType ParameterizedType} for the
-     * semantics of the creation process for parameterized types.  If
-     * this {@code Class} represents either the {@code Object}
-     * class, an interface, a primitive type, or void, then null is
-     * returned.  If this object represents an array class then the
-     * {@code Class} object representing the {@code Object} class is
-     * returned.
-     *
-     * @throws java.lang.reflect.GenericSignatureFormatError if the generic
-     *     class signature does not conform to the format specified in
-     *     <cite>The Java&trade; Virtual Machine Specification</cite>
-     * @throws TypeNotPresentException if the generic superclass
-     *     refers to a non-existent type declaration
-     * @throws java.lang.reflect.MalformedParameterizedTypeException if the
-     *     generic superclass refers to a parameterized type that cannot be
-     *     instantiated  for any reason
-     * @return the superclass of the class represented by this object
-     * @since 1.5
-     */
-    public Type getGenericSuperclass() {
-        ClassRepository info = getGenericInfo();
-        if (info == null) {
-            return getSuperclass();
-        }
-
-        // Historical irregularity:
-        // Generic signature marks interfaces with superclass = Object
-        // but this API returns null for interfaces
-        if (isInterface()) {
-            return null;
-        }
-
-        return info.getSuperclass();
-    }
-
-    /**
-     * Gets the package for this class.  The class loader of this class is used
-     * to find the package.  If the class was loaded by the bootstrap class
-     * loader the set of packages loaded from CLASSPATH is searched to find the
-     * package of the class. Null is returned if no package object was created
-     * by the class loader of this class.
-     *
-     * <p> Packages have attributes for versions and specifications only if the
-     * information was defined in the manifests that accompany the classes, and
-     * if the class loader created the package instance with the attributes
-     * from the manifest.
-     *
-     * @return the package of the class, or null if no package
-     *         information is available from the archive or codebase.
-     */
-    public Package getPackage() {
-        return Package.getPackage(this);
-    }
-
-
-    /**
-     * Determines the interfaces implemented by the class or interface
-     * represented by this object.
-     *
-     * <p> If this object represents a class, the return value is an array
-     * containing objects representing all interfaces implemented by the
-     * class. The order of the interface objects in the array corresponds to
-     * the order of the interface names in the {@code implements} clause
-     * of the declaration of the class represented by this object. For
-     * example, given the declaration:
-     * <blockquote>
-     * {@code class Shimmer implements FloorWax, DessertTopping { ... }}
-     * </blockquote>
-     * suppose the value of {@code s} is an instance of
-     * {@code Shimmer}; the value of the expression:
-     * <blockquote>
-     * {@code s.getClass().getInterfaces()[0]}
-     * </blockquote>
-     * is the {@code Class} object that represents interface
-     * {@code FloorWax}; and the value of:
-     * <blockquote>
-     * {@code s.getClass().getInterfaces()[1]}
-     * </blockquote>
-     * is the {@code Class} object that represents interface
-     * {@code DessertTopping}.
-     *
-     * <p> If this object represents an interface, the array contains objects
-     * representing all interfaces extended by the interface. The order of the
-     * interface objects in the array corresponds to the order of the interface
-     * names in the {@code extends} clause of the declaration of the
-     * interface represented by this object.
-     *
-     * <p> If this object represents a class or interface that implements no
-     * interfaces, the method returns an array of length 0.
-     *
-     * <p> If this object represents a primitive type or void, the method
-     * returns an array of length 0.
-     *
-     * <p> If this {@code Class} object represents an array type, the
-     * interfaces {@code Cloneable} and {@code java.io.Serializable} are
-     * returned in that order.
-     *
-     * @return an array of interfaces implemented by this class.
-     */
-    public Class<?>[] getInterfaces() {
-        ReflectionData<T> rd = reflectionData();
-        if (rd == null) {
-            // no cloning required
-            return getInterfaces0();
-        } else {
-            Class<?>[] interfaces = rd.interfaces;
-            if (interfaces == null) {
-                interfaces = getInterfaces0();
-                rd.interfaces = interfaces;
-            }
-            // defensively copy before handing over to user code
-            return interfaces.clone();
-        }
-    }
-
-    private native Class<?>[] getInterfaces0();
-
-    /**
-     * Returns the {@code Type}s representing the interfaces
-     * directly implemented by the class or interface represented by
-     * this object.
-     *
-     * <p>If a superinterface is a parameterized type, the
-     * {@code Type} object returned for it must accurately reflect
-     * the actual type parameters used in the source code. The
-     * parameterized type representing each superinterface is created
-     * if it had not been created before. See the declaration of
-     * {@link java.lang.reflect.ParameterizedType ParameterizedType}
-     * for the semantics of the creation process for parameterized
-     * types.
-     *
-     * <p> If this object represents a class, the return value is an
-     * array containing objects representing all interfaces
-     * implemented by the class. The order of the interface objects in
-     * the array corresponds to the order of the interface names in
-     * the {@code implements} clause of the declaration of the class
-     * represented by this object.  In the case of an array class, the
-     * interfaces {@code Cloneable} and {@code Serializable} are
-     * returned in that order.
-     *
-     * <p>If this object represents an interface, the array contains
-     * objects representing all interfaces directly extended by the
-     * interface.  The order of the interface objects in the array
-     * corresponds to the order of the interface names in the
-     * {@code extends} clause of the declaration of the interface
-     * represented by this object.
-     *
-     * <p>If this object represents a class or interface that
-     * implements no interfaces, the method returns an array of length
-     * 0.
-     *
-     * <p>If this object represents a primitive type or void, the
-     * method returns an array of length 0.
-     *
-     * @throws java.lang.reflect.GenericSignatureFormatError
-     *     if the generic class signature does not conform to the format
-     *     specified in
-     *     <cite>The Java&trade; Virtual Machine Specification</cite>
-     * @throws TypeNotPresentException if any of the generic
-     *     superinterfaces refers to a non-existent type declaration
-     * @throws java.lang.reflect.MalformedParameterizedTypeException
-     *     if any of the generic superinterfaces refer to a parameterized
-     *     type that cannot be instantiated for any reason
-     * @return an array of interfaces implemented by this class
-     * @since 1.5
-     */
-    public Type[] getGenericInterfaces() {
-        ClassRepository info = getGenericInfo();
-        return (info == null) ?  getInterfaces() : info.getSuperInterfaces();
-    }
-
-
-    /**
-     * Returns the {@code Class} representing the component type of an
-     * array.  If this class does not represent an array class this method
-     * returns null.
-     *
-     * @return the {@code Class} representing the component type of this
-     * class if this class is an array
-     * @see     java.lang.reflect.Array
-     * @since JDK1.1
-     */
-    public native Class<?> getComponentType();
-
-
-    /**
-     * Returns the Java language modifiers for this class or interface, encoded
-     * in an integer. The modifiers consist of the Java Virtual Machine's
-     * constants for {@code public}, {@code protected},
-     * {@code private}, {@code final}, {@code static},
-     * {@code abstract} and {@code interface}; they should be decoded
-     * using the methods of class {@code Modifier}.
-     *
-     * <p> If the underlying class is an array class, then its
-     * {@code public}, {@code private} and {@code protected}
-     * modifiers are the same as those of its component type.  If this
-     * {@code Class} represents a primitive type or void, its
-     * {@code public} modifier is always {@code true}, and its
-     * {@code protected} and {@code private} modifiers are always
-     * {@code false}. If this object represents an array class, a
-     * primitive type or void, then its {@code final} modifier is always
-     * {@code true} and its interface modifier is always
-     * {@code false}. The values of its other modifiers are not determined
-     * by this specification.
-     *
-     * <p> The modifier encodings are defined in <em>The Java Virtual Machine
-     * Specification</em>, table 4.1.
-     *
-     * @return the {@code int} representing the modifiers for this class
-     * @see     java.lang.reflect.Modifier
-     * @since JDK1.1
-     */
-    public native int getModifiers();
-
-
-    /**
-     * Gets the signers of this class.
-     *
-     * @return  the signers of this class, or null if there are no signers.  In
-     *          particular, this method returns null if this object represents
-     *          a primitive type or void.
-     * @since   JDK1.1
-     */
-    public native Object[] getSigners();
-
-
-    /**
-     * Set the signers of this class.
-     */
-    native void setSigners(Object[] signers);
-
-
-    /**
-     * If this {@code Class} object represents a local or anonymous
-     * class within a method, returns a {@link
-     * java.lang.reflect.Method Method} object representing the
-     * immediately enclosing method of the underlying class. Returns
-     * {@code null} otherwise.
-     *
-     * In particular, this method returns {@code null} if the underlying
-     * class is a local or anonymous class immediately enclosed by a type
-     * declaration, instance initializer or static initializer.
-     *
-     * @return the immediately enclosing method of the underlying class, if
-     *     that class is a local or anonymous class; otherwise {@code null}.
-     *
-     * @throws SecurityException
-     *         If a security manager, <i>s</i>, is present and any of the
-     *         following conditions is met:
-     *
-     *         <ul>
-     *
-     *         <li> the caller's class loader is not the same as the
-     *         class loader of the enclosing class and invocation of
-     *         {@link SecurityManager#checkPermission
-     *         s.checkPermission} method with
-     *         {@code RuntimePermission("accessDeclaredMembers")}
-     *         denies access to the methods within the enclosing class
-     *
-     *         <li> the caller's class loader is not the same as or an
-     *         ancestor of the class loader for the enclosing class and
-     *         invocation of {@link SecurityManager#checkPackageAccess
-     *         s.checkPackageAccess()} denies access to the package
-     *         of the enclosing class
-     *
-     *         </ul>
-     * @since 1.5
-     */
-    @CallerSensitive
-    public Method getEnclosingMethod() throws SecurityException {
-        EnclosingMethodInfo enclosingInfo = getEnclosingMethodInfo();
-
-        if (enclosingInfo == null)
-            return null;
-        else {
-            if (!enclosingInfo.isMethod())
-                return null;
-
-            MethodRepository typeInfo = MethodRepository.make(enclosingInfo.getDescriptor(),
-                                                              getFactory());
-            Class<?>   returnType       = toClass(typeInfo.getReturnType());
-            Type []    parameterTypes   = typeInfo.getParameterTypes();
-            Class<?>[] parameterClasses = new Class<?>[parameterTypes.length];
-
-            // Convert Types to Classes; returned types *should*
-            // be class objects since the methodDescriptor's used
-            // don't have generics information
-            for(int i = 0; i < parameterClasses.length; i++)
-                parameterClasses[i] = toClass(parameterTypes[i]);
-
-            // Perform access check
-            Class<?> enclosingCandidate = enclosingInfo.getEnclosingClass();
-            enclosingCandidate.checkMemberAccess(Member.DECLARED,
-                                                 Reflection.getCallerClass(), true);
-            /*
-             * Loop over all declared methods; match method name,
-             * number of and type of parameters, *and* return
-             * type.  Matching return type is also necessary
-             * because of covariant returns, etc.
-             */
-            for(Method m: enclosingCandidate.getDeclaredMethods()) {
-                if (m.getName().equals(enclosingInfo.getName()) ) {
-                    Class<?>[] candidateParamClasses = m.getParameterTypes();
-                    if (candidateParamClasses.length == parameterClasses.length) {
-                        boolean matches = true;
-                        for(int i = 0; i < candidateParamClasses.length; i++) {
-                            if (!candidateParamClasses[i].equals(parameterClasses[i])) {
-                                matches = false;
-                                break;
-                            }
-                        }
-
-                        if (matches) { // finally, check return type
-                            if (m.getReturnType().equals(returnType) )
-                                return m;
-                        }
-                    }
-                }
-            }
-
-            throw new InternalError("Enclosing method not found");
-        }
-    }
-
-    private native Object[] getEnclosingMethod0();
-
-    private EnclosingMethodInfo getEnclosingMethodInfo() {
-        Object[] enclosingInfo = getEnclosingMethod0();
-        if (enclosingInfo == null)
-            return null;
-        else {
-            return new EnclosingMethodInfo(enclosingInfo);
-        }
-    }
-
-    private final static class EnclosingMethodInfo {
-        private Class<?> enclosingClass;
-        private String name;
-        private String descriptor;
-
-        private EnclosingMethodInfo(Object[] enclosingInfo) {
-            if (enclosingInfo.length != 3)
-                throw new InternalError("Malformed enclosing method information");
-            try {
-                // The array is expected to have three elements:
-
-                // the immediately enclosing class
-                enclosingClass = (Class<?>) enclosingInfo[0];
-                assert(enclosingClass != null);
-
-                // the immediately enclosing method or constructor's
-                // name (can be null).
-                name            = (String)   enclosingInfo[1];
-
-                // the immediately enclosing method or constructor's
-                // descriptor (null iff name is).
-                descriptor      = (String)   enclosingInfo[2];
-                assert((name != null && descriptor != null) || name == descriptor);
-            } catch (ClassCastException cce) {
-                throw new InternalError("Invalid type in enclosing method information", cce);
-            }
-        }
-
-        boolean isPartial() {
-            return enclosingClass == null || name == null || descriptor == null;
-        }
-
-        boolean isConstructor() { return !isPartial() && "<init>".equals(name); }
-
-        boolean isMethod() { return !isPartial() && !isConstructor() && !"<clinit>".equals(name); }
-
-        Class<?> getEnclosingClass() { return enclosingClass; }
-
-        String getName() { return name; }
-
-        String getDescriptor() { return descriptor; }
-
-    }
-
-    private static Class<?> toClass(Type o) {
-        if (o instanceof GenericArrayType)
-            return Array.newInstance(toClass(((GenericArrayType)o).getGenericComponentType()),
-                                     0)
-                .getClass();
-        return (Class<?>)o;
-     }
-
-    /**
-     * If this {@code Class} object represents a local or anonymous
-     * class within a constructor, returns a {@link
-     * java.lang.reflect.Constructor Constructor} object representing
-     * the immediately enclosing constructor of the underlying
-     * class. Returns {@code null} otherwise.  In particular, this
-     * method returns {@code null} if the underlying class is a local
-     * or anonymous class immediately enclosed by a type declaration,
-     * instance initializer or static initializer.
-     *
-     * @return the immediately enclosing constructor of the underlying class, if
-     *     that class is a local or anonymous class; otherwise {@code null}.
-     * @throws SecurityException
-     *         If a security manager, <i>s</i>, is present and any of the
-     *         following conditions is met:
-     *
-     *         <ul>
-     *
-     *         <li> the caller's class loader is not the same as the
-     *         class loader of the enclosing class and invocation of
-     *         {@link SecurityManager#checkPermission
-     *         s.checkPermission} method with
-     *         {@code RuntimePermission("accessDeclaredMembers")}
-     *         denies access to the constructors within the enclosing class
-     *
-     *         <li> the caller's class loader is not the same as or an
-     *         ancestor of the class loader for the enclosing class and
-     *         invocation of {@link SecurityManager#checkPackageAccess
-     *         s.checkPackageAccess()} denies access to the package
-     *         of the enclosing class
-     *
-     *         </ul>
-     * @since 1.5
-     */
-    @CallerSensitive
-    public Constructor<?> getEnclosingConstructor() throws SecurityException {
-        EnclosingMethodInfo enclosingInfo = getEnclosingMethodInfo();
-
-        if (enclosingInfo == null)
-            return null;
-        else {
-            if (!enclosingInfo.isConstructor())
-                return null;
-
-            ConstructorRepository typeInfo = ConstructorRepository.make(enclosingInfo.getDescriptor(),
-                                                                        getFactory());
-            Type []    parameterTypes   = typeInfo.getParameterTypes();
-            Class<?>[] parameterClasses = new Class<?>[parameterTypes.length];
-
-            // Convert Types to Classes; returned types *should*
-            // be class objects since the methodDescriptor's used
-            // don't have generics information
-            for(int i = 0; i < parameterClasses.length; i++)
-                parameterClasses[i] = toClass(parameterTypes[i]);
-
-            // Perform access check
-            Class<?> enclosingCandidate = enclosingInfo.getEnclosingClass();
-            enclosingCandidate.checkMemberAccess(Member.DECLARED,
-                                                 Reflection.getCallerClass(), true);
-            /*
-             * Loop over all declared constructors; match number
-             * of and type of parameters.
-             */
-            for(Constructor<?> c: enclosingCandidate.getDeclaredConstructors()) {
-                Class<?>[] candidateParamClasses = c.getParameterTypes();
-                if (candidateParamClasses.length == parameterClasses.length) {
-                    boolean matches = true;
-                    for(int i = 0; i < candidateParamClasses.length; i++) {
-                        if (!candidateParamClasses[i].equals(parameterClasses[i])) {
-                            matches = false;
-                            break;
-                        }
-                    }
-
-                    if (matches)
-                        return c;
-                }
-            }
-
-            throw new InternalError("Enclosing constructor not found");
-        }
-    }
-
-
-    /**
-     * If the class or interface represented by this {@code Class} object
-     * is a member of another class, returns the {@code Class} object
-     * representing the class in which it was declared.  This method returns
-     * null if this class or interface is not a member of any other class.  If
-     * this {@code Class} object represents an array class, a primitive
-     * type, or void,then this method returns null.
-     *
-     * @return the declaring class for this class
-     * @throws SecurityException
-     *         If a security manager, <i>s</i>, is present and the caller's
-     *         class loader is not the same as or an ancestor of the class
-     *         loader for the declaring class and invocation of {@link
-     *         SecurityManager#checkPackageAccess s.checkPackageAccess()}
-     *         denies access to the package of the declaring class
-     * @since JDK1.1
-     */
-    @CallerSensitive
-    public Class<?> getDeclaringClass() throws SecurityException {
-        final Class<?> candidate = getDeclaringClass0();
-
-        if (candidate != null)
-            candidate.checkPackageAccess(
-                    ClassLoader.getClassLoader(Reflection.getCallerClass()), true);
-        return candidate;
-    }
-
-    private native Class<?> getDeclaringClass0();
-
-
-    /**
-     * Returns the immediately enclosing class of the underlying
-     * class.  If the underlying class is a top level class this
-     * method returns {@code null}.
-     * @return the immediately enclosing class of the underlying class
-     * @exception  SecurityException
-     *             If a security manager, <i>s</i>, is present and the caller's
-     *             class loader is not the same as or an ancestor of the class
-     *             loader for the enclosing class and invocation of {@link
-     *             SecurityManager#checkPackageAccess s.checkPackageAccess()}
-     *             denies access to the package of the enclosing class
-     * @since 1.5
-     */
-    @CallerSensitive
-    public Class<?> getEnclosingClass() throws SecurityException {
-        // There are five kinds of classes (or interfaces):
-        // a) Top level classes
-        // b) Nested classes (static member classes)
-        // c) Inner classes (non-static member classes)
-        // d) Local classes (named classes declared within a method)
-        // e) Anonymous classes
-
-
-        // JVM Spec 4.8.6: A class must have an EnclosingMethod
-        // attribute if and only if it is a local class or an
-        // anonymous class.
-        EnclosingMethodInfo enclosingInfo = getEnclosingMethodInfo();
-        Class<?> enclosingCandidate;
-
-        if (enclosingInfo == null) {
-            // This is a top level or a nested class or an inner class (a, b, or c)
-            enclosingCandidate = getDeclaringClass();
-        } else {
-            Class<?> enclosingClass = enclosingInfo.getEnclosingClass();
-            // This is a local class or an anonymous class (d or e)
-            if (enclosingClass == this || enclosingClass == null)
-                throw new InternalError("Malformed enclosing method information");
-            else
-                enclosingCandidate = enclosingClass;
-        }
-
-        if (enclosingCandidate != null)
-            enclosingCandidate.checkPackageAccess(
-                    ClassLoader.getClassLoader(Reflection.getCallerClass()), true);
-        return enclosingCandidate;
-    }
-
-    /**
-     * Returns the simple name of the underlying class as given in the
-     * source code. Returns an empty string if the underlying class is
-     * anonymous.
-     *
-     * <p>The simple name of an array is the simple name of the
-     * component type with "[]" appended.  In particular the simple
-     * name of an array whose component type is anonymous is "[]".
-     *
-     * @return the simple name of the underlying class
-     * @since 1.5
-     */
-    public String getSimpleName() {
-        if (isArray())
-            return getComponentType().getSimpleName()+"[]";
-
-        String simpleName = getSimpleBinaryName();
-        if (simpleName == null) { // top level class
-            simpleName = getName();
-            return simpleName.substring(simpleName.lastIndexOf(".")+1); // strip the package name
-        }
-        // According to JLS3 "Binary Compatibility" (13.1) the binary
-        // name of non-package classes (not top level) is the binary
-        // name of the immediately enclosing class followed by a '$' followed by:
-        // (for nested and inner classes): the simple name.
-        // (for local classes): 1 or more digits followed by the simple name.
-        // (for anonymous classes): 1 or more digits.
-
-        // Since getSimpleBinaryName() will strip the binary name of
-        // the immediatly enclosing class, we are now looking at a
-        // string that matches the regular expression "\$[0-9]*"
-        // followed by a simple name (considering the simple of an
-        // anonymous class to be the empty string).
-
-        // Remove leading "\$[0-9]*" from the name
-        int length = simpleName.length();
-        if (length < 1 || simpleName.charAt(0) != '$')
-            throw new InternalError("Malformed class name");
-        int index = 1;
-        while (index < length && isAsciiDigit(simpleName.charAt(index)))
-            index++;
-        // Eventually, this is the empty string iff this is an anonymous class
-        return simpleName.substring(index);
-    }
-
-    /**
-     * Return an informative string for the name of this type.
-     *
-     * @return an informative string for the name of this type
-     * @since 1.8
-     */
-    public String getTypeName() {
-        if (isArray()) {
-            try {
-                Class<?> cl = this;
-                int dimensions = 0;
-                while (cl.isArray()) {
-                    dimensions++;
-                    cl = cl.getComponentType();
-                }
-                StringBuilder sb = new StringBuilder();
-                sb.append(cl.getName());
-                for (int i = 0; i < dimensions; i++) {
-                    sb.append("[]");
-                }
-                return sb.toString();
-            } catch (Throwable e) { /*FALLTHRU*/ }
-        }
-        return getName();
-    }
-
-    /**
-     * Character.isDigit answers {@code true} to some non-ascii
-     * digits.  This one does not.
-     */
-    private static boolean isAsciiDigit(char c) {
-        return '0' <= c && c <= '9';
-    }
-
-    /**
-     * Returns the canonical name of the underlying class as
-     * defined by the Java Language Specification.  Returns null if
-     * the underlying class does not have a canonical name (i.e., if
-     * it is a local or anonymous class or an array whose component
-     * type does not have a canonical name).
-     * @return the canonical name of the underlying class if it exists, and
-     * {@code null} otherwise.
-     * @since 1.5
-     */
-    public String getCanonicalName() {
-        if (isArray()) {
-            String canonicalName = getComponentType().getCanonicalName();
-            if (canonicalName != null)
-                return canonicalName + "[]";
-            else
-                return null;
-        }
-        if (isLocalOrAnonymousClass())
-            return null;
-        Class<?> enclosingClass = getEnclosingClass();
-        if (enclosingClass == null) { // top level class
-            return getName();
-        } else {
-            String enclosingName = enclosingClass.getCanonicalName();
-            if (enclosingName == null)
-                return null;
-            return enclosingName + "." + getSimpleName();
-        }
-    }
-
-    /**
-     * Returns {@code true} if and only if the underlying class
-     * is an anonymous class.
-     *
-     * @return {@code true} if and only if this class is an anonymous class.
-     * @since 1.5
-     */
-    public boolean isAnonymousClass() {
-        return "".equals(getSimpleName());
-    }
-
-    /**
-     * Returns {@code true} if and only if the underlying class
-     * is a local class.
-     *
-     * @return {@code true} if and only if this class is a local class.
-     * @since 1.5
-     */
-    public boolean isLocalClass() {
-        return isLocalOrAnonymousClass() && !isAnonymousClass();
-    }
-
-    /**
-     * Returns {@code true} if and only if the underlying class
-     * is a member class.
-     *
-     * @return {@code true} if and only if this class is a member class.
-     * @since 1.5
-     */
-    public boolean isMemberClass() {
-        return getSimpleBinaryName() != null && !isLocalOrAnonymousClass();
-    }
-
-    /**
-     * Returns the "simple binary name" of the underlying class, i.e.,
-     * the binary name without the leading enclosing class name.
-     * Returns {@code null} if the underlying class is a top level
-     * class.
-     */
-    private String getSimpleBinaryName() {
-        Class<?> enclosingClass = getEnclosingClass();
-        if (enclosingClass == null) // top level class
-            return null;
-        // Otherwise, strip the enclosing class' name
-        try {
-            return getName().substring(enclosingClass.getName().length());
-        } catch (IndexOutOfBoundsException ex) {
-            throw new InternalError("Malformed class name", ex);
-        }
-    }
-
-    /**
-     * Returns {@code true} if this is a local class or an anonymous
-     * class.  Returns {@code false} otherwise.
-     */
-    private boolean isLocalOrAnonymousClass() {
-        // JVM Spec 4.8.6: A class must have an EnclosingMethod
-        // attribute if and only if it is a local class or an
-        // anonymous class.
-        return getEnclosingMethodInfo() != null;
-    }
-
-    /**
-     * Returns an array containing {@code Class} objects representing all
-     * the public classes and interfaces that are members of the class
-     * represented by this {@code Class} object.  This includes public
-     * class and interface members inherited from superclasses and public class
-     * and interface members declared by the class.  This method returns an
-     * array of length 0 if this {@code Class} object has no public member
-     * classes or interfaces.  This method also returns an array of length 0 if
-     * this {@code Class} object represents a primitive type, an array
-     * class, or void.
-     *
-     * @return the array of {@code Class} objects representing the public
-     *         members of this class
-     * @throws SecurityException
-     *         If a security manager, <i>s</i>, is present and
-     *         the caller's class loader is not the same as or an
-     *         ancestor of the class loader for the current class and
-     *         invocation of {@link SecurityManager#checkPackageAccess
-     *         s.checkPackageAccess()} denies access to the package
-     *         of this class.
-     *
-     * @since JDK1.1
-     */
-    @CallerSensitive
-    public Class<?>[] getClasses() {
-        checkMemberAccess(Member.PUBLIC, Reflection.getCallerClass(), false);
-
-        // Privileged so this implementation can look at DECLARED classes,
-        // something the caller might not have privilege to do.  The code here
-        // is allowed to look at DECLARED classes because (1) it does not hand
-        // out anything other than public members and (2) public member access
-        // has already been ok'd by the SecurityManager.
-
-        return java.security.AccessController.doPrivileged(
-            new java.security.PrivilegedAction<Class<?>[]>() {
-                public Class<?>[] run() {
-                    List<Class<?>> list = new ArrayList<>();
-                    Class<?> currentClass = Class.this;
-                    while (currentClass != null) {
-                        Class<?>[] members = currentClass.getDeclaredClasses();
-                        for (int i = 0; i < members.length; i++) {
-                            if (Modifier.isPublic(members[i].getModifiers())) {
-                                list.add(members[i]);
-                            }
-                        }
-                        currentClass = currentClass.getSuperclass();
-                    }
-                    return list.toArray(new Class<?>[0]);
-                }
-            });
-    }
-
-
-    /**
-     * Returns an array containing {@code Field} objects reflecting all
-     * the accessible public fields of the class or interface represented by
-     * this {@code Class} object.
-     *
-     * <p> If this {@code Class} object represents a class or interface with no
-     * no accessible public fields, then this method returns an array of length
-     * 0.
-     *
-     * <p> If this {@code Class} object represents a class, then this method
-     * returns the public fields of the class and of all its superclasses.
-     *
-     * <p> If this {@code Class} object represents an interface, then this
-     * method returns the fields of the interface and of all its
-     * superinterfaces.
-     *
-     * <p> If this {@code Class} object represents an array type, a primitive
-     * type, or void, then this method returns an array of length 0.
-     *
-     * <p> The elements in the returned array are not sorted and are not in any
-     * particular order.
-     *
-     * @return the array of {@code Field} objects representing the
-     *         public fields
-     * @throws SecurityException
-     *         If a security manager, <i>s</i>, is present and
-     *         the caller's class loader is not the same as or an
-     *         ancestor of the class loader for the current class and
-     *         invocation of {@link SecurityManager#checkPackageAccess
-     *         s.checkPackageAccess()} denies access to the package
-     *         of this class.
-     *
-     * @since JDK1.1
-     * @jls 8.2 Class Members
-     * @jls 8.3 Field Declarations
-     */
-    @CallerSensitive
-    public Field[] getFields() throws SecurityException {
-        checkMemberAccess(Member.PUBLIC, Reflection.getCallerClass(), true);
-        return copyFields(privateGetPublicFields(null));
-    }
-
-
-    /**
-     * Returns an array containing {@code Method} objects reflecting all the
-     * public methods of the class or interface represented by this {@code
-     * Class} object, including those declared by the class or interface and
-     * those inherited from superclasses and superinterfaces.
-     *
-     * <p> If this {@code Class} object represents a type that has multiple
-     * public methods with the same name and parameter types, but different
-     * return types, then the returned array has a {@code Method} object for
-     * each such method.
-     *
-     * <p> If this {@code Class} object represents a type with a class
-     * initialization method {@code <clinit>}, then the returned array does
-     * <em>not</em> have a corresponding {@code Method} object.
-     *
-     * <p> If this {@code Class} object represents an array type, then the
-     * returned array has a {@code Method} object for each of the public
-     * methods inherited by the array type from {@code Object}. It does not
-     * contain a {@code Method} object for {@code clone()}.
-     *
-     * <p> If this {@code Class} object represents an interface then the
-     * returned array does not contain any implicitly declared methods from
-     * {@code Object}. Therefore, if no methods are explicitly declared in
-     * this interface or any of its superinterfaces then the returned array
-     * has length 0. (Note that a {@code Class} object which represents a class
-     * always has public methods, inherited from {@code Object}.)
-     *
-     * <p> If this {@code Class} object represents a primitive type or void,
-     * then the returned array has length 0.
-     *
-     * <p> Static methods declared in superinterfaces of the class or interface
-     * represented by this {@code Class} object are not considered members of
-     * the class or interface.
-     *
-     * <p> The elements in the returned array are not sorted and are not in any
-     * particular order.
-     *
-     * @return the array of {@code Method} objects representing the
-     *         public methods of this class
-     * @throws SecurityException
-     *         If a security manager, <i>s</i>, is present and
-     *         the caller's class loader is not the same as or an
-     *         ancestor of the class loader for the current class and
-     *         invocation of {@link SecurityManager#checkPackageAccess
-     *         s.checkPackageAccess()} denies access to the package
-     *         of this class.
-     *
-     * @jls 8.2 Class Members
-     * @jls 8.4 Method Declarations
-     * @since JDK1.1
-     */
-    @CallerSensitive
-    public Method[] getMethods() throws SecurityException {
-        checkMemberAccess(Member.PUBLIC, Reflection.getCallerClass(), true);
-        return copyMethods(privateGetPublicMethods());
-    }
-
-
-    /**
-     * Returns an array containing {@code Constructor} objects reflecting
-     * all the public constructors of the class represented by this
-     * {@code Class} object.  An array of length 0 is returned if the
-     * class has no public constructors, or if the class is an array class, or
-     * if the class reflects a primitive type or void.
-     *
-     * Note that while this method returns an array of {@code
-     * Constructor<T>} objects (that is an array of constructors from
-     * this class), the return type of this method is {@code
-     * Constructor<?>[]} and <em>not</em> {@code Constructor<T>[]} as
-     * might be expected.  This less informative return type is
-     * necessary since after being returned from this method, the
-     * array could be modified to hold {@code Constructor} objects for
-     * different classes, which would violate the type guarantees of
-     * {@code Constructor<T>[]}.
-     *
-     * @return the array of {@code Constructor} objects representing the
-     *         public constructors of this class
-     * @throws SecurityException
-     *         If a security manager, <i>s</i>, is present and
-     *         the caller's class loader is not the same as or an
-     *         ancestor of the class loader for the current class and
-     *         invocation of {@link SecurityManager#checkPackageAccess
-     *         s.checkPackageAccess()} denies access to the package
-     *         of this class.
-     *
-     * @since JDK1.1
-     */
-    @CallerSensitive
-    public Constructor<?>[] getConstructors() throws SecurityException {
-        checkMemberAccess(Member.PUBLIC, Reflection.getCallerClass(), true);
-        return copyConstructors(privateGetDeclaredConstructors(true));
-    }
-
-
-    /**
-     * Returns a {@code Field} object that reflects the specified public member
-     * field of the class or interface represented by this {@code Class}
-     * object. The {@code name} parameter is a {@code String} specifying the
-     * simple name of the desired field.
-     *
-     * <p> The field to be reflected is determined by the algorithm that
-     * follows.  Let C be the class or interface represented by this object:
-     *
-     * <OL>
-     * <LI> If C declares a public field with the name specified, that is the
-     *      field to be reflected.</LI>
-     * <LI> If no field was found in step 1 above, this algorithm is applied
-     *      recursively to each direct superinterface of C. The direct
-     *      superinterfaces are searched in the order they were declared.</LI>
-     * <LI> If no field was found in steps 1 and 2 above, and C has a
-     *      superclass S, then this algorithm is invoked recursively upon S.
-     *      If C has no superclass, then a {@code NoSuchFieldException}
-     *      is thrown.</LI>
-     * </OL>
-     *
-     * <p> If this {@code Class} object represents an array type, then this
-     * method does not find the {@code length} field of the array type.
-     *
-     * @param name the field name
-     * @return the {@code Field} object of this class specified by
-     *         {@code name}
-     * @throws NoSuchFieldException if a field with the specified name is
-     *         not found.
-     * @throws NullPointerException if {@code name} is {@code null}
-     * @throws SecurityException
-     *         If a security manager, <i>s</i>, is present and
-     *         the caller's class loader is not the same as or an
-     *         ancestor of the class loader for the current class and
-     *         invocation of {@link SecurityManager#checkPackageAccess
-     *         s.checkPackageAccess()} denies access to the package
-     *         of this class.
-     *
-     * @since JDK1.1
-     * @jls 8.2 Class Members
-     * @jls 8.3 Field Declarations
-     */
-    @CallerSensitive
-    public Field getField(String name)
-        throws NoSuchFieldException, SecurityException {
-        checkMemberAccess(Member.PUBLIC, Reflection.getCallerClass(), true);
-        Field field = getField0(name);
-        if (field == null) {
-            throw new NoSuchFieldException(name);
-        }
-        return field;
-    }
-
-
-    /**
-     * Returns a {@code Method} object that reflects the specified public
-     * member method of the class or interface represented by this
-     * {@code Class} object. The {@code name} parameter is a
-     * {@code String} specifying the simple name of the desired method. The
-     * {@code parameterTypes} parameter is an array of {@code Class}
-     * objects that identify the method's formal parameter types, in declared
-     * order. If {@code parameterTypes} is {@code null}, it is
-     * treated as if it were an empty array.
-     *
-     * <p> If the {@code name} is "{@code <init>}" or "{@code <clinit>}" a
-     * {@code NoSuchMethodException} is raised. Otherwise, the method to
-     * be reflected is determined by the algorithm that follows.  Let C be the
-     * class or interface represented by this object:
-     * <OL>
-     * <LI> C is searched for a <I>matching method</I>, as defined below. If a
-     *      matching method is found, it is reflected.</LI>
-     * <LI> If no matching method is found by step 1 then:
-     *   <OL TYPE="a">
-     *   <LI> If C is a class other than {@code Object}, then this algorithm is
-     *        invoked recursively on the superclass of C.</LI>
-     *   <LI> If C is the class {@code Object}, or if C is an interface, then
-     *        the superinterfaces of C (if any) are searched for a matching
-     *        method. If any such method is found, it is reflected.</LI>
-     *   </OL></LI>
-     * </OL>
-     *
-     * <p> To find a matching method in a class or interface C:&nbsp; If C
-     * declares exactly one public method with the specified name and exactly
-     * the same formal parameter types, that is the method reflected. If more
-     * than one such method is found in C, and one of these methods has a
-     * return type that is more specific than any of the others, that method is
-     * reflected; otherwise one of the methods is chosen arbitrarily.
-     *
-     * <p>Note that there may be more than one matching method in a
-     * class because while the Java language forbids a class to
-     * declare multiple methods with the same signature but different
-     * return types, the Java virtual machine does not.  This
-     * increased flexibility in the virtual machine can be used to
-     * implement various language features.  For example, covariant
-     * returns can be implemented with {@linkplain
-     * java.lang.reflect.Method#isBridge bridge methods}; the bridge
-     * method and the method being overridden would have the same
-     * signature but different return types.
-     *
-     * <p> If this {@code Class} object represents an array type, then this
-     * method does not find the {@code clone()} method.
-     *
-     * <p> Static methods declared in superinterfaces of the class or interface
-     * represented by this {@code Class} object are not considered members of
-     * the class or interface.
-     *
-     * @param name the name of the method
-     * @param parameterTypes the list of parameters
-     * @return the {@code Method} object that matches the specified
-     *         {@code name} and {@code parameterTypes}
-     * @throws NoSuchMethodException if a matching method is not found
-     *         or if the name is "&lt;init&gt;"or "&lt;clinit&gt;".
-     * @throws NullPointerException if {@code name} is {@code null}
-     * @throws SecurityException
-     *         If a security manager, <i>s</i>, is present and
-     *         the caller's class loader is not the same as or an
-     *         ancestor of the class loader for the current class and
-     *         invocation of {@link SecurityManager#checkPackageAccess
-     *         s.checkPackageAccess()} denies access to the package
-     *         of this class.
-     *
-     * @jls 8.2 Class Members
-     * @jls 8.4 Method Declarations
-     * @since JDK1.1
-     */
-    @CallerSensitive
-    public Method getMethod(String name, Class<?>... parameterTypes)
-        throws NoSuchMethodException, SecurityException {
-        checkMemberAccess(Member.PUBLIC, Reflection.getCallerClass(), true);
-        Method method = getMethod0(name, parameterTypes, true);
-        if (method == null) {
-            throw new NoSuchMethodException(getName() + "." + name + argumentTypesToString(parameterTypes));
-        }
-        return method;
-    }
-
-
-    /**
-     * Returns a {@code Constructor} object that reflects the specified
-     * public constructor of the class represented by this {@code Class}
-     * object. The {@code parameterTypes} parameter is an array of
-     * {@code Class} objects that identify the constructor's formal
-     * parameter types, in declared order.
-     *
-     * If this {@code Class} object represents an inner class
-     * declared in a non-static context, the formal parameter types
-     * include the explicit enclosing instance as the first parameter.
-     *
-     * <p> The constructor to reflect is the public constructor of the class
-     * represented by this {@code Class} object whose formal parameter
-     * types match those specified by {@code parameterTypes}.
-     *
-     * @param parameterTypes the parameter array
-     * @return the {@code Constructor} object of the public constructor that
-     *         matches the specified {@code parameterTypes}
-     * @throws NoSuchMethodException if a matching method is not found.
-     * @throws SecurityException
-     *         If a security manager, <i>s</i>, is present and
-     *         the caller's class loader is not the same as or an
-     *         ancestor of the class loader for the current class and
-     *         invocation of {@link SecurityManager#checkPackageAccess
-     *         s.checkPackageAccess()} denies access to the package
-     *         of this class.
-     *
-     * @since JDK1.1
-     */
-    @CallerSensitive
-    public Constructor<T> getConstructor(Class<?>... parameterTypes)
-        throws NoSuchMethodException, SecurityException {
-        checkMemberAccess(Member.PUBLIC, Reflection.getCallerClass(), true);
-        return getConstructor0(parameterTypes, Member.PUBLIC);
-    }
-
-
-    /**
-     * Returns an array of {@code Class} objects reflecting all the
-     * classes and interfaces declared as members of the class represented by
-     * this {@code Class} object. This includes public, protected, default
-     * (package) access, and private classes and interfaces declared by the
-     * class, but excludes inherited classes and interfaces.  This method
-     * returns an array of length 0 if the class declares no classes or
-     * interfaces as members, or if this {@code Class} object represents a
-     * primitive type, an array class, or void.
-     *
-     * @return the array of {@code Class} objects representing all the
-     *         declared members of this class
-     * @throws SecurityException
-     *         If a security manager, <i>s</i>, is present and any of the
-     *         following conditions is met:
-     *
-     *         <ul>
-     *
-     *         <li> the caller's class loader is not the same as the
-     *         class loader of this class and invocation of
-     *         {@link SecurityManager#checkPermission
-     *         s.checkPermission} method with
-     *         {@code RuntimePermission("accessDeclaredMembers")}
-     *         denies access to the declared classes within this class
-     *
-     *         <li> the caller's class loader is not the same as or an
-     *         ancestor of the class loader for the current class and
-     *         invocation of {@link SecurityManager#checkPackageAccess
-     *         s.checkPackageAccess()} denies access to the package
-     *         of this class
-     *
-     *         </ul>
-     *
-     * @since JDK1.1
-     */
-    @CallerSensitive
-    public Class<?>[] getDeclaredClasses() throws SecurityException {
-        checkMemberAccess(Member.DECLARED, Reflection.getCallerClass(), false);
-        return getDeclaredClasses0();
-    }
-
-
-    /**
-     * Returns an array of {@code Field} objects reflecting all the fields
-     * declared by the class or interface represented by this
-     * {@code Class} object. This includes public, protected, default
-     * (package) access, and private fields, but excludes inherited fields.
-     *
-     * <p> If this {@code Class} object represents a class or interface with no
-     * declared fields, then this method returns an array of length 0.
-     *
-     * <p> If this {@code Class} object represents an array type, a primitive
-     * type, or void, then this method returns an array of length 0.
-     *
-     * <p> The elements in the returned array are not sorted and are not in any
-     * particular order.
-     *
-     * @return  the array of {@code Field} objects representing all the
-     *          declared fields of this class
-     * @throws  SecurityException
-     *          If a security manager, <i>s</i>, is present and any of the
-     *          following conditions is met:
-     *
-     *          <ul>
-     *
-     *          <li> the caller's class loader is not the same as the
-     *          class loader of this class and invocation of
-     *          {@link SecurityManager#checkPermission
-     *          s.checkPermission} method with
-     *          {@code RuntimePermission("accessDeclaredMembers")}
-     *          denies access to the declared fields within this class
-     *
-     *          <li> the caller's class loader is not the same as or an
-     *          ancestor of the class loader for the current class and
-     *          invocation of {@link SecurityManager#checkPackageAccess
-     *          s.checkPackageAccess()} denies access to the package
-     *          of this class
-     *
-     *          </ul>
-     *
-     * @since JDK1.1
-     * @jls 8.2 Class Members
-     * @jls 8.3 Field Declarations
-     */
-    @CallerSensitive
-    public Field[] getDeclaredFields() throws SecurityException {
-        checkMemberAccess(Member.DECLARED, Reflection.getCallerClass(), true);
-        return copyFields(privateGetDeclaredFields(false));
-    }
-
-
-    /**
-     *
-     * Returns an array containing {@code Method} objects reflecting all the
-     * declared methods of the class or interface represented by this {@code
-     * Class} object, including public, protected, default (package)
-     * access, and private methods, but excluding inherited methods.
-     *
-     * <p> If this {@code Class} object represents a type that has multiple
-     * declared methods with the same name and parameter types, but different
-     * return types, then the returned array has a {@code Method} object for
-     * each such method.
-     *
-     * <p> If this {@code Class} object represents a type that has a class
-     * initialization method {@code <clinit>}, then the returned array does
-     * <em>not</em> have a corresponding {@code Method} object.
-     *
-     * <p> If this {@code Class} object represents a class or interface with no
-     * declared methods, then the returned array has length 0.
-     *
-     * <p> If this {@code Class} object represents an array type, a primitive
-     * type, or void, then the returned array has length 0.
-     *
-     * <p> The elements in the returned array are not sorted and are not in any
-     * particular order.
-     *
-     * @return  the array of {@code Method} objects representing all the
-     *          declared methods of this class
-     * @throws  SecurityException
-     *          If a security manager, <i>s</i>, is present and any of the
-     *          following conditions is met:
-     *
-     *          <ul>
-     *
-     *          <li> the caller's class loader is not the same as the
-     *          class loader of this class and invocation of
-     *          {@link SecurityManager#checkPermission
-     *          s.checkPermission} method with
-     *          {@code RuntimePermission("accessDeclaredMembers")}
-     *          denies access to the declared methods within this class
-     *
-     *          <li> the caller's class loader is not the same as or an
-     *          ancestor of the class loader for the current class and
-     *          invocation of {@link SecurityManager#checkPackageAccess
-     *          s.checkPackageAccess()} denies access to the package
-     *          of this class
-     *
-     *          </ul>
-     *
-     * @jls 8.2 Class Members
-     * @jls 8.4 Method Declarations
-     * @since JDK1.1
-     */
-    @CallerSensitive
-    public Method[] getDeclaredMethods() throws SecurityException {
-        checkMemberAccess(Member.DECLARED, Reflection.getCallerClass(), true);
-        return copyMethods(privateGetDeclaredMethods(false));
-    }
-
-
-    /**
-     * Returns an array of {@code Constructor} objects reflecting all the
-     * constructors declared by the class represented by this
-     * {@code Class} object. These are public, protected, default
-     * (package) access, and private constructors.  The elements in the array
-     * returned are not sorted and are not in any particular order.  If the
-     * class has a default constructor, it is included in the returned array.
-     * This method returns an array of length 0 if this {@code Class}
-     * object represents an interface, a primitive type, an array class, or
-     * void.
-     *
-     * <p> See <em>The Java Language Specification</em>, section 8.2.
-     *
-     * @return  the array of {@code Constructor} objects representing all the
-     *          declared constructors of this class
-     * @throws  SecurityException
-     *          If a security manager, <i>s</i>, is present and any of the
-     *          following conditions is met:
-     *
-     *          <ul>
-     *
-     *          <li> the caller's class loader is not the same as the
-     *          class loader of this class and invocation of
-     *          {@link SecurityManager#checkPermission
-     *          s.checkPermission} method with
-     *          {@code RuntimePermission("accessDeclaredMembers")}
-     *          denies access to the declared constructors within this class
-     *
-     *          <li> the caller's class loader is not the same as or an
-     *          ancestor of the class loader for the current class and
-     *          invocation of {@link SecurityManager#checkPackageAccess
-     *          s.checkPackageAccess()} denies access to the package
-     *          of this class
-     *
-     *          </ul>
-     *
-     * @since JDK1.1
-     */
-    @CallerSensitive
-    public Constructor<?>[] getDeclaredConstructors() throws SecurityException {
-        checkMemberAccess(Member.DECLARED, Reflection.getCallerClass(), true);
-        return copyConstructors(privateGetDeclaredConstructors(false));
-    }
-
-
-    /**
-     * Returns a {@code Field} object that reflects the specified declared
-     * field of the class or interface represented by this {@code Class}
-     * object. The {@code name} parameter is a {@code String} that specifies
-     * the simple name of the desired field.
-     *
-     * <p> If this {@code Class} object represents an array type, then this
-     * method does not find the {@code length} field of the array type.
-     *
-     * @param name the name of the field
-     * @return  the {@code Field} object for the specified field in this
-     *          class
-     * @throws  NoSuchFieldException if a field with the specified name is
-     *          not found.
-     * @throws  NullPointerException if {@code name} is {@code null}
-     * @throws  SecurityException
-     *          If a security manager, <i>s</i>, is present and any of the
-     *          following conditions is met:
-     *
-     *          <ul>
-     *
-     *          <li> the caller's class loader is not the same as the
-     *          class loader of this class and invocation of
-     *          {@link SecurityManager#checkPermission
-     *          s.checkPermission} method with
-     *          {@code RuntimePermission("accessDeclaredMembers")}
-     *          denies access to the declared field
-     *
-     *          <li> the caller's class loader is not the same as or an
-     *          ancestor of the class loader for the current class and
-     *          invocation of {@link SecurityManager#checkPackageAccess
-     *          s.checkPackageAccess()} denies access to the package
-     *          of this class
-     *
-     *          </ul>
-     *
-     * @since JDK1.1
-     * @jls 8.2 Class Members
-     * @jls 8.3 Field Declarations
-     */
-    @CallerSensitive
-    public Field getDeclaredField(String name)
-        throws NoSuchFieldException, SecurityException {
-        checkMemberAccess(Member.DECLARED, Reflection.getCallerClass(), true);
-        Field field = searchFields(privateGetDeclaredFields(false), name);
-        if (field == null) {
-            throw new NoSuchFieldException(name);
-        }
-        return field;
-    }
-
-
-    /**
-     * Returns a {@code Method} object that reflects the specified
-     * declared method of the class or interface represented by this
-     * {@code Class} object. The {@code name} parameter is a
-     * {@code String} that specifies the simple name of the desired
-     * method, and the {@code parameterTypes} parameter is an array of
-     * {@code Class} objects that identify the method's formal parameter
-     * types, in declared order.  If more than one method with the same
-     * parameter types is declared in a class, and one of these methods has a
-     * return type that is more specific than any of the others, that method is
-     * returned; otherwise one of the methods is chosen arbitrarily.  If the
-     * name is "&lt;init&gt;"or "&lt;clinit&gt;" a {@code NoSuchMethodException}
-     * is raised.
-     *
-     * <p> If this {@code Class} object represents an array type, then this
-     * method does not find the {@code clone()} method.
-     *
-     * @param name the name of the method
-     * @param parameterTypes the parameter array
-     * @return  the {@code Method} object for the method of this class
-     *          matching the specified name and parameters
-     * @throws  NoSuchMethodException if a matching method is not found.
-     * @throws  NullPointerException if {@code name} is {@code null}
-     * @throws  SecurityException
-     *          If a security manager, <i>s</i>, is present and any of the
-     *          following conditions is met:
-     *
-     *          <ul>
-     *
-     *          <li> the caller's class loader is not the same as the
-     *          class loader of this class and invocation of
-     *          {@link SecurityManager#checkPermission
-     *          s.checkPermission} method with
-     *          {@code RuntimePermission("accessDeclaredMembers")}
-     *          denies access to the declared method
-     *
-     *          <li> the caller's class loader is not the same as or an
-     *          ancestor of the class loader for the current class and
-     *          invocation of {@link SecurityManager#checkPackageAccess
-     *          s.checkPackageAccess()} denies access to the package
-     *          of this class
-     *
-     *          </ul>
-     *
-     * @jls 8.2 Class Members
-     * @jls 8.4 Method Declarations
-     * @since JDK1.1
-     */
-    @CallerSensitive
-    public Method getDeclaredMethod(String name, Class<?>... parameterTypes)
-        throws NoSuchMethodException, SecurityException {
-        checkMemberAccess(Member.DECLARED, Reflection.getCallerClass(), true);
-        Method method = searchMethods(privateGetDeclaredMethods(false), name, parameterTypes);
-        if (method == null) {
-            throw new NoSuchMethodException(getName() + "." + name + argumentTypesToString(parameterTypes));
-        }
-        return method;
-    }
-
-
-    /**
-     * Returns a {@code Constructor} object that reflects the specified
-     * constructor of the class or interface represented by this
-     * {@code Class} object.  The {@code parameterTypes} parameter is
-     * an array of {@code Class} objects that identify the constructor's
-     * formal parameter types, in declared order.
-     *
-     * If this {@code Class} object represents an inner class
-     * declared in a non-static context, the formal parameter types
-     * include the explicit enclosing instance as the first parameter.
-     *
-     * @param parameterTypes the parameter array
-     * @return  The {@code Constructor} object for the constructor with the
-     *          specified parameter list
-     * @throws  NoSuchMethodException if a matching method is not found.
-     * @throws  SecurityException
-     *          If a security manager, <i>s</i>, is present and any of the
-     *          following conditions is met:
-     *
-     *          <ul>
-     *
-     *          <li> the caller's class loader is not the same as the
-     *          class loader of this class and invocation of
-     *          {@link SecurityManager#checkPermission
-     *          s.checkPermission} method with
-     *          {@code RuntimePermission("accessDeclaredMembers")}
-     *          denies access to the declared constructor
-     *
-     *          <li> the caller's class loader is not the same as or an
-     *          ancestor of the class loader for the current class and
-     *          invocation of {@link SecurityManager#checkPackageAccess
-     *          s.checkPackageAccess()} denies access to the package
-     *          of this class
-     *
-     *          </ul>
-     *
-     * @since JDK1.1
-     */
-    @CallerSensitive
-    public Constructor<T> getDeclaredConstructor(Class<?>... parameterTypes)
-        throws NoSuchMethodException, SecurityException {
-        checkMemberAccess(Member.DECLARED, Reflection.getCallerClass(), true);
-        return getConstructor0(parameterTypes, Member.DECLARED);
-    }
-
-    /**
-     * Finds a resource with a given name.  The rules for searching resources
-     * associated with a given class are implemented by the defining
-     * {@linkplain ClassLoader class loader} of the class.  This method
-     * delegates to this object's class loader.  If this object was loaded by
-     * the bootstrap class loader, the method delegates to {@link
-     * ClassLoader#getSystemResourceAsStream}.
-     *
-     * <p> Before delegation, an absolute resource name is constructed from the
-     * given resource name using this algorithm:
-     *
-     * <ul>
-     *
-     * <li> If the {@code name} begins with a {@code '/'}
-     * (<tt>'&#92;u002f'</tt>), then the absolute name of the resource is the
-     * portion of the {@code name} following the {@code '/'}.
-     *
-     * <li> Otherwise, the absolute name is of the following form:
-     *
-     * <blockquote>
-     *   {@code modified_package_name/name}
-     * </blockquote>
-     *
-     * <p> Where the {@code modified_package_name} is the package name of this
-     * object with {@code '/'} substituted for {@code '.'}
-     * (<tt>'&#92;u002e'</tt>).
-     *
-     * </ul>
-     *
-     * @param  name name of the desired resource
-     * @return      A {@link java.io.InputStream} object or {@code null} if
-     *              no resource with this name is found
-     * @throws  NullPointerException If {@code name} is {@code null}
-     * @since  JDK1.1
-     */
-     public InputStream getResourceAsStream(String name) {
-        name = resolveName(name);
-        ClassLoader cl = getClassLoader0();
-        if (cl==null) {
-            // A system class.
-            return ClassLoader.getSystemResourceAsStream(name);
-        }
-        return cl.getResourceAsStream(name);
-    }
-
-    /**
-     * Finds a resource with a given name.  The rules for searching resources
-     * associated with a given class are implemented by the defining
-     * {@linkplain ClassLoader class loader} of the class.  This method
-     * delegates to this object's class loader.  If this object was loaded by
-     * the bootstrap class loader, the method delegates to {@link
-     * ClassLoader#getSystemResource}.
-     *
-     * <p> Before delegation, an absolute resource name is constructed from the
-     * given resource name using this algorithm:
-     *
-     * <ul>
-     *
-     * <li> If the {@code name} begins with a {@code '/'}
-     * (<tt>'&#92;u002f'</tt>), then the absolute name of the resource is the
-     * portion of the {@code name} following the {@code '/'}.
-     *
-     * <li> Otherwise, the absolute name is of the following form:
-     *
-     * <blockquote>
-     *   {@code modified_package_name/name}
-     * </blockquote>
-     *
-     * <p> Where the {@code modified_package_name} is the package name of this
-     * object with {@code '/'} substituted for {@code '.'}
-     * (<tt>'&#92;u002e'</tt>).
-     *
-     * </ul>
-     *
-     * @param  name name of the desired resource
-     * @return      A  {@link java.net.URL} object or {@code null} if no
-     *              resource with this name is found
-     * @since  JDK1.1
-     */
-    public java.net.URL getResource(String name) {
-        name = resolveName(name);
-        ClassLoader cl = getClassLoader0();
-        if (cl==null) {
-            // A system class.
-            return ClassLoader.getSystemResource(name);
-        }
-        return cl.getResource(name);
-    }
-
-
-
-    /** protection domain returned when the internal domain is null */
-    private static java.security.ProtectionDomain allPermDomain;
-
-
-    /**
-     * Returns the {@code ProtectionDomain} of this class.  If there is a
-     * security manager installed, this method first calls the security
-     * manager's {@code checkPermission} method with a
-     * {@code RuntimePermission("getProtectionDomain")} permission to
-     * ensure it's ok to get the
-     * {@code ProtectionDomain}.
-     *
-     * @return the ProtectionDomain of this class
-     *
-     * @throws SecurityException
-     *        if a security manager exists and its
-     *        {@code checkPermission} method doesn't allow
-     *        getting the ProtectionDomain.
-     *
-     * @see java.security.ProtectionDomain
-     * @see SecurityManager#checkPermission
-     * @see java.lang.RuntimePermission
-     * @since 1.2
-     */
-    public java.security.ProtectionDomain getProtectionDomain() {
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(SecurityConstants.GET_PD_PERMISSION);
-        }
-        java.security.ProtectionDomain pd = getProtectionDomain0();
-        if (pd == null) {
-            if (allPermDomain == null) {
-                java.security.Permissions perms =
-                    new java.security.Permissions();
-                perms.add(SecurityConstants.ALL_PERMISSION);
-                allPermDomain =
-                    new java.security.ProtectionDomain(null, perms);
-            }
-            pd = allPermDomain;
-        }
-        return pd;
-    }
-
-
-    /**
-     * Returns the ProtectionDomain of this class.
-     */
-    private native java.security.ProtectionDomain getProtectionDomain0();
-
-    /*
-     * Return the Virtual Machine's Class object for the named
-     * primitive type.
-     */
-    static native Class<?> getPrimitiveClass(String name);
-
-    /*
-     * Check if client is allowed to access members.  If access is denied,
-     * throw a SecurityException.
-     *
-     * This method also enforces package access.
-     *
-     * <p> Default policy: allow all clients access with normal Java access
-     * control.
-     */
-    private void checkMemberAccess(int which, Class<?> caller, boolean checkProxyInterfaces) {
-        final SecurityManager s = System.getSecurityManager();
-        if (s != null) {
-            /* Default policy allows access to all {@link Member#PUBLIC} members,
-             * as well as access to classes that have the same class loader as the caller.
-             * In all other cases, it requires RuntimePermission("accessDeclaredMembers")
-             * permission.
-             */
-            final ClassLoader ccl = ClassLoader.getClassLoader(caller);
-            final ClassLoader cl = getClassLoader0();
-            if (which != Member.PUBLIC) {
-                if (ccl != cl) {
-                    s.checkPermission(SecurityConstants.CHECK_MEMBER_ACCESS_PERMISSION);
-                }
-            }
-            this.checkPackageAccess(ccl, checkProxyInterfaces);
-        }
-    }
-
-    /*
-     * Checks if a client loaded in ClassLoader ccl is allowed to access this
-     * class under the current package access policy. If access is denied,
-     * throw a SecurityException.
-     */
-    private void checkPackageAccess(final ClassLoader ccl, boolean checkProxyInterfaces) {
-        final SecurityManager s = System.getSecurityManager();
-        if (s != null) {
-            final ClassLoader cl = getClassLoader0();
-
-            if (ReflectUtil.needsPackageAccessCheck(ccl, cl)) {
-                String name = this.getName();
-                int i = name.lastIndexOf('.');
-                if (i != -1) {
-                    // skip the package access check on a proxy class in default proxy package
-                    String pkg = name.substring(0, i);
-                    if (!Proxy.isProxyClass(this) || ReflectUtil.isNonPublicProxyClass(this)) {
-                        s.checkPackageAccess(pkg);
-                    }
-                }
-            }
-            // check package access on the proxy interfaces
-            if (checkProxyInterfaces && Proxy.isProxyClass(this)) {
-                ReflectUtil.checkProxyPackageAccess(ccl, this.getInterfaces());
-            }
-        }
-    }
-
-    /**
-     * Add a package name prefix if the name is not absolute Remove leading "/"
-     * if name is absolute
-     */
-    private String resolveName(String name) {
-        if (name == null) {
-            return name;
-        }
-        if (!name.startsWith("/")) {
-            Class<?> c = this;
-            while (c.isArray()) {
-                c = c.getComponentType();
-            }
-            String baseName = c.getName();
-            int index = baseName.lastIndexOf('.');
-            if (index != -1) {
-                name = baseName.substring(0, index).replace('.', '/')
-                    +"/"+name;
-            }
-        } else {
-            name = name.substring(1);
-        }
-        return name;
-    }
-
-    /**
-     * Atomic operations support.
-     */
-    private static class Atomic {
-        @ikvm.internal.InterlockedCompareAndSet("reflectionData")
-        static native <T> boolean casReflectionData(Class<?> clazz,
-                                             SoftReference<ReflectionData<T>> oldData,
-                                             SoftReference<ReflectionData<T>> newData);
-
-        @ikvm.internal.InterlockedCompareAndSet("annotationType")
-        static native <T> boolean casAnnotationType(Class<?> clazz,
-                                             AnnotationType oldType,
-                                             AnnotationType newType);
-
-        @ikvm.internal.InterlockedCompareAndSet("annotationData")
-        static native <T> boolean casAnnotationData(Class<?> clazz,
-                                             AnnotationData oldData,
-                                             AnnotationData newData);
-    }
-
-    /**
-     * Reflection support.
-     */
-
-    // Caches for certain reflective results
-    private static boolean useCaches;
-
-    // reflection data that might get invalidated when JVM TI RedefineClasses() is called
-    private static class ReflectionData<T> {
-        volatile Field[] declaredFields;
-        volatile Field[] publicFields;
-        volatile Method[] declaredMethods;
-        volatile Method[] publicMethods;
-        volatile Constructor<T>[] declaredConstructors;
-        volatile Constructor<T>[] publicConstructors;
-        // Intermediate results for getFields and getMethods
-        volatile Field[] declaredPublicFields;
-        volatile Method[] declaredPublicMethods;
-        volatile Class<?>[] interfaces;
-
-        // Value of classRedefinedCount when we created this ReflectionData instance
-        final int redefinedCount;
-
-        ReflectionData(int redefinedCount) {
-            this.redefinedCount = redefinedCount;
-        }
-    }
-
-    private volatile transient SoftReference<ReflectionData<T>> reflectionData;
-
-    // Incremented by the VM on each call to JVM TI RedefineClasses()
-    // that redefines this class or a superclass.
-    private volatile transient int classRedefinedCount;
-
-    // Lazily create and cache ReflectionData
-    private ReflectionData<T> reflectionData() {
-        SoftReference<ReflectionData<T>> reflectionData = this.reflectionData;
-        int classRedefinedCount = this.classRedefinedCount;
-        ReflectionData<T> rd;
-        if (useCaches &&
-            reflectionData != null &&
-            (rd = reflectionData.get()) != null &&
-            rd.redefinedCount == classRedefinedCount) {
-            return rd;
-        }
-        // else no SoftReference or cleared SoftReference or stale ReflectionData
-        // -> create and replace new instance
-        return newReflectionData(reflectionData, classRedefinedCount);
-    }
-
-    private ReflectionData<T> newReflectionData(SoftReference<ReflectionData<T>> oldReflectionData,
-                                                int classRedefinedCount) {
-        if (!useCaches) return null;
-
-        while (true) {
-            ReflectionData<T> rd = new ReflectionData<>(classRedefinedCount);
-            // try to CAS it...
-            if (Atomic.casReflectionData(this, oldReflectionData, new SoftReference<>(rd))) {
-                return rd;
-            }
-            // else retry
-            oldReflectionData = this.reflectionData;
-            classRedefinedCount = this.classRedefinedCount;
-            if (oldReflectionData != null &&
-                (rd = oldReflectionData.get()) != null &&
-                rd.redefinedCount == classRedefinedCount) {
-                return rd;
-            }
-        }
-    }
-
-    // Generic signature handling
-    private native String getGenericSignature0();
-
-    // Generic info repository; lazily initialized
-    private volatile transient ClassRepository genericInfo;
-
-    // accessor for factory
-    private GenericsFactory getFactory() {
-        // create scope and factory
-        return CoreReflectionFactory.make(this, ClassScope.make(this));
-    }
-
-    // accessor for generic info repository;
-    // generic info is lazily initialized
-    private ClassRepository getGenericInfo() {
-        ClassRepository genericInfo = this.genericInfo;
-        if (genericInfo == null) {
-            String signature = getGenericSignature0();
-            if (signature == null) {
-                genericInfo = ClassRepository.NONE;
-            } else {
-                genericInfo = ClassRepository.make(signature, getFactory());
-            }
-            this.genericInfo = genericInfo;
-        }
-        return (genericInfo != ClassRepository.NONE) ? genericInfo : null;
-    }
-
-    // Annotations handling
-    private native Map<Class<? extends Annotation>, Annotation> getDeclaredAnnotationsImpl();
-    // Since 1.8
-    native byte[] getRawTypeAnnotations();
-    static byte[] getExecutableTypeAnnotationBytes(Executable ex) {
-        return getReflectionFactory().getExecutableTypeAnnotationBytes(ex);
-    }
-
-    native ConstantPool getConstantPool();
-
-    //
-    //
-    // java.lang.reflect.Field handling
-    //
-    //
-
-    // Returns an array of "root" fields. These Field objects must NOT
-    // be propagated to the outside world, but must instead be copied
-    // via ReflectionFactory.copyField.
-    private Field[] privateGetDeclaredFields(boolean publicOnly) {
-        checkInitted();
-        Field[] res;
-        ReflectionData<T> rd = reflectionData();
-        if (rd != null) {
-            res = publicOnly ? rd.declaredPublicFields : rd.declaredFields;
-            if (res != null) return res;
-        }
-        // No cached value available; request value from VM
-        res = Reflection.filterFields(this, getDeclaredFields0(publicOnly));
-        if (rd != null) {
-            if (publicOnly) {
-                rd.declaredPublicFields = res;
-            } else {
-                rd.declaredFields = res;
-            }
-        }
-        return res;
-    }
-
-    // Returns an array of "root" fields. These Field objects must NOT
-    // be propagated to the outside world, but must instead be copied
-    // via ReflectionFactory.copyField.
-    private Field[] privateGetPublicFields(Set<Class<?>> traversedInterfaces) {
-        checkInitted();
-        Field[] res;
-        ReflectionData<T> rd = reflectionData();
-        if (rd != null) {
-            res = rd.publicFields;
-            if (res != null) return res;
-        }
-
-        // No cached value available; compute value recursively.
-        // Traverse in correct order for getField().
-        List<Field> fields = new ArrayList<>();
-        if (traversedInterfaces == null) {
-            traversedInterfaces = new HashSet<>();
-        }
-
-        // Local fields
-        Field[] tmp = privateGetDeclaredFields(true);
-        addAll(fields, tmp);
-
-        // Direct superinterfaces, recursively
-        for (Class<?> c : getInterfaces()) {
-            if (!traversedInterfaces.contains(c)) {
-                traversedInterfaces.add(c);
-                addAll(fields, c.privateGetPublicFields(traversedInterfaces));
-            }
-        }
-
-        // Direct superclass, recursively
-        if (!isInterface()) {
-            Class<?> c = getSuperclass();
-            if (c != null) {
-                addAll(fields, c.privateGetPublicFields(traversedInterfaces));
-            }
-        }
-
-        res = new Field[fields.size()];
-        fields.toArray(res);
-        if (rd != null) {
-            rd.publicFields = res;
-        }
-        return res;
-    }
-
-    private static void addAll(Collection<Field> c, Field[] o) {
-        for (int i = 0; i < o.length; i++) {
-            c.add(o[i]);
-        }
-    }
-
-
-    //
-    //
-    // java.lang.reflect.Constructor handling
-    //
-    //
-
-    // Returns an array of "root" constructors. These Constructor
-    // objects must NOT be propagated to the outside world, but must
-    // instead be copied via ReflectionFactory.copyConstructor.
-    private Constructor<T>[] privateGetDeclaredConstructors(boolean publicOnly) {
-        checkInitted();
-        Constructor<T>[] res;
-        ReflectionData<T> rd = reflectionData();
-        if (rd != null) {
-            res = publicOnly ? rd.publicConstructors : rd.declaredConstructors;
-            if (res != null) return res;
-        }
-        // No cached value available; request value from VM
-        if (isInterface()) {
-            @SuppressWarnings("unchecked")
-            Constructor<T>[] temporaryRes = (Constructor<T>[]) new Constructor<?>[0];
-            res = temporaryRes;
-        } else {
-            res = getDeclaredConstructors0(publicOnly);
-        }
-        if (rd != null) {
-            if (publicOnly) {
-                rd.publicConstructors = res;
-            } else {
-                rd.declaredConstructors = res;
-            }
-        }
-        return res;
-    }
-
-    //
-    //
-    // java.lang.reflect.Method handling
-    //
-    //
-
-    // Returns an array of "root" methods. These Method objects must NOT
-    // be propagated to the outside world, but must instead be copied
-    // via ReflectionFactory.copyMethod.
-    private Method[] privateGetDeclaredMethods(boolean publicOnly) {
-        checkInitted();
-        Method[] res;
-        ReflectionData<T> rd = reflectionData();
-        if (rd != null) {
-            res = publicOnly ? rd.declaredPublicMethods : rd.declaredMethods;
-            if (res != null) return res;
-        }
-        // No cached value available; request value from VM
-        res = Reflection.filterMethods(this, getDeclaredMethods0(publicOnly));
-        if (rd != null) {
-            if (publicOnly) {
-                rd.declaredPublicMethods = res;
-            } else {
-                rd.declaredMethods = res;
-            }
-        }
-        return res;
-    }
-
-    static class MethodArray {
-        private Method[] methods;
-        private int length;
-
-        MethodArray() {
-            methods = new Method[20];
-            length = 0;
-        }
-
-        void add(Method m) {
-            if (length == methods.length) {
-                methods = Arrays.copyOf(methods, 2 * methods.length);
-            }
-            methods[length++] = m;
-        }
-
-        void addAll(Method[] ma) {
-            for (int i = 0; i < ma.length; i++) {
-                add(ma[i]);
-            }
-        }
-
-        void addAll(MethodArray ma) {
-            for (int i = 0; i < ma.length(); i++) {
-                add(ma.get(i));
-            }
-        }
-
-        void addIfNotPresent(Method newMethod) {
-            for (int i = 0; i < length; i++) {
-                Method m = methods[i];
-                if (m == newMethod || (m != null && m.equals(newMethod))) {
-                    return;
-                }
-            }
-            add(newMethod);
-        }
-
-        void addAllIfNotPresent(MethodArray newMethods) {
-            for (int i = 0; i < newMethods.length(); i++) {
-                Method m = newMethods.get(i);
-                if (m != null) {
-                    addIfNotPresent(m);
-                }
-            }
-        }
-
-        void addAllNonStatic(Method[] methods) {
-            for (Method candidate : methods) {
-                if (!Modifier.isStatic(candidate.getModifiers())) {
-                    add(candidate);
-                }
-            }
-        }
-
-        int length() {
-            return length;
-        }
-
-        Method get(int i) {
-            return methods[i];
-        }
-
-        void removeByNameAndSignature(Method toRemove) {
-            for (int i = 0; i < length; i++) {
-                Method m = methods[i];
-                if (m != null &&
-                    m.getReturnType() == toRemove.getReturnType() &&
-                    m.getName() == toRemove.getName() &&
-                    arrayContentsEq(m.getParameterTypes(),
-                                    toRemove.getParameterTypes())) {
-                    methods[i] = null;
-                }
-            }
-        }
-
-        void compactAndTrim() {
-            int newPos = 0;
-            // Get rid of null slots
-            for (int pos = 0; pos < length; pos++) {
-                Method m = methods[pos];
-                if (m != null) {
-                    if (pos != newPos) {
-                        methods[newPos] = m;
-                    }
-                    newPos++;
-                }
-            }
-            if (newPos != methods.length) {
-                methods = Arrays.copyOf(methods, newPos);
-            }
-        }
-
-        Method[] getArray() {
-            return methods;
-        }
-    }
-
-
-    // Returns an array of "root" methods. These Method objects must NOT
-    // be propagated to the outside world, but must instead be copied
-    // via ReflectionFactory.copyMethod.
-    private Method[] privateGetPublicMethods() {
-        checkInitted();
-        Method[] res;
-        ReflectionData<T> rd = reflectionData();
-        if (rd != null) {
-            res = rd.publicMethods;
-            if (res != null) return res;
-        }
-
-        // No cached value available; compute value recursively.
-        // Start by fetching public declared methods
-        MethodArray methods = new MethodArray();
-        {
-            Method[] tmp = privateGetDeclaredMethods(true);
-            methods.addAll(tmp);
-        }
-        // Now recur over superclass and direct superinterfaces.
-        // Go over superinterfaces first so we can more easily filter
-        // out concrete implementations inherited from superclasses at
-        // the end.
-        MethodArray inheritedMethods = new MethodArray();
-        Class<?>[] interfaces = getInterfaces();
-        for (int i = 0; i < interfaces.length; i++) {
-            inheritedMethods.addAllNonStatic(interfaces[i].privateGetPublicMethods());
-        }
-        if (!isInterface()) {
-            Class<?> c = getSuperclass();
-            if (c != null) {
-                MethodArray supers = new MethodArray();
-                supers.addAll(c.privateGetPublicMethods());
-                // Filter out concrete implementations of any
-                // interface methods
-                for (int i = 0; i < supers.length(); i++) {
-                    Method m = supers.get(i);
-                    if (m != null && !Modifier.isAbstract(m.getModifiers())) {
-                        inheritedMethods.removeByNameAndSignature(m);
-                    }
-                }
-                // Insert superclass's inherited methods before
-                // superinterfaces' to satisfy getMethod's search
-                // order
-                supers.addAll(inheritedMethods);
-                inheritedMethods = supers;
-            }
-        }
-        // Filter out all local methods from inherited ones
-        for (int i = 0; i < methods.length(); i++) {
-            Method m = methods.get(i);
-            inheritedMethods.removeByNameAndSignature(m);
-        }
-        methods.addAllIfNotPresent(inheritedMethods);
-        methods.compactAndTrim();
-        res = methods.getArray();
-        if (rd != null) {
-            rd.publicMethods = res;
-        }
-        return res;
-    }
-
-
-    //
-    // Helpers for fetchers of one field, method, or constructor
-    //
-
-    private static Field searchFields(Field[] fields, String name) {
-        String internedName = name.intern();
-        for (int i = 0; i < fields.length; i++) {
-            if (fields[i].getName() == internedName) {
-                return getReflectionFactory().copyField(fields[i]);
-            }
-        }
-        return null;
-    }
-
-    private Field getField0(String name) throws NoSuchFieldException {
-        // Note: the intent is that the search algorithm this routine
-        // uses be equivalent to the ordering imposed by
-        // privateGetPublicFields(). It fetches only the declared
-        // public fields for each class, however, to reduce the number
-        // of Field objects which have to be created for the common
-        // case where the field being requested is declared in the
-        // class which is being queried.
-        Field res;
-        // Search declared public fields
-        if ((res = searchFields(privateGetDeclaredFields(true), name)) != null) {
-            return res;
-        }
-        // Direct superinterfaces, recursively
-        Class<?>[] interfaces = getInterfaces();
-        for (int i = 0; i < interfaces.length; i++) {
-            Class<?> c = interfaces[i];
-            if ((res = c.getField0(name)) != null) {
-                return res;
-            }
-        }
-        // Direct superclass, recursively
-        if (!isInterface()) {
-            Class<?> c = getSuperclass();
-            if (c != null) {
-                if ((res = c.getField0(name)) != null) {
-                    return res;
-                }
-            }
-        }
-        return null;
-    }
-
-    private static Method searchMethods(Method[] methods,
-                                        String name,
-                                        Class<?>[] parameterTypes)
-    {
-        Method res = null;
-        String internedName = name.intern();
-        for (int i = 0; i < methods.length; i++) {
-            Method m = methods[i];
-            if (m.getName() == internedName
-                && arrayContentsEq(parameterTypes, m.getParameterTypes())
-                && (res == null
-                    || res.getReturnType().isAssignableFrom(m.getReturnType())))
-                res = m;
-        }
-
-        return (res == null ? res : getReflectionFactory().copyMethod(res));
-    }
-
-
-    private Method getMethod0(String name, Class<?>[] parameterTypes, boolean includeStaticMethods) {
-        // Note: the intent is that the search algorithm this routine
-        // uses be equivalent to the ordering imposed by
-        // privateGetPublicMethods(). It fetches only the declared
-        // public methods for each class, however, to reduce the
-        // number of Method objects which have to be created for the
-        // common case where the method being requested is declared in
-        // the class which is being queried.
-        Method res;
-        // Search declared public methods
-        if ((res = searchMethods(privateGetDeclaredMethods(true),
-                                 name,
-                                 parameterTypes)) != null) {
-            if (includeStaticMethods || !Modifier.isStatic(res.getModifiers()))
-                return res;
-        }
-        // Search superclass's methods
-        if (!isInterface()) {
-            Class<? super T> c = getSuperclass();
-            if (c != null) {
-                if ((res = c.getMethod0(name, parameterTypes, true)) != null) {
-                    return res;
-                }
-            }
-        }
-        // Search superinterfaces' methods
-        Class<?>[] interfaces = getInterfaces();
-        for (Class<?> c : interfaces)
-            if ((res = c.getMethod0(name, parameterTypes, false)) != null)
-                return res;
-        // Not found
-        return null;
-    }
-
-    private Constructor<T> getConstructor0(Class<?>[] parameterTypes,
-                                        int which) throws NoSuchMethodException
-    {
-        Constructor<T>[] constructors = privateGetDeclaredConstructors((which == Member.PUBLIC));
-        for (Constructor<T> constructor : constructors) {
-            if (arrayContentsEq(parameterTypes,
-                                constructor.getParameterTypes())) {
-                return getReflectionFactory().copyConstructor(constructor);
-            }
-        }
-        throw new NoSuchMethodException(getName() + ".<init>" + argumentTypesToString(parameterTypes));
-    }
-
-    //
-    // Other helpers and base implementation
-    //
-
-    private static boolean arrayContentsEq(Object[] a1, Object[] a2) {
-        if (a1 == null) {
-            return a2 == null || a2.length == 0;
-        }
-
-        if (a2 == null) {
-            return a1.length == 0;
-        }
-
-        if (a1.length != a2.length) {
-            return false;
-        }
-
-        for (int i = 0; i < a1.length; i++) {
-            if (a1[i] != a2[i]) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    private static Field[] copyFields(Field[] arg) {
-        Field[] out = new Field[arg.length];
-        ReflectionFactory fact = getReflectionFactory();
-        for (int i = 0; i < arg.length; i++) {
-            out[i] = fact.copyField(arg[i]);
-        }
-        return out;
-    }
-
-    private static Method[] copyMethods(Method[] arg) {
-        Method[] out = new Method[arg.length];
-        ReflectionFactory fact = getReflectionFactory();
-        for (int i = 0; i < arg.length; i++) {
-            out[i] = fact.copyMethod(arg[i]);
-        }
-        return out;
-    }
-
-    private static <U> Constructor<U>[] copyConstructors(Constructor<U>[] arg) {
-        Constructor<U>[] out = arg.clone();
-        ReflectionFactory fact = getReflectionFactory();
-        for (int i = 0; i < out.length; i++) {
-            out[i] = fact.copyConstructor(out[i]);
-        }
-        return out;
-    }
-
-    private native Field[]       getDeclaredFields0(boolean publicOnly);
-    private native Method[]      getDeclaredMethods0(boolean publicOnly);
-    private native Constructor<T>[] getDeclaredConstructors0(boolean publicOnly);
-    private native Class<?>[]   getDeclaredClasses0();
-
-    private static String        argumentTypesToString(Class<?>[] argTypes) {
-        StringBuilder buf = new StringBuilder();
-        buf.append("(");
-        if (argTypes != null) {
-            for (int i = 0; i < argTypes.length; i++) {
-                if (i > 0) {
-                    buf.append(", ");
-                }
-                Class<?> c = argTypes[i];
-                buf.append((c == null) ? "null" : c.getName());
-            }
-        }
-        buf.append(")");
-        return buf.toString();
-    }
-
-    /** use serialVersionUID from JDK 1.1 for interoperability */
-    private static final long serialVersionUID = 3206093459760846163L;
-
-
-    /**
-     * Class Class is special cased within the Serialization Stream Protocol.
-     *
-     * A Class instance is written initially into an ObjectOutputStream in the
-     * following format:
-     * <pre>
-     *      {@code TC_CLASS} ClassDescriptor
-     *      A ClassDescriptor is a special cased serialization of
-     *      a {@code java.io.ObjectStreamClass} instance.
-     * </pre>
-     * A new handle is generated for the initial time the class descriptor
-     * is written into the stream. Future references to the class descriptor
-     * are written as references to the initial class descriptor instance.
-     *
-     * @see java.io.ObjectStreamClass
-     */
-    
-    @ikvm.lang.Property(get="get_spf")
-    private static final ObjectStreamField[] serialPersistentFields = null;
-    
-    private static ObjectStreamField[] get_spf() {
-        return java.io.ObjectStreamClass.NO_FIELDS;
-    }
-
-
-    /**
-     * Returns the assertion status that would be assigned to this
-     * class if it were to be initialized at the time this method is invoked.
-     * If this class has had its assertion status set, the most recent
-     * setting will be returned; otherwise, if any package default assertion
-     * status pertains to this class, the most recent setting for the most
-     * specific pertinent package default assertion status is returned;
-     * otherwise, if this class is not a system class (i.e., it has a
-     * class loader) its class loader's default assertion status is returned;
-     * otherwise, the system class default assertion status is returned.
-     * <p>
-     * Few programmers will have any need for this method; it is provided
-     * for the benefit of the JRE itself.  (It allows a class to determine at
-     * the time that it is initialized whether assertions should be enabled.)
-     * Note that this method is not guaranteed to return the actual
-     * assertion status that was (or will be) associated with the specified
-     * class when it was (or will be) initialized.
-     *
-     * @return the desired assertion status of the specified class.
-     * @see    java.lang.ClassLoader#setClassAssertionStatus
-     * @see    java.lang.ClassLoader#setPackageAssertionStatus
-     * @see    java.lang.ClassLoader#setDefaultAssertionStatus
-     * @since  1.4
-     */
-    public boolean desiredAssertionStatus() {
-        ClassLoader loader = getClassLoader();
-        // If the loader is null this is a system class, so ask the VM
-        if (loader == null)
-            return desiredAssertionStatus0(this);
-
-        // If the classloader has been initialized with the assertion
-        // directives, ask it. Otherwise, ask the VM.
-        synchronized(loader.assertionLock) {
-            if (loader.classAssertionStatus != null) {
-                return loader.desiredAssertionStatus(getName());
-            }
-        }
-        return desiredAssertionStatus0(this);
-    }
-
-    // Retrieves the desired assertion status of this class from the VM
-    private static native boolean desiredAssertionStatus0(Class<?> clazz);
-
-    /**
-     * Returns true if and only if this class was declared as an enum in the
-     * source code.
-     *
-     * @return true if and only if this class was declared as an enum in the
-     *     source code
-     * @since 1.5
-     */
-    public boolean isEnum() {
-        // An enum must both directly extend java.lang.Enum and have
-        // the ENUM bit set; classes for specialized enum constants
-        // don't do the former.
-        return (this.getModifiers() & ENUM) != 0 &&
-        this.getSuperclass() == java.lang.Enum.class;
-    }
-
-    // Fetches the factory for reflective objects
-    private static ReflectionFactory getReflectionFactory() {
-        if (reflectionFactory == null) {
-            reflectionFactory =
-                java.security.AccessController.doPrivileged
-                    (new sun.reflect.ReflectionFactory.GetReflectionFactoryAction());
-        }
-        return reflectionFactory;
-    }
-    private static ReflectionFactory reflectionFactory;
-
-    // To be able to query system properties as soon as they're available
-    private static boolean initted;
-    private static void checkInitted() {
-        if (initted) return;
-        useCaches = true;
-        AccessController.doPrivileged(new PrivilegedAction<Void>() {
-                public Void run() {
-                    // Tests to ensure the system properties table is fully
-                    // initialized. This is needed because reflection code is
-                    // called very early in the initialization process (before
-                    // command-line arguments have been parsed and therefore
-                    // these user-settable properties installed.)
-
-                    if (!sun.misc.VM.isBooted()) {
-                        return null;
-                    }
-
-                    // Doesn't use Boolean.getBoolean to avoid class init.
-                    String val =
-                        System.getProperty("sun.reflect.noCaches");
-                    if (val != null && val.equals("true")) {
-                        useCaches = false;
-                    }
-
-                    initted = true;
-                    return null;
-                }
-            });
-    }
-
-    /**
-     * Returns the elements of this enum class or null if this
-     * Class object does not represent an enum type.
-     *
-     * @return an array containing the values comprising the enum class
-     *     represented by this Class object in the order they're
-     *     declared, or null if this Class object does not
-     *     represent an enum type
-     * @since 1.5
-     */
-    public T[] getEnumConstants() {
-        T[] values = getEnumConstantsShared();
-        return (values != null) ? values.clone() : null;
-    }
-
-    /**
-     * Returns the elements of this enum class or null if this
-     * Class object does not represent an enum type;
-     * identical to getEnumConstants except that the result is
-     * uncloned, cached, and shared by all callers.
-     */
-    T[] getEnumConstantsShared() {
-        if (enumConstants == null) {
-            if (!isEnum()) return null;
-            try {
-                final Method values = getMethod("values");
-                java.security.AccessController.doPrivileged(
-                    new java.security.PrivilegedAction<Void>() {
-                        public Void run() {
-                                values.setAccessible(true);
-                                return null;
-                            }
-                        });
-                @SuppressWarnings("unchecked")
-                T[] temporaryConstants = (T[])values.invoke(null);
-                enumConstants = temporaryConstants;
-            }
-            // These can happen when users concoct enum-like classes
-            // that don't comply with the enum spec.
-            catch (InvocationTargetException | NoSuchMethodException |
-                   IllegalAccessException ex) { return null; }
-        }
-        return enumConstants;
-    }
-    private volatile transient T[] enumConstants;
-
-    /**
-     * Returns a map from simple name to enum constant.  This package-private
-     * method is used internally by Enum to implement
-     * {@code public static <T extends Enum<T>> T valueOf(Class<T>, String)}
-     * efficiently.  Note that the map is returned by this method is
-     * created lazily on first use.  Typically it won't ever get created.
-     */
-    Map<String, T> enumConstantDirectory() {
-        if (enumConstantDirectory == null) {
-            T[] universe = getEnumConstantsShared();
-            if (universe == null)
-                throw new IllegalArgumentException(
-                    getName() + " is not an enum type");
-            Map<String, T> m = new HashMap<>(2 * universe.length);
-            for (T constant : universe)
-                m.put(((Enum<?>)constant).name(), constant);
-            enumConstantDirectory = m;
-        }
-        return enumConstantDirectory;
-    }
-    private volatile transient Map<String, T> enumConstantDirectory;
-
-    /**
-     * Casts an object to the class or interface represented
-     * by this {@code Class} object.
-     *
-     * @param obj the object to be cast
-     * @return the object after casting, or null if obj is null
-     *
-     * @throws ClassCastException if the object is not
-     * null and is not assignable to the type T.
-     *
-     * @since 1.5
-     */
-    @SuppressWarnings("unchecked")
-    public T cast(Object obj) {
-        if (obj != null && !isInstance(obj))
-            throw new ClassCastException(cannotCastMsg(obj));
-        return (T) obj;
-    }
-
-    private String cannotCastMsg(Object obj) {
-        return "Cannot cast " + obj.getClass().getName() + " to " + getName();
-    }
-
-    /**
-     * Casts this {@code Class} object to represent a subclass of the class
-     * represented by the specified class object.  Checks that the cast
-     * is valid, and throws a {@code ClassCastException} if it is not.  If
-     * this method succeeds, it always returns a reference to this class object.
-     *
-     * <p>This method is useful when a client needs to "narrow" the type of
-     * a {@code Class} object to pass it to an API that restricts the
-     * {@code Class} objects that it is willing to accept.  A cast would
-     * generate a compile-time warning, as the correctness of the cast
-     * could not be checked at runtime (because generic types are implemented
-     * by erasure).
-     *
-     * @param <U> the type to cast this class object to
-     * @param clazz the class of the type to cast this class object to
-     * @return this {@code Class} object, cast to represent a subclass of
-     *    the specified class object.
-     * @throws ClassCastException if this {@code Class} object does not
-     *    represent a subclass of the specified class (here "subclass" includes
-     *    the class itself).
-     * @since 1.5
-     */
-    @SuppressWarnings("unchecked")
-    public <U> Class<? extends U> asSubclass(Class<U> clazz) {
-        if (clazz.isAssignableFrom(this))
-            return (Class<? extends U>) this;
-        else
-            throw new ClassCastException(this.toString());
-    }
-
-    /**
-     * @throws NullPointerException {@inheritDoc}
-     * @since 1.5
-     */
-    @SuppressWarnings("unchecked")
-    public <A extends Annotation> A getAnnotation(Class<A> annotationClass) {
-        Objects.requireNonNull(annotationClass);
-
-        return (A) annotationData().annotations.get(annotationClass);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @throws NullPointerException {@inheritDoc}
-     * @since 1.5
-     */
-    @Override
-    public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
-        return GenericDeclaration.super.isAnnotationPresent(annotationClass);
-    }
-
-    /**
-     * @throws NullPointerException {@inheritDoc}
-     * @since 1.8
-     */
-    @Override
-    public <A extends Annotation> A[] getAnnotationsByType(Class<A> annotationClass) {
-        Objects.requireNonNull(annotationClass);
-
-        AnnotationData annotationData = annotationData();
-        return AnnotationSupport.getAssociatedAnnotations(annotationData.declaredAnnotations,
-                                                          this,
-                                                          annotationClass);
-    }
-
-    /**
-     * @since 1.5
-     */
-    public Annotation[] getAnnotations() {
-        return AnnotationParser.toArray(annotationData().annotations);
-    }
-
-    /**
-     * @throws NullPointerException {@inheritDoc}
-     * @since 1.8
-     */
-    @Override
-    @SuppressWarnings("unchecked")
-    public <A extends Annotation> A getDeclaredAnnotation(Class<A> annotationClass) {
-        Objects.requireNonNull(annotationClass);
-
-        return (A) annotationData().declaredAnnotations.get(annotationClass);
-    }
-
-    /**
-     * @throws NullPointerException {@inheritDoc}
-     * @since 1.8
-     */
-    @Override
-    public <A extends Annotation> A[] getDeclaredAnnotationsByType(Class<A> annotationClass) {
-        Objects.requireNonNull(annotationClass);
-
-        return AnnotationSupport.getDirectlyAndIndirectlyPresent(annotationData().declaredAnnotations,
-                                                                 annotationClass);
-    }
-
-    /**
-     * @since 1.5
-     */
-    public Annotation[] getDeclaredAnnotations()  {
-        return AnnotationParser.toArray(annotationData().declaredAnnotations);
-    }
-
-    // annotation data that might get invalidated when JVM TI RedefineClasses() is called
-    private static class AnnotationData {
-        final Map<Class<? extends Annotation>, Annotation> annotations;
-        final Map<Class<? extends Annotation>, Annotation> declaredAnnotations;
-
-        // Value of classRedefinedCount when we created this AnnotationData instance
-        final int redefinedCount;
-
-        AnnotationData(Map<Class<? extends Annotation>, Annotation> annotations,
-                       Map<Class<? extends Annotation>, Annotation> declaredAnnotations,
-                       int redefinedCount) {
-            this.annotations = annotations;
-            this.declaredAnnotations = declaredAnnotations;
-            this.redefinedCount = redefinedCount;
-        }
-    }
-
-    // Annotations cache
-    @SuppressWarnings("UnusedDeclaration")
-    private volatile transient AnnotationData annotationData;
-
-    private AnnotationData annotationData() {
-        while (true) { // retry loop
-            AnnotationData annotationData = this.annotationData;
-            int classRedefinedCount = this.classRedefinedCount;
-            if (annotationData != null &&
-                annotationData.redefinedCount == classRedefinedCount) {
-                return annotationData;
-            }
-            // null or stale annotationData -> optimistically create new instance
-            AnnotationData newAnnotationData = createAnnotationData(classRedefinedCount);
-            // try to install it
-            if (Atomic.casAnnotationData(this, annotationData, newAnnotationData)) {
-                // successfully installed new AnnotationData
-                return newAnnotationData;
-            }
-        }
-    }
-
-    private AnnotationData createAnnotationData(int classRedefinedCount) {
-        Map<Class<? extends Annotation>, Annotation> declaredAnnotations =
-            getDeclaredAnnotationsImpl();
-        Class<?> superClass = getSuperclass();
-        Map<Class<? extends Annotation>, Annotation> annotations = null;
-        if (superClass != null) {
-            Map<Class<? extends Annotation>, Annotation> superAnnotations =
-                superClass.annotationData().annotations;
-            for (Map.Entry<Class<? extends Annotation>, Annotation> e : superAnnotations.entrySet()) {
-                Class<? extends Annotation> annotationClass = e.getKey();
-                if (AnnotationType.getInstance(annotationClass).isInherited()) {
-                    if (annotations == null) { // lazy construction
-                        annotations = new LinkedHashMap<>((Math.max(
-                                declaredAnnotations.size(),
-                                Math.min(12, declaredAnnotations.size() + superAnnotations.size())
-                            ) * 4 + 2) / 3
-                        );
-                    }
-                    annotations.put(annotationClass, e.getValue());
-                }
-            }
-        }
-        if (annotations == null) {
-            // no inherited annotations -> share the Map with declaredAnnotations
-            annotations = declaredAnnotations;
-        } else {
-            // at least one inherited annotation -> declared may override inherited
-            annotations.putAll(declaredAnnotations);
-        }
-        return new AnnotationData(annotations, declaredAnnotations, classRedefinedCount);
-    }
-
-    // Annotation types cache their internal (AnnotationType) form
-
-    @SuppressWarnings("UnusedDeclaration")
-    private volatile transient AnnotationType annotationType;
-
-    boolean casAnnotationType(AnnotationType oldType, AnnotationType newType) {
-        return Atomic.casAnnotationType(this, oldType, newType);
-    }
-
-    AnnotationType getAnnotationType() {
-        return annotationType;
-    }
-
-    Map<Class<? extends Annotation>, Annotation> getDeclaredAnnotationMap() {
-        return annotationData().declaredAnnotations;
-    }
-
-    /* Backing store of user-defined values pertaining to this class.
-     * Maintained by the ClassValue class.
-     */
-    transient ClassValue.ClassValueMap classValueMap;
-
-    /**
-     * Returns an {@code AnnotatedType} object that represents the use of a
-     * type to specify the superclass of the entity represented by this {@code
-     * Class} object. (The <em>use</em> of type Foo to specify the superclass
-     * in '...  extends Foo' is distinct from the <em>declaration</em> of type
-     * Foo.)
-     *
-     * <p> If this {@code Class} object represents a type whose declaration
-     * does not explicitly indicate an annotated superclass, then the return
-     * value is an {@code AnnotatedType} object representing an element with no
-     * annotations.
-     *
-     * <p> If this {@code Class} represents either the {@code Object} class, an
-     * interface type, an array type, a primitive type, or void, the return
-     * value is {@code null}.
-     *
-     * @return an object representing the superclass
-     * @since 1.8
-     */
-    public AnnotatedType getAnnotatedSuperclass() {
-        if (this == Object.class ||
-                isInterface() ||
-                isArray() ||
-                isPrimitive() ||
-                this == Void.TYPE) {
-            return null;
-        }
-
-        return TypeAnnotationParser.buildAnnotatedSuperclass(getRawTypeAnnotations(), getConstantPool(), this);
-    }
-
-    /**
-     * Returns an array of {@code AnnotatedType} objects that represent the use
-     * of types to specify superinterfaces of the entity represented by this
-     * {@code Class} object. (The <em>use</em> of type Foo to specify a
-     * superinterface in '... implements Foo' is distinct from the
-     * <em>declaration</em> of type Foo.)
-     *
-     * <p> If this {@code Class} object represents a class, the return value is
-     * an array containing objects representing the uses of interface types to
-     * specify interfaces implemented by the class. The order of the objects in
-     * the array corresponds to the order of the interface types used in the
-     * 'implements' clause of the declaration of this {@code Class} object.
-     *
-     * <p> If this {@code Class} object represents an interface, the return
-     * value is an array containing objects representing the uses of interface
-     * types to specify interfaces directly extended by the interface. The
-     * order of the objects in the array corresponds to the order of the
-     * interface types used in the 'extends' clause of the declaration of this
-     * {@code Class} object.
-     *
-     * <p> If this {@code Class} object represents a class or interface whose
-     * declaration does not explicitly indicate any annotated superinterfaces,
-     * the return value is an array of length 0.
-     *
-     * <p> If this {@code Class} object represents either the {@code Object}
-     * class, an array type, a primitive type, or void, the return value is an
-     * array of length 0.
-     *
-     * @return an array representing the superinterfaces
-     * @since 1.8
-     */
-    public AnnotatedType[] getAnnotatedInterfaces() {
-         return TypeAnnotationParser.buildAnnotatedInterfaces(getRawTypeAnnotations(), getConstantPool(), this);
-    }
-}
diff --git a/openjdk/java/lang/ClassLoader.java b/openjdk/java/lang/ClassLoader.java
deleted file mode 100644
index 57c1ee3e..00000000
--- a/openjdk/java/lang/ClassLoader.java
+++ /dev/null
@@ -1,2261 +0,0 @@
-/*
- * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.lang;
-
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.File;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.security.AccessController;
-import java.security.AccessControlContext;
-import java.security.CodeSource;
-import java.security.Policy;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.security.ProtectionDomain;
-import java.security.cert.Certificate;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.Stack;
-import java.util.Map;
-import java.util.Vector;
-import java.util.Hashtable;
-import java.util.WeakHashMap;
-import java.util.concurrent.ConcurrentHashMap;
-import sun.misc.ClassFileTransformer;
-import sun.misc.CompoundEnumeration;
-import sun.misc.Resource;
-import sun.misc.URLClassPath;
-import sun.misc.VM;
-import sun.reflect.CallerSensitive;
-import sun.reflect.Reflection;
-import sun.security.util.SecurityConstants;
-
-/**
- * A class loader is an object that is responsible for loading classes. The
- * class <tt>ClassLoader</tt> is an abstract class.  Given the <a
- * href="#name">binary name</a> of a class, a class loader should attempt to
- * locate or generate data that constitutes a definition for the class.  A
- * typical strategy is to transform the name into a file name and then read a
- * "class file" of that name from a file system.
- *
- * <p> Every {@link Class <tt>Class</tt>} object contains a {@link
- * Class#getClassLoader() reference} to the <tt>ClassLoader</tt> that defined
- * it.
- *
- * <p> <tt>Class</tt> objects for array classes are not created by class
- * loaders, but are created automatically as required by the Java runtime.
- * The class loader for an array class, as returned by {@link
- * Class#getClassLoader()} is the same as the class loader for its element
- * type; if the element type is a primitive type, then the array class has no
- * class loader.
- *
- * <p> Applications implement subclasses of <tt>ClassLoader</tt> in order to
- * extend the manner in which the Java virtual machine dynamically loads
- * classes.
- *
- * <p> Class loaders may typically be used by security managers to indicate
- * security domains.
- *
- * <p> The <tt>ClassLoader</tt> class uses a delegation model to search for
- * classes and resources.  Each instance of <tt>ClassLoader</tt> has an
- * associated parent class loader.  When requested to find a class or
- * resource, a <tt>ClassLoader</tt> instance will delegate the search for the
- * class or resource to its parent class loader before attempting to find the
- * class or resource itself.  The virtual machine's built-in class loader,
- * called the "bootstrap class loader", does not itself have a parent but may
- * serve as the parent of a <tt>ClassLoader</tt> instance.
- *
- * <p> Class loaders that support concurrent loading of classes are known as
- * <em>parallel capable</em> class loaders and are required to register
- * themselves at their class initialization time by invoking the
- * {@link
- * #registerAsParallelCapable <tt>ClassLoader.registerAsParallelCapable</tt>}
- * method. Note that the <tt>ClassLoader</tt> class is registered as parallel
- * capable by default. However, its subclasses still need to register themselves
- * if they are parallel capable. <br>
- * In environments in which the delegation model is not strictly
- * hierarchical, class loaders need to be parallel capable, otherwise class
- * loading can lead to deadlocks because the loader lock is held for the
- * duration of the class loading process (see {@link #loadClass
- * <tt>loadClass</tt>} methods).
- *
- * <p> Normally, the Java virtual machine loads classes from the local file
- * system in a platform-dependent manner.  For example, on UNIX systems, the
- * virtual machine loads classes from the directory defined by the
- * <tt>CLASSPATH</tt> environment variable.
- *
- * <p> However, some classes may not originate from a file; they may originate
- * from other sources, such as the network, or they could be constructed by an
- * application.  The method {@link #defineClass(String, byte[], int, int)
- * <tt>defineClass</tt>} converts an array of bytes into an instance of class
- * <tt>Class</tt>. Instances of this newly defined class can be created using
- * {@link Class#newInstance <tt>Class.newInstance</tt>}.
- *
- * <p> The methods and constructors of objects created by a class loader may
- * reference other classes.  To determine the class(es) referred to, the Java
- * virtual machine invokes the {@link #loadClass <tt>loadClass</tt>} method of
- * the class loader that originally created the class.
- *
- * <p> For example, an application could create a network class loader to
- * download class files from a server.  Sample code might look like:
- *
- * <blockquote><pre>
- *   ClassLoader loader&nbsp;= new NetworkClassLoader(host,&nbsp;port);
- *   Object main&nbsp;= loader.loadClass("Main", true).newInstance();
- *       &nbsp;.&nbsp;.&nbsp;.
- * </pre></blockquote>
- *
- * <p> The network class loader subclass must define the methods {@link
- * #findClass <tt>findClass</tt>} and <tt>loadClassData</tt> to load a class
- * from the network.  Once it has downloaded the bytes that make up the class,
- * it should use the method {@link #defineClass <tt>defineClass</tt>} to
- * create a class instance.  A sample implementation is:
- *
- * <blockquote><pre>
- *     class NetworkClassLoader extends ClassLoader {
- *         String host;
- *         int port;
- *
- *         public Class findClass(String name) {
- *             byte[] b = loadClassData(name);
- *             return defineClass(name, b, 0, b.length);
- *         }
- *
- *         private byte[] loadClassData(String name) {
- *             // load the class data from the connection
- *             &nbsp;.&nbsp;.&nbsp;.
- *         }
- *     }
- * </pre></blockquote>
- *
- * <h4> <a name="name">Binary names</a> </h4>
- *
- * <p> Any class name provided as a {@link String} parameter to methods in
- * <tt>ClassLoader</tt> must be a binary name as defined by
- * <cite>The Java&trade; Language Specification</cite>.
- *
- * <p> Examples of valid class names include:
- * <blockquote><pre>
- *   "java.lang.String"
- *   "javax.swing.JSpinner$DefaultEditor"
- *   "java.security.KeyStore$Builder$FileBuilder$1"
- *   "java.net.URLClassLoader$3$1"
- * </pre></blockquote>
- *
- * @see      #resolveClass(Class)
- * @since 1.0
- */
-public abstract class ClassLoader {
-
-    // If initialization succeed this is set to true and security checks will
-    // succeed.  Otherwise the object is not initialized and the object is
-    // useless.
-    private final boolean initialized;
-
-    // The parent class loader for delegation
-    // Note: VM hardcoded the offset of this field, thus all new fields
-    // must be added *after* it.
-    private final ClassLoader parent;
-
-    /**
-     * Encapsulates the set of parallel capable loader types.
-     */
-    private static class ParallelLoaders {
-        private ParallelLoaders() {}
-
-        // the set of parallel capable loader types
-        private static final Set<Class<? extends ClassLoader>> loaderTypes =
-            Collections.newSetFromMap(
-                new WeakHashMap<Class<? extends ClassLoader>, Boolean>());
-        static {
-            synchronized (loaderTypes) { loaderTypes.add(ClassLoader.class); }
-        }
-
-        /**
-         * Registers the given class loader type as parallel capabale.
-         * Returns {@code true} is successfully registered; {@code false} if
-         * loader's super class is not registered.
-         */
-        static boolean register(Class<? extends ClassLoader> c) {
-            synchronized (loaderTypes) {
-                if (loaderTypes.contains(c.getSuperclass())) {
-                    // register the class loader as parallel capable
-                    // if and only if all of its super classes are.
-                    // Note: given current classloading sequence, if
-                    // the immediate super class is parallel capable,
-                    // all the super classes higher up must be too.
-                    loaderTypes.add(c);
-                    return true;
-                } else {
-                    return false;
-                }
-            }
-        }
-
-        /**
-         * Returns {@code true} if the given class loader type is
-         * registered as parallel capable.
-         */
-        static boolean isRegistered(Class<? extends ClassLoader> c) {
-            synchronized (loaderTypes) {
-                return loaderTypes.contains(c);
-            }
-        }
-    }
-
-    // Maps class name to the corresponding lock object when the current
-    // class loader is parallel capable.
-    // Note: VM also uses this field to decide if the current class loader
-    // is parallel capable and the appropriate lock object for class loading.
-    private final ConcurrentHashMap<String, Object> parallelLockMap;
-
-    // Hashtable that maps packages to certs
-    private final Map <String, Certificate[]> package2certs;
-
-    // Shared among all packages with unsigned classes
-    private static final Certificate[] nocerts = new Certificate[0];
-
-    // The classes loaded by this class loader.  The only purpose of this table
-    // is to keep the classes from being GC'ed until the loader is GC'ed.
-    private final Vector<Class<?>> classes = new Vector<>();
-
-    // The "default" domain. Set as the default ProtectionDomain on newly
-    // created classes.
-    private final ProtectionDomain defaultDomain =
-        new ProtectionDomain(new CodeSource(null, (Certificate[]) null),
-                             null, this, null);
-
-    // The initiating protection domains for all classes loaded by this loader
-    private final Set<ProtectionDomain> domains;
-
-    // Invoked by the VM to record every loaded class with this loader.
-    void addClass(Class c) {
-        classes.addElement(c);
-    }
-
-    // The packages defined in this class loader.  Each package name is mapped
-    // to its corresponding Package object.
-    // @GuardedBy("itself")
-    private final HashMap<String, Package> packages = new HashMap<>();
-    
-    @ikvm.lang.Internal
-    public static final ClassLoader DUMMY = new ClassLoader(false) { };
-    
-    ClassLoader(boolean ignored)
-    {
-        // [IKVM] This constructor is IKVM specific and only used to construct DUMMY.
-        // Note that this body is replaced in map.xml with an empty body as
-        // we don't want to execute any of the instance field initializers.
-        this((Void)null, (ClassLoader)null);
-    }
-
-    private static Void checkCreateClassLoader() {
-        SecurityManager security = System.getSecurityManager();
-        if (security != null) {
-            security.checkCreateClassLoader();
-        }
-        return null;
-    }
-
-    // [IKVM] this normally private constructor is also used by ikvm.runtime.AssemblyClassLoader
-    // to construct an assembly class loader without doing a security check
-    @ikvm.lang.Internal
-    protected ClassLoader(Void unused, ClassLoader parent) {
-        if (parent != null) {
-            parent.check();
-        }
-        this.parent = parent;
-        if (ParallelLoaders.isRegistered(this.getClass())) {
-            parallelLockMap = new ConcurrentHashMap<>();
-            package2certs = new ConcurrentHashMap<>();
-            domains =
-                Collections.synchronizedSet(new HashSet<ProtectionDomain>());
-            assertionLock = new Object();
-        } else {
-            // no finer-grained lock; lock on the classloader instance
-            parallelLockMap = null;
-            package2certs = new Hashtable<>();
-            domains = new HashSet<>();
-            assertionLock = this;
-        }
-        initialized = true;
-    }
-
-    /**
-     * Creates a new class loader using the specified parent class loader for
-     * delegation.
-     *
-     * <p> If there is a security manager, its {@link
-     * SecurityManager#checkCreateClassLoader()
-     * <tt>checkCreateClassLoader</tt>} method is invoked.  This may result in
-     * a security exception.  </p>
-     *
-     * @param  parent
-     *         The parent class loader
-     *
-     * @throws  SecurityException
-     *          If a security manager exists and its
-     *          <tt>checkCreateClassLoader</tt> method doesn't allow creation
-     *          of a new class loader.
-     *
-     * @since  1.2
-     */
-    protected ClassLoader(ClassLoader parent) {
-        this(checkCreateClassLoader(), parent);
-    }
-
-    /**
-     * Creates a new class loader using the <tt>ClassLoader</tt> returned by
-     * the method {@link #getSystemClassLoader()
-     * <tt>getSystemClassLoader()</tt>} as the parent class loader.
-     *
-     * <p> If there is a security manager, its {@link
-     * SecurityManager#checkCreateClassLoader()
-     * <tt>checkCreateClassLoader</tt>} method is invoked.  This may result in
-     * a security exception.  </p>
-     *
-     * @throws  SecurityException
-     *          If a security manager exists and its
-     *          <tt>checkCreateClassLoader</tt> method doesn't allow creation
-     *          of a new class loader.
-     */
-    protected ClassLoader() {
-        this(checkCreateClassLoader(), getSystemClassLoader());
-    }
-
-    // -- Class --
-
-    /**
-     * Loads the class with the specified <a href="#name">binary name</a>.
-     * This method searches for classes in the same manner as the {@link
-     * #loadClass(String, boolean)} method.  It is invoked by the Java virtual
-     * machine to resolve class references.  Invoking this method is equivalent
-     * to invoking {@link #loadClass(String, boolean) <tt>loadClass(name,
-     * false)</tt>}.  </p>
-     *
-     * @param  name
-     *         The <a href="#name">binary name</a> of the class
-     *
-     * @return  The resulting <tt>Class</tt> object
-     *
-     * @throws  ClassNotFoundException
-     *          If the class was not found
-     */
-    public Class<?> loadClass(String name) throws ClassNotFoundException {
-        return loadClass(name, false);
-    }
-
-    /**
-     * Loads the class with the specified <a href="#name">binary name</a>.  The
-     * default implementation of this method searches for classes in the
-     * following order:
-     *
-     * <p><ol>
-     *
-     *   <li><p> Invoke {@link #findLoadedClass(String)} to check if the class
-     *   has already been loaded.  </p></li>
-     *
-     *   <li><p> Invoke the {@link #loadClass(String) <tt>loadClass</tt>} method
-     *   on the parent class loader.  If the parent is <tt>null</tt> the class
-     *   loader built-in to the virtual machine is used, instead.  </p></li>
-     *
-     *   <li><p> Invoke the {@link #findClass(String)} method to find the
-     *   class.  </p></li>
-     *
-     * </ol>
-     *
-     * <p> If the class was found using the above steps, and the
-     * <tt>resolve</tt> flag is true, this method will then invoke the {@link
-     * #resolveClass(Class)} method on the resulting <tt>Class</tt> object.
-     *
-     * <p> Subclasses of <tt>ClassLoader</tt> are encouraged to override {@link
-     * #findClass(String)}, rather than this method.  </p>
-     *
-     * <p> Unless overridden, this method synchronizes on the result of
-     * {@link #getClassLoadingLock <tt>getClassLoadingLock</tt>} method
-     * during the entire class loading process.
-     *
-     * @param  name
-     *         The <a href="#name">binary name</a> of the class
-     *
-     * @param  resolve
-     *         If <tt>true</tt> then resolve the class
-     *
-     * @return  The resulting <tt>Class</tt> object
-     *
-     * @throws  ClassNotFoundException
-     *          If the class could not be found
-     */
-    protected Class<?> loadClass(String name, boolean resolve)
-        throws ClassNotFoundException
-    {
-        synchronized (getClassLoadingLock(name)) {
-            // First, check if the class has already been loaded
-            Class c = findLoadedClass(name);
-            if (c == null) {
-                try {
-                    if (parent != null) {
-                        c = parent.loadClass(name, false);
-                    } else {
-                        c = findBootstrapClassOrNull(name);
-                    }
-                } catch (ClassNotFoundException e) {
-                    // ClassNotFoundException thrown if class not found
-                    // from the non-null parent class loader
-                }
-
-                if (c == null) {
-                    // If still not found, then invoke findClass in order
-                    // to find the class.
-                    c = findClass(name);
-                }
-            }
-            if (resolve) {
-                resolveClass(c);
-            }
-            return c;
-        }
-    }
-
-    /**
-     * Returns the lock object for class loading operations.
-     * For backward compatibility, the default implementation of this method
-     * behaves as follows. If this ClassLoader object is registered as
-     * parallel capable, the method returns a dedicated object associated
-     * with the specified class name. Otherwise, the method returns this
-     * ClassLoader object. </p>
-     *
-     * @param  className
-     *         The name of the to-be-loaded class
-     *
-     * @return the lock for class loading operations
-     *
-     * @throws NullPointerException
-     *         If registered as parallel capable and <tt>className</tt> is null
-     *
-     * @see #loadClass(String, boolean)
-     *
-     * @since  1.7
-     */
-    protected Object getClassLoadingLock(String className) {
-        Object lock = this;
-        if (parallelLockMap != null) {
-            Object newLock = new Object();
-            lock = parallelLockMap.putIfAbsent(className, newLock);
-            if (lock == null) {
-                lock = newLock;
-            }
-        }
-        return lock;
-    }
-
-    // This method is invoked by the virtual machine to load a class.
-    final Class loadClassInternal(String name)
-        throws ClassNotFoundException
-    {
-        // For backward compatibility, explicitly lock on 'this' when
-        // the current class loader is not parallel capable.
-        if (parallelLockMap == null) {
-            synchronized (this) {
-                 return loadClass(name);
-            }
-        } else {
-            return loadClass(name);
-        }
-    }
-
-    // Invoked by the VM after loading class with this loader.
-    final void checkPackageAccess(Class cls, ProtectionDomain pd) {
-        final SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            final String name = cls.getName();
-            final int i = name.lastIndexOf('.');
-            if (i != -1) {
-                AccessController.doPrivileged(new PrivilegedAction<Void>() {
-                    public Void run() {
-                        sm.checkPackageAccess(name.substring(0, i));
-                        return null;
-                    }
-                }, new AccessControlContext(new ProtectionDomain[] {pd}));
-            }
-        }
-        domains.add(pd);
-    }
-
-    /**
-     * Finds the class with the specified <a href="#name">binary name</a>.
-     * This method should be overridden by class loader implementations that
-     * follow the delegation model for loading classes, and will be invoked by
-     * the {@link #loadClass <tt>loadClass</tt>} method after checking the
-     * parent class loader for the requested class.  The default implementation
-     * throws a <tt>ClassNotFoundException</tt>.  </p>
-     *
-     * @param  name
-     *         The <a href="#name">binary name</a> of the class
-     *
-     * @return  The resulting <tt>Class</tt> object
-     *
-     * @throws  ClassNotFoundException
-     *          If the class could not be found
-     *
-     * @since  1.2
-     */
-    protected Class<?> findClass(String name) throws ClassNotFoundException {
-        throw new ClassNotFoundException(name);
-    }
-
-    /**
-     * Converts an array of bytes into an instance of class <tt>Class</tt>.
-     * Before the <tt>Class</tt> can be used it must be resolved.  This method
-     * is deprecated in favor of the version that takes a <a
-     * href="#name">binary name</a> as its first argument, and is more secure.
-     *
-     * @param  b
-     *         The bytes that make up the class data.  The bytes in positions
-     *         <tt>off</tt> through <tt>off+len-1</tt> should have the format
-     *         of a valid class file as defined by
-     *         <cite>The Java&trade; Virtual Machine Specification</cite>.
-     *
-     * @param  off
-     *         The start offset in <tt>b</tt> of the class data
-     *
-     * @param  len
-     *         The length of the class data
-     *
-     * @return  The <tt>Class</tt> object that was created from the specified
-     *          class data
-     *
-     * @throws  ClassFormatError
-     *          If the data did not contain a valid class
-     *
-     * @throws  IndexOutOfBoundsException
-     *          If either <tt>off</tt> or <tt>len</tt> is negative, or if
-     *          <tt>off+len</tt> is greater than <tt>b.length</tt>.
-     *
-     * @throws  SecurityException
-     *          If an attempt is made to add this class to a package that
-     *          contains classes that were signed by a different set of
-     *          certificates than this class, or if an attempt is made
-     *          to define a class in a package with a fully-qualified name
-     *          that starts with "{@code java.}".
-     *
-     * @see  #loadClass(String, boolean)
-     * @see  #resolveClass(Class)
-     *
-     * @deprecated  Replaced by {@link #defineClass(String, byte[], int, int)
-     * defineClass(String, byte[], int, int)}
-     */
-    @Deprecated
-    protected final Class<?> defineClass(byte[] b, int off, int len)
-        throws ClassFormatError
-    {
-        return defineClass(null, b, off, len, null);
-    }
-
-    /**
-     * Converts an array of bytes into an instance of class <tt>Class</tt>.
-     * Before the <tt>Class</tt> can be used it must be resolved.
-     *
-     * <p> This method assigns a default {@link java.security.ProtectionDomain
-     * <tt>ProtectionDomain</tt>} to the newly defined class.  The
-     * <tt>ProtectionDomain</tt> is effectively granted the same set of
-     * permissions returned when {@link
-     * java.security.Policy#getPermissions(java.security.CodeSource)
-     * <tt>Policy.getPolicy().getPermissions(new CodeSource(null, null))</tt>}
-     * is invoked.  The default domain is created on the first invocation of
-     * {@link #defineClass(String, byte[], int, int) <tt>defineClass</tt>},
-     * and re-used on subsequent invocations.
-     *
-     * <p> To assign a specific <tt>ProtectionDomain</tt> to the class, use
-     * the {@link #defineClass(String, byte[], int, int,
-     * java.security.ProtectionDomain) <tt>defineClass</tt>} method that takes a
-     * <tt>ProtectionDomain</tt> as one of its arguments.  </p>
-     *
-     * @param  name
-     *         The expected <a href="#name">binary name</a> of the class, or
-     *         <tt>null</tt> if not known
-     *
-     * @param  b
-     *         The bytes that make up the class data.  The bytes in positions
-     *         <tt>off</tt> through <tt>off+len-1</tt> should have the format
-     *         of a valid class file as defined by
-     *         <cite>The Java&trade; Virtual Machine Specification</cite>.
-     *
-     * @param  off
-     *         The start offset in <tt>b</tt> of the class data
-     *
-     * @param  len
-     *         The length of the class data
-     *
-     * @return  The <tt>Class</tt> object that was created from the specified
-     *          class data.
-     *
-     * @throws  ClassFormatError
-     *          If the data did not contain a valid class
-     *
-     * @throws  IndexOutOfBoundsException
-     *          If either <tt>off</tt> or <tt>len</tt> is negative, or if
-     *          <tt>off+len</tt> is greater than <tt>b.length</tt>.
-     *
-     * @throws  SecurityException
-     *          If an attempt is made to add this class to a package that
-     *          contains classes that were signed by a different set of
-     *          certificates than this class (which is unsigned), or if
-     *          <tt>name</tt> begins with "<tt>java.</tt>".
-     *
-     * @see  #loadClass(String, boolean)
-     * @see  #resolveClass(Class)
-     * @see  java.security.CodeSource
-     * @see  java.security.SecureClassLoader
-     *
-     * @since  1.1
-     */
-    protected final Class<?> defineClass(String name, byte[] b, int off, int len)
-        throws ClassFormatError
-    {
-        return defineClass(name, b, off, len, null);
-    }
-
-    /* Determine protection domain, and check that:
-        - not define java.* class,
-        - signer of this class matches signers for the rest of the classes in
-          package.
-    */
-    private ProtectionDomain preDefineClass(String name,
-                                            ProtectionDomain pd)
-    {
-        if (!checkName(name))
-            throw new NoClassDefFoundError("IllegalName: " + name);
-
-        if ((name != null) && name.startsWith("java.")) {
-            throw new SecurityException
-                ("Prohibited package name: " +
-                 name.substring(0, name.lastIndexOf('.')));
-        }
-        if (pd == null) {
-            pd = defaultDomain;
-        }
-
-        if (name != null) checkCerts(name, pd.getCodeSource());
-
-        return pd;
-    }
-
-    private String defineClassSourceLocation(ProtectionDomain pd)
-    {
-        CodeSource cs = pd.getCodeSource();
-        String source = null;
-        if (cs != null && cs.getLocation() != null) {
-            source = cs.getLocation().toString();
-        }
-        return source;
-    }
-
-    private Class defineTransformedClass(String name, byte[] b, int off, int len,
-                                         ProtectionDomain pd,
-                                         ClassFormatError cfe, String source)
-      throws ClassFormatError
-    {
-        // Class format error - try to transform the bytecode and
-        // define the class again
-        //
-        ClassFileTransformer[] transformers =
-            ClassFileTransformer.getTransformers();
-        Class c = null;
-
-        if (transformers != null) {
-            for (ClassFileTransformer transformer : transformers) {
-                try {
-                    // Transform byte code using transformer
-                    byte[] tb = transformer.transform(b, off, len);
-                    c = defineClass1(name, tb, 0, tb.length,
-                                     pd, source);
-                    break;
-                } catch (ClassFormatError cfe2)     {
-                    // If ClassFormatError occurs, try next transformer
-                }
-            }
-        }
-
-        // Rethrow original ClassFormatError if unable to transform
-        // bytecode to well-formed
-        //
-        if (c == null)
-            throw cfe;
-
-        return c;
-    }
-
-    private void postDefineClass(Class c, ProtectionDomain pd)
-    {
-        if (pd.getCodeSource() != null) {
-            Certificate certs[] = pd.getCodeSource().getCertificates();
-            if (certs != null)
-                setSigners(c, certs);
-        }
-    }
-
-    /**
-     * Converts an array of bytes into an instance of class <tt>Class</tt>,
-     * with an optional <tt>ProtectionDomain</tt>.  If the domain is
-     * <tt>null</tt>, then a default domain will be assigned to the class as
-     * specified in the documentation for {@link #defineClass(String, byte[],
-     * int, int)}.  Before the class can be used it must be resolved.
-     *
-     * <p> The first class defined in a package determines the exact set of
-     * certificates that all subsequent classes defined in that package must
-     * contain.  The set of certificates for a class is obtained from the
-     * {@link java.security.CodeSource <tt>CodeSource</tt>} within the
-     * <tt>ProtectionDomain</tt> of the class.  Any classes added to that
-     * package must contain the same set of certificates or a
-     * <tt>SecurityException</tt> will be thrown.  Note that if
-     * <tt>name</tt> is <tt>null</tt>, this check is not performed.
-     * You should always pass in the <a href="#name">binary name</a> of the
-     * class you are defining as well as the bytes.  This ensures that the
-     * class you are defining is indeed the class you think it is.
-     *
-     * <p> The specified <tt>name</tt> cannot begin with "<tt>java.</tt>", since
-     * all classes in the "<tt>java.*</tt> packages can only be defined by the
-     * bootstrap class loader.  If <tt>name</tt> is not <tt>null</tt>, it
-     * must be equal to the <a href="#name">binary name</a> of the class
-     * specified by the byte array "<tt>b</tt>", otherwise a {@link
-     * <tt>NoClassDefFoundError</tt>} will be thrown.  </p>
-     *
-     * @param  name
-     *         The expected <a href="#name">binary name</a> of the class, or
-     *         <tt>null</tt> if not known
-     *
-     * @param  b
-     *         The bytes that make up the class data. The bytes in positions
-     *         <tt>off</tt> through <tt>off+len-1</tt> should have the format
-     *         of a valid class file as defined by
-     *         <cite>The Java&trade; Virtual Machine Specification</cite>.
-     *
-     * @param  off
-     *         The start offset in <tt>b</tt> of the class data
-     *
-     * @param  len
-     *         The length of the class data
-     *
-     * @param  protectionDomain
-     *         The ProtectionDomain of the class
-     *
-     * @return  The <tt>Class</tt> object created from the data,
-     *          and optional <tt>ProtectionDomain</tt>.
-     *
-     * @throws  ClassFormatError
-     *          If the data did not contain a valid class
-     *
-     * @throws  NoClassDefFoundError
-     *          If <tt>name</tt> is not equal to the <a href="#name">binary
-     *          name</a> of the class specified by <tt>b</tt>
-     *
-     * @throws  IndexOutOfBoundsException
-     *          If either <tt>off</tt> or <tt>len</tt> is negative, or if
-     *          <tt>off+len</tt> is greater than <tt>b.length</tt>.
-     *
-     * @throws  SecurityException
-     *          If an attempt is made to add this class to a package that
-     *          contains classes that were signed by a different set of
-     *          certificates than this class, or if <tt>name</tt> begins with
-     *          "<tt>java.</tt>".
-     */
-    protected final Class<?> defineClass(String name, byte[] b, int off, int len,
-                                         ProtectionDomain protectionDomain)
-        throws ClassFormatError
-    {
-        check();
-        protectionDomain = preDefineClass(name, protectionDomain);
-
-        Class c = null;
-        String source = defineClassSourceLocation(protectionDomain);
-
-        try {
-            c = defineClass1(name, b, off, len, protectionDomain, source);
-        } catch (ClassFormatError cfe) {
-            c = defineTransformedClass(name, b, off, len, protectionDomain, cfe,
-                                       source);
-        }
-
-        postDefineClass(c, protectionDomain);
-        return c;
-    }
-
-    /**
-     * Converts a {@link java.nio.ByteBuffer <tt>ByteBuffer</tt>}
-     * into an instance of class <tt>Class</tt>,
-     * with an optional <tt>ProtectionDomain</tt>.  If the domain is
-     * <tt>null</tt>, then a default domain will be assigned to the class as
-     * specified in the documentation for {@link #defineClass(String, byte[],
-     * int, int)}.  Before the class can be used it must be resolved.
-     *
-     * <p>The rules about the first class defined in a package determining the
-     * set of certificates for the package, and the restrictions on class names
-     * are identical to those specified in the documentation for {@link
-     * #defineClass(String, byte[], int, int, ProtectionDomain)}.
-     *
-     * <p> An invocation of this method of the form
-     * <i>cl</i><tt>.defineClass(</tt><i>name</i><tt>,</tt>
-     * <i>bBuffer</i><tt>,</tt> <i>pd</i><tt>)</tt> yields exactly the same
-     * result as the statements
-     *
-     * <blockquote><tt>
-     * ...<br>
-     * byte[] temp = new byte[</tt><i>bBuffer</i><tt>.{@link
-     * java.nio.ByteBuffer#remaining remaining}()];<br>
-     *     </tt><i>bBuffer</i><tt>.{@link java.nio.ByteBuffer#get(byte[])
-     * get}(temp);<br>
-     *     return {@link #defineClass(String, byte[], int, int, ProtectionDomain)
-     * </tt><i>cl</i><tt>.defineClass}(</tt><i>name</i><tt>, temp, 0,
-     * temp.length, </tt><i>pd</i><tt>);<br>
-     * </tt></blockquote>
-     *
-     * @param  name
-     *         The expected <a href="#name">binary name</a>. of the class, or
-     *         <tt>null</tt> if not known
-     *
-     * @param  b
-     *         The bytes that make up the class data. The bytes from positions
-     *         <tt>b.position()</tt> through <tt>b.position() + b.limit() -1
-     *         </tt> should have the format of a valid class file as defined by
-     *         <cite>The Java&trade; Virtual Machine Specification</cite>.
-     *
-     * @param  protectionDomain
-     *         The ProtectionDomain of the class, or <tt>null</tt>.
-     *
-     * @return  The <tt>Class</tt> object created from the data,
-     *          and optional <tt>ProtectionDomain</tt>.
-     *
-     * @throws  ClassFormatError
-     *          If the data did not contain a valid class.
-     *
-     * @throws  NoClassDefFoundError
-     *          If <tt>name</tt> is not equal to the <a href="#name">binary
-     *          name</a> of the class specified by <tt>b</tt>
-     *
-     * @throws  SecurityException
-     *          If an attempt is made to add this class to a package that
-     *          contains classes that were signed by a different set of
-     *          certificates than this class, or if <tt>name</tt> begins with
-     *          "<tt>java.</tt>".
-     *
-     * @see      #defineClass(String, byte[], int, int, ProtectionDomain)
-     *
-     * @since  1.5
-     */
-    protected final Class<?> defineClass(String name, java.nio.ByteBuffer b,
-                                         ProtectionDomain protectionDomain)
-        throws ClassFormatError
-    {
-        check();
-
-        int len = b.remaining();
-
-        // Use byte[] if not a direct ByteBufer:
-        if (!b.isDirect()) {
-            if (b.hasArray()) {
-                return defineClass(name, b.array(),
-                                   b.position() + b.arrayOffset(), len,
-                                   protectionDomain);
-            } else {
-                // no array, or read-only array
-                byte[] tb = new byte[len];
-                b.get(tb);  // get bytes out of byte buffer.
-                return defineClass(name, tb, 0, len, protectionDomain);
-            }
-        }
-
-        protectionDomain = preDefineClass(name, protectionDomain);
-
-        Class c = null;
-        String source = defineClassSourceLocation(protectionDomain);
-
-        try {
-            c = defineClass2(name, b, b.position(), len, protectionDomain,
-                             source);
-        } catch (ClassFormatError cfe) {
-            byte[] tb = new byte[len];
-            b.get(tb);  // get bytes out of byte buffer.
-            c = defineTransformedClass(name, tb, 0, len, protectionDomain, cfe,
-                                       source);
-        }
-
-        postDefineClass(c, protectionDomain);
-        return c;
-    }
-
-    private native Class defineClass0(String name, byte[] b, int off, int len,
-                                      ProtectionDomain pd);
-
-    private native Class defineClass1(String name, byte[] b, int off, int len,
-                                      ProtectionDomain pd, String source);
-
-    private native Class defineClass2(String name, java.nio.ByteBuffer b,
-                                      int off, int len, ProtectionDomain pd,
-                                      String source);
-
-    // true if the name is null or has the potential to be a valid binary name
-    static boolean checkName(String name) {
-        if ((name == null) || (name.length() == 0))
-            return true;
-        if ((name.indexOf('/') != -1)
-            || (!VM.allowArraySyntax() && (name.charAt(0) == '[')))
-            return false;
-        return true;
-    }
-
-    private void checkCerts(String name, CodeSource cs) {
-        int i = name.lastIndexOf('.');
-        String pname = (i == -1) ? "" : name.substring(0, i);
-
-        Certificate[] certs = null;
-        if (cs != null) {
-            certs = cs.getCertificates();
-        }
-        Certificate[] pcerts = null;
-        if (parallelLockMap == null) {
-            synchronized (this) {
-                pcerts = package2certs.get(pname);
-                if (pcerts == null) {
-                    package2certs.put(pname, (certs == null? nocerts:certs));
-                }
-            }
-        } else {
-            pcerts = ((ConcurrentHashMap<String, Certificate[]>)package2certs).
-                putIfAbsent(pname, (certs == null? nocerts:certs));
-        }
-        if (pcerts != null && !compareCerts(pcerts, certs)) {
-            throw new SecurityException("class \""+ name +
-                 "\"'s signer information does not match signer information of other classes in the same package");
-        }
-    }
-
-    /**
-     * check to make sure the certs for the new class (certs) are the same as
-     * the certs for the first class inserted in the package (pcerts)
-     */
-    private boolean compareCerts(Certificate[] pcerts,
-                                 Certificate[] certs)
-    {
-        // certs can be null, indicating no certs.
-        if ((certs == null) || (certs.length == 0)) {
-            return pcerts.length == 0;
-        }
-
-        // the length must be the same at this point
-        if (certs.length != pcerts.length)
-            return false;
-
-        // go through and make sure all the certs in one array
-        // are in the other and vice-versa.
-        boolean match;
-        for (int i = 0; i < certs.length; i++) {
-            match = false;
-            for (int j = 0; j < pcerts.length; j++) {
-                if (certs[i].equals(pcerts[j])) {
-                    match = true;
-                    break;
-                }
-            }
-            if (!match) return false;
-        }
-
-        // now do the same for pcerts
-        for (int i = 0; i < pcerts.length; i++) {
-            match = false;
-            for (int j = 0; j < certs.length; j++) {
-                if (pcerts[i].equals(certs[j])) {
-                    match = true;
-                    break;
-                }
-            }
-            if (!match) return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Links the specified class.  This (misleadingly named) method may be
-     * used by a class loader to link a class.  If the class <tt>c</tt> has
-     * already been linked, then this method simply returns. Otherwise, the
-     * class is linked as described in the "Execution" chapter of
-     * <cite>The Java&trade; Language Specification</cite>.
-     * </p>
-     *
-     * @param  c
-     *         The class to link
-     *
-     * @throws  NullPointerException
-     *          If <tt>c</tt> is <tt>null</tt>.
-     *
-     * @see  #defineClass(String, byte[], int, int)
-     */
-    protected final void resolveClass(Class<?> c) {
-        check();
-        resolveClass0(c);
-    }
-
-    private native void resolveClass0(Class c);
-
-    /**
-     * Finds a class with the specified <a href="#name">binary name</a>,
-     * loading it if necessary.
-     *
-     * <p> This method loads the class through the system class loader (see
-     * {@link #getSystemClassLoader()}).  The <tt>Class</tt> object returned
-     * might have more than one <tt>ClassLoader</tt> associated with it.
-     * Subclasses of <tt>ClassLoader</tt> need not usually invoke this method,
-     * because most class loaders need to override just {@link
-     * #findClass(String)}.  </p>
-     *
-     * @param  name
-     *         The <a href="#name">binary name</a> of the class
-     *
-     * @return  The <tt>Class</tt> object for the specified <tt>name</tt>
-     *
-     * @throws  ClassNotFoundException
-     *          If the class could not be found
-     *
-     * @see  #ClassLoader(ClassLoader)
-     * @see  #getParent()
-     */
-    protected final Class<?> findSystemClass(String name)
-        throws ClassNotFoundException
-    {
-        check();
-        ClassLoader system = getSystemClassLoader();
-        if (system == null) {
-            if (!checkName(name))
-                throw new ClassNotFoundException(name);
-            Class cls = findBootstrapClass(name);
-            if (cls == null) {
-                throw new ClassNotFoundException(name);
-            }
-            return cls;
-        }
-        return system.loadClass(name);
-    }
-
-    /**
-     * Returns a class loaded by the bootstrap class loader;
-     * or return null if not found.
-     */
-    private Class findBootstrapClassOrNull(String name)
-    {
-        check();
-        if (!checkName(name)) return null;
-
-        return findBootstrapClass(name);
-    }
-
-    // return null if not found
-    private native Class findBootstrapClass(String name);
-
-    // Check to make sure the class loader has been initialized.
-    private void check() {
-        if (!initialized) {
-            throw new SecurityException("ClassLoader object not initialized");
-        }
-    }
-
-    /**
-     * Returns the class with the given <a href="#name">binary name</a> if this
-     * loader has been recorded by the Java virtual machine as an initiating
-     * loader of a class with that <a href="#name">binary name</a>.  Otherwise
-     * <tt>null</tt> is returned.  </p>
-     *
-     * @param  name
-     *         The <a href="#name">binary name</a> of the class
-     *
-     * @return  The <tt>Class</tt> object, or <tt>null</tt> if the class has
-     *          not been loaded
-     *
-     * @since  1.1
-     */
-    protected final Class<?> findLoadedClass(String name) {
-        check();
-        if (!checkName(name))
-            return null;
-        return findLoadedClass0(name);
-    }
-
-    private native final Class findLoadedClass0(String name);
-
-    /**
-     * Sets the signers of a class.  This should be invoked after defining a
-     * class.  </p>
-     *
-     * @param  c
-     *         The <tt>Class</tt> object
-     *
-     * @param  signers
-     *         The signers for the class
-     *
-     * @since  1.1
-     */
-    protected final void setSigners(Class<?> c, Object[] signers) {
-        check();
-        c.setSigners(signers);
-    }
-
-
-    // -- Resource --
-
-    /**
-     * Finds the resource with the given name.  A resource is some data
-     * (images, audio, text, etc) that can be accessed by class code in a way
-     * that is independent of the location of the code.
-     *
-     * <p> The name of a resource is a '<tt>/</tt>'-separated path name that
-     * identifies the resource.
-     *
-     * <p> This method will first search the parent class loader for the
-     * resource; if the parent is <tt>null</tt> the path of the class loader
-     * built-in to the virtual machine is searched.  That failing, this method
-     * will invoke {@link #findResource(String)} to find the resource.  </p>
-     *
-     * @param  name
-     *         The resource name
-     *
-     * @return  A <tt>URL</tt> object for reading the resource, or
-     *          <tt>null</tt> if the resource could not be found or the invoker
-     *          doesn't have adequate  privileges to get the resource.
-     *
-     * @since  1.1
-     */
-    public URL getResource(String name) {
-        URL url;
-        if (parent != null) {
-            url = parent.getResource(name);
-        } else {
-            url = getBootstrapResource(name);
-        }
-        if (url == null) {
-            url = findResource(name);
-        }
-        return url;
-    }
-
-    /**
-     * Finds all the resources with the given name. A resource is some data
-     * (images, audio, text, etc) that can be accessed by class code in a way
-     * that is independent of the location of the code.
-     *
-     * <p>The name of a resource is a <tt>/</tt>-separated path name that
-     * identifies the resource.
-     *
-     * <p> The search order is described in the documentation for {@link
-     * #getResource(String)}.  </p>
-     *
-     * @param  name
-     *         The resource name
-     *
-     * @return  An enumeration of {@link java.net.URL <tt>URL</tt>} objects for
-     *          the resource.  If no resources could  be found, the enumeration
-     *          will be empty.  Resources that the class loader doesn't have
-     *          access to will not be in the enumeration.
-     *
-     * @throws  IOException
-     *          If I/O errors occur
-     *
-     * @see  #findResources(String)
-     *
-     * @since  1.2
-     */
-    public Enumeration<URL> getResources(String name) throws IOException {
-        Enumeration[] tmp = new Enumeration[2];
-        if (parent != null) {
-            tmp[0] = parent.getResources(name);
-        } else {
-            tmp[0] = getBootstrapResources(name);
-        }
-        tmp[1] = findResources(name);
-
-        return new CompoundEnumeration<>(tmp);
-    }
-
-    /**
-     * Finds the resource with the given name. Class loader implementations
-     * should override this method to specify where to find resources.  </p>
-     *
-     * @param  name
-     *         The resource name
-     *
-     * @return  A <tt>URL</tt> object for reading the resource, or
-     *          <tt>null</tt> if the resource could not be found
-     *
-     * @since  1.2
-     */
-    protected URL findResource(String name) {
-        return null;
-    }
-
-    /**
-     * Returns an enumeration of {@link java.net.URL <tt>URL</tt>} objects
-     * representing all the resources with the given name. Class loader
-     * implementations should override this method to specify where to load
-     * resources from.  </p>
-     *
-     * @param  name
-     *         The resource name
-     *
-     * @return  An enumeration of {@link java.net.URL <tt>URL</tt>} objects for
-     *          the resources
-     *
-     * @throws  IOException
-     *          If I/O errors occur
-     *
-     * @since  1.2
-     */
-    protected Enumeration<URL> findResources(String name) throws IOException {
-        return java.util.Collections.emptyEnumeration();
-    }
-
-    /**
-     * Registers the caller as parallel capable.</p>
-     * The registration succeeds if and only if all of the following
-     * conditions are met: <br>
-     * 1. no instance of the caller has been created</p>
-     * 2. all of the super classes (except class Object) of the caller are
-     * registered as parallel capable</p>
-     * Note that once a class loader is registered as parallel capable, there
-     * is no way to change it back. </p>
-     *
-     * @return  true if the caller is successfully registered as
-     *          parallel capable and false if otherwise.
-     *
-     * @since   1.7
-     */
-    @CallerSensitive
-    protected static boolean registerAsParallelCapable() {
-        Class<? extends ClassLoader> callerClass =
-            Reflection.getCallerClass().asSubclass(ClassLoader.class);
-        return ParallelLoaders.register(callerClass);
-    }
-
-    /**
-     * Find a resource of the specified name from the search path used to load
-     * classes.  This method locates the resource through the system class
-     * loader (see {@link #getSystemClassLoader()}).  </p>
-     *
-     * @param  name
-     *         The resource name
-     *
-     * @return  A {@link java.net.URL <tt>URL</tt>} object for reading the
-     *          resource, or <tt>null</tt> if the resource could not be found
-     *
-     * @since  1.1
-     */
-    public static URL getSystemResource(String name) {
-        ClassLoader system = getSystemClassLoader();
-        if (system == null) {
-            return getBootstrapResource(name);
-        }
-        return system.getResource(name);
-    }
-
-    /**
-     * Finds all resources of the specified name from the search path used to
-     * load classes.  The resources thus found are returned as an
-     * {@link java.util.Enumeration <tt>Enumeration</tt>} of {@link
-     * java.net.URL <tt>URL</tt>} objects.
-     *
-     * <p> The search order is described in the documentation for {@link
-     * #getSystemResource(String)}.  </p>
-     *
-     * @param  name
-     *         The resource name
-     *
-     * @return  An enumeration of resource {@link java.net.URL <tt>URL</tt>}
-     *          objects
-     *
-     * @throws  IOException
-     *          If I/O errors occur
-
-     * @since  1.2
-     */
-    public static Enumeration<URL> getSystemResources(String name)
-        throws IOException
-    {
-        ClassLoader system = getSystemClassLoader();
-        if (system == null) {
-            return getBootstrapResources(name);
-        }
-        return system.getResources(name);
-    }
-
-    /**
-     * Find resources from the VM's built-in classloader.
-     */
-    private static native URL getBootstrapResource(String name);
-
-    /**
-     * Find resources from the VM's built-in classloader.
-     */
-    private static native Enumeration<URL> getBootstrapResources(String name)
-        throws IOException;
-
-    // Returns the URLClassPath that is used for finding system resources.
-    static URLClassPath getBootstrapClassPath() {
-        return sun.misc.Launcher.getBootstrapClassPath();
-    }
-
-
-    /**
-     * Returns an input stream for reading the specified resource.
-     *
-     * <p> The search order is described in the documentation for {@link
-     * #getResource(String)}.  </p>
-     *
-     * @param  name
-     *         The resource name
-     *
-     * @return  An input stream for reading the resource, or <tt>null</tt>
-     *          if the resource could not be found
-     *
-     * @since  1.1
-     */
-    public InputStream getResourceAsStream(String name) {
-        URL url = getResource(name);
-        try {
-            return url != null ? url.openStream() : null;
-        } catch (IOException e) {
-            return null;
-        }
-    }
-
-    /**
-     * Open for reading, a resource of the specified name from the search path
-     * used to load classes.  This method locates the resource through the
-     * system class loader (see {@link #getSystemClassLoader()}).  </p>
-     *
-     * @param  name
-     *         The resource name
-     *
-     * @return  An input stream for reading the resource, or <tt>null</tt>
-     *          if the resource could not be found
-     *
-     * @since  1.1
-     */
-    public static InputStream getSystemResourceAsStream(String name) {
-        URL url = getSystemResource(name);
-        try {
-            return url != null ? url.openStream() : null;
-        } catch (IOException e) {
-            return null;
-        }
-    }
-
-
-    // -- Hierarchy --
-
-    /**
-     * Returns the parent class loader for delegation. Some implementations may
-     * use <tt>null</tt> to represent the bootstrap class loader. This method
-     * will return <tt>null</tt> in such implementations if this class loader's
-     * parent is the bootstrap class loader.
-     *
-     * <p> If a security manager is present, and the invoker's class loader is
-     * not <tt>null</tt> and is not an ancestor of this class loader, then this
-     * method invokes the security manager's {@link
-     * SecurityManager#checkPermission(java.security.Permission)
-     * <tt>checkPermission</tt>} method with a {@link
-     * RuntimePermission#RuntimePermission(String)
-     * <tt>RuntimePermission("getClassLoader")</tt>} permission to verify
-     * access to the parent class loader is permitted.  If not, a
-     * <tt>SecurityException</tt> will be thrown.  </p>
-     *
-     * @return  The parent <tt>ClassLoader</tt>
-     *
-     * @throws  SecurityException
-     *          If a security manager exists and its <tt>checkPermission</tt>
-     *          method doesn't allow access to this class loader's parent class
-     *          loader.
-     *
-     * @since  1.2
-     */
-    @CallerSensitive
-    public final ClassLoader getParent() {
-        if (parent == null)
-            return null;
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            checkClassLoaderPermission(parent, Reflection.getCallerClass());
-        }
-        return parent;
-    }
-
-    /**
-     * Returns the system class loader for delegation.  This is the default
-     * delegation parent for new <tt>ClassLoader</tt> instances, and is
-     * typically the class loader used to start the application.
-     *
-     * <p> This method is first invoked early in the runtime's startup
-     * sequence, at which point it creates the system class loader and sets it
-     * as the context class loader of the invoking <tt>Thread</tt>.
-     *
-     * <p> The default system class loader is an implementation-dependent
-     * instance of this class.
-     *
-     * <p> If the system property "<tt>java.system.class.loader</tt>" is defined
-     * when this method is first invoked then the value of that property is
-     * taken to be the name of a class that will be returned as the system
-     * class loader.  The class is loaded using the default system class loader
-     * and must define a public constructor that takes a single parameter of
-     * type <tt>ClassLoader</tt> which is used as the delegation parent.  An
-     * instance is then created using this constructor with the default system
-     * class loader as the parameter.  The resulting class loader is defined
-     * to be the system class loader.
-     *
-     * <p> If a security manager is present, and the invoker's class loader is
-     * not <tt>null</tt> and the invoker's class loader is not the same as or
-     * an ancestor of the system class loader, then this method invokes the
-     * security manager's {@link
-     * SecurityManager#checkPermission(java.security.Permission)
-     * <tt>checkPermission</tt>} method with a {@link
-     * RuntimePermission#RuntimePermission(String)
-     * <tt>RuntimePermission("getClassLoader")</tt>} permission to verify
-     * access to the system class loader.  If not, a
-     * <tt>SecurityException</tt> will be thrown.  </p>
-     *
-     * @return  The system <tt>ClassLoader</tt> for delegation, or
-     *          <tt>null</tt> if none
-     *
-     * @throws  SecurityException
-     *          If a security manager exists and its <tt>checkPermission</tt>
-     *          method doesn't allow access to the system class loader.
-     *
-     * @throws  IllegalStateException
-     *          If invoked recursively during the construction of the class
-     *          loader specified by the "<tt>java.system.class.loader</tt>"
-     *          property.
-     *
-     * @throws  Error
-     *          If the system property "<tt>java.system.class.loader</tt>"
-     *          is defined but the named class could not be loaded, the
-     *          provider class does not define the required constructor, or an
-     *          exception is thrown by that constructor when it is invoked. The
-     *          underlying cause of the error can be retrieved via the
-     *          {@link Throwable#getCause()} method.
-     *
-     * @revised  1.4
-     */
-    @CallerSensitive
-    public static ClassLoader getSystemClassLoader() {
-        initSystemClassLoader();
-        if (scl == null) {
-            return null;
-        }
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            checkClassLoaderPermission(scl, Reflection.getCallerClass());
-        }
-        return scl;
-    }
-
-    private static synchronized void initSystemClassLoader() {
-        if (!sclSet) {
-            if (scl != null)
-                throw new IllegalStateException("recursive invocation");
-            sun.misc.Launcher l = sun.misc.Launcher.getLauncher();
-            if (l != null) {
-                Throwable oops = null;
-                scl = l.getClassLoader();
-                try {
-                    scl = AccessController.doPrivileged(
-                        new SystemClassLoaderAction(scl));
-                } catch (PrivilegedActionException pae) {
-                    oops = pae.getCause();
-                    if (oops instanceof InvocationTargetException) {
-                        oops = oops.getCause();
-                    }
-                }
-                if (oops != null) {
-                    if (oops instanceof Error) {
-                        throw (Error) oops;
-                    } else {
-                        // wrap the exception
-                        throw new Error(oops);
-                    }
-                }
-            }
-            sclSet = true;
-        }
-    }
-
-    // Returns true if the specified class loader can be found in this class
-    // loader's delegation chain.
-    boolean isAncestor(ClassLoader cl) {
-        ClassLoader acl = this;
-        do {
-            acl = acl.parent;
-            if (cl == acl) {
-                return true;
-            }
-        } while (acl != null);
-        return false;
-    }
-
-    // Tests if class loader access requires "getClassLoader" permission
-    // check.  A class loader 'from' can access class loader 'to' if
-    // class loader 'from' is same as class loader 'to' or an ancestor
-    // of 'to'.  The class loader in a system domain can access
-    // any class loader.
-    private static boolean needsClassLoaderPermissionCheck(ClassLoader from,
-                                                           ClassLoader to)
-    {
-        if (from == to)
-            return false;
-
-        if (from == null)
-            return false;
-
-        return !to.isAncestor(from);
-    }
-
-    // Returns the class's class loader, or null if none.
-    static ClassLoader getClassLoader(Class<?> caller) {
-        // This can be null if the VM is requesting it
-        if (caller == null) {
-            return null;
-        }
-        // Circumvent security check since this is package-private
-        return caller.getClassLoader0();
-    }
-
-    static void checkClassLoaderPermission(ClassLoader cl, Class<?> caller) {
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            // caller can be null if the VM is requesting it
-            ClassLoader ccl = getClassLoader(caller);
-            if (needsClassLoaderPermissionCheck(ccl, cl)) {
-                sm.checkPermission(SecurityConstants.GET_CLASSLOADER_PERMISSION);
-            }
-        }
-    }
-
-    // The class loader for the system
-    // @GuardedBy("ClassLoader.class")
-    private static ClassLoader scl;
-
-    // Set to true once the system class loader has been set
-    // @GuardedBy("ClassLoader.class")
-    private static boolean sclSet;
-
-
-    // -- Package --
-
-    /**
-     * Defines a package by name in this <tt>ClassLoader</tt>.  This allows
-     * class loaders to define the packages for their classes. Packages must
-     * be created before the class is defined, and package names must be
-     * unique within a class loader and cannot be redefined or changed once
-     * created.  </p>
-     *
-     * @param  name
-     *         The package name
-     *
-     * @param  specTitle
-     *         The specification title
-     *
-     * @param  specVersion
-     *         The specification version
-     *
-     * @param  specVendor
-     *         The specification vendor
-     *
-     * @param  implTitle
-     *         The implementation title
-     *
-     * @param  implVersion
-     *         The implementation version
-     *
-     * @param  implVendor
-     *         The implementation vendor
-     *
-     * @param  sealBase
-     *         If not <tt>null</tt>, then this package is sealed with
-     *         respect to the given code source {@link java.net.URL
-     *         <tt>URL</tt>}  object.  Otherwise, the package is not sealed.
-     *
-     * @return  The newly defined <tt>Package</tt> object
-     *
-     * @throws  IllegalArgumentException
-     *          If package name duplicates an existing package either in this
-     *          class loader or one of its ancestors
-     *
-     * @since  1.2
-     */
-    protected Package definePackage(String name, String specTitle,
-                                    String specVersion, String specVendor,
-                                    String implTitle, String implVersion,
-                                    String implVendor, URL sealBase)
-        throws IllegalArgumentException
-    {
-        synchronized (packages) {
-            Package pkg = getPackage(name);
-            if (pkg != null) {
-                throw new IllegalArgumentException(name);
-            }
-            pkg = new Package(name, specTitle, specVersion, specVendor,
-                              implTitle, implVersion, implVendor,
-                              sealBase, this);
-            packages.put(name, pkg);
-            return pkg;
-        }
-    }
-
-    /**
-     * Returns a <tt>Package</tt> that has been defined by this class loader
-     * or any of its ancestors.  </p>
-     *
-     * @param  name
-     *         The package name
-     *
-     * @return  The <tt>Package</tt> corresponding to the given name, or
-     *          <tt>null</tt> if not found
-     *
-     * @since  1.2
-     */
-    protected Package getPackage(String name) {
-        Package pkg;
-        synchronized (packages) {
-            pkg = packages.get(name);
-        }
-        if (pkg == null) {
-            if (parent != null) {
-                pkg = parent.getPackage(name);
-            } else {
-                pkg = Package.getSystemPackage(name);
-            }
-            if (pkg != null) {
-                synchronized (packages) {
-                    Package pkg2 = packages.get(name);
-                    if (pkg2 == null) {
-                        packages.put(name, pkg);
-                    } else {
-                        pkg = pkg2;
-                    }
-                }
-            }
-        }
-        return pkg;
-    }
-
-    /**
-     * Returns all of the <tt>Packages</tt> defined by this class loader and
-     * its ancestors.  </p>
-     *
-     * @return  The array of <tt>Package</tt> objects defined by this
-     *          <tt>ClassLoader</tt>
-     *
-     * @since  1.2
-     */
-    protected Package[] getPackages() {
-        Map<String, Package> map;
-        synchronized (packages) {
-            map = new HashMap<>(packages);
-        }
-        Package[] pkgs;
-        if (parent != null) {
-            pkgs = parent.getPackages();
-        } else {
-            pkgs = Package.getSystemPackages();
-        }
-        if (pkgs != null) {
-            for (int i = 0; i < pkgs.length; i++) {
-                String pkgName = pkgs[i].getName();
-                if (map.get(pkgName) == null) {
-                    map.put(pkgName, pkgs[i]);
-                }
-            }
-        }
-        return map.values().toArray(new Package[map.size()]);
-    }
-
-
-    // -- Native library access --
-
-    /**
-     * Returns the absolute path name of a native library.  The VM invokes this
-     * method to locate the native libraries that belong to classes loaded with
-     * this class loader. If this method returns <tt>null</tt>, the VM
-     * searches the library along the path specified as the
-     * "<tt>java.library.path</tt>" property.  </p>
-     *
-     * @param  libname
-     *         The library name
-     *
-     * @return  The absolute path of the native library
-     *
-     * @see  System#loadLibrary(String)
-     * @see  System#mapLibraryName(String)
-     *
-     * @since  1.2
-     */
-    protected String findLibrary(String libname) {
-        return null;
-    }
-
-    /**
-     * The inner class NativeLibrary denotes a loaded native library instance.
-     * Every classloader contains a vector of loaded native libraries in the
-     * private field <tt>nativeLibraries</tt>.  The native libraries loaded
-     * into the system are entered into the <tt>systemNativeLibraries</tt>
-     * vector.
-     *
-     * <p> Every native library requires a particular version of JNI. This is
-     * denoted by the private <tt>jniVersion</tt> field.  This field is set by
-     * the VM when it loads the library, and used by the VM to pass the correct
-     * version of JNI to the native methods.  </p>
-     *
-     * @see      ClassLoader
-     * @since    1.2
-     */
-    static class NativeLibrary {
-        // opaque handle to native library, used in native code.
-        long handle;
-        // the version of JNI environment the native library requires.
-        private int jniVersion;
-        // the class from which the library is loaded, also indicates
-        // the loader this native library belongs.
-        Class fromClass;
-        // the canonicalized name of the native library.
-        String name;
-
-        native void load(String name);
-        native long find(String name);
-        native void unload();
-
-        public NativeLibrary(Class fromClass, String name) {
-            this.name = name;
-            this.fromClass = fromClass;
-        }
-
-        protected void finalize() {
-            synchronized (loadedLibraryNames) {
-                if (fromClass.getClassLoader() != null && handle != 0) {
-                    /* remove the native library name */
-                    int size = loadedLibraryNames.size();
-                    for (int i = 0; i < size; i++) {
-                        if (name.equals(loadedLibraryNames.elementAt(i))) {
-                            loadedLibraryNames.removeElementAt(i);
-                            break;
-                        }
-                    }
-                    /* unload the library. */
-                    ClassLoader.nativeLibraryContext.push(this);
-                    try {
-                        unload();
-                    } finally {
-                        ClassLoader.nativeLibraryContext.pop();
-                    }
-                }
-            }
-        }
-        // Invoked in the VM to determine the context class in
-        // JNI_Load/JNI_Unload
-        static Class getFromClass() {
-            return ClassLoader.nativeLibraryContext.peek().fromClass;
-        }
-    }
-
-    // All native library names we've loaded.
-    private static Vector<String> loadedLibraryNames = new Vector<>();
-
-    // Native libraries belonging to system classes.
-    private static Vector<NativeLibrary> systemNativeLibraries
-        = new Vector<>();
-
-    // Native libraries associated with the class loader.
-    private Vector<NativeLibrary> nativeLibraries = new Vector<>();
-
-    // native libraries being loaded/unloaded.
-    private static Stack<NativeLibrary> nativeLibraryContext = new Stack<>();
-
-    // The paths searched for libraries
-    private static String usr_paths[];
-    private static String sys_paths[];
-
-    private static String[] initializePath(String ldpath) {
-        String ps = File.pathSeparator;
-        int ldlen = ldpath.length();
-        int i, j, n;
-        // Count the separators in the path
-        i = ldpath.indexOf(ps);
-        n = 0;
-        while (i >= 0) {
-            n++;
-            i = ldpath.indexOf(ps, i + 1);
-        }
-
-        // allocate the array of paths - n :'s = n + 1 path elements
-        String[] paths = new String[n + 1];
-
-        // Fill the array with paths from the ldpath
-        n = i = 0;
-        j = ldpath.indexOf(ps);
-        while (j >= 0) {
-            if (j - i > 0) {
-                paths[n++] = ldpath.substring(i, j);
-            } else if (j - i == 0) {
-                paths[n++] = ".";
-            }
-            i = j + 1;
-            j = ldpath.indexOf(ps, i);
-        }
-        paths[n] = ldpath.substring(i, ldlen);
-        return paths;
-    }
-    
-    private static String java_library_path;
-    private static String sun_boot_library_path;
-    
-    static void initializeLibraryPaths(java.util.Properties props)
-    {
-        java_library_path = props.getProperty("java.library.path", "");
-        sun_boot_library_path = props.getProperty("sun.boot.library.path", "");
-    }
-
-    // Invoked in the java.lang.Runtime class to implement load and loadLibrary.
-    static void loadLibrary(Class fromClass, String name,
-                            boolean isAbsolute) {
-        ClassLoader loader =
-            (fromClass == null) ? null : fromClass.getClassLoader();
-        if (sys_paths == null) {
-            usr_paths = initializePath(java_library_path);
-            sys_paths = initializePath(sun_boot_library_path);
-        }
-        if (isAbsolute) {
-            if (loadLibrary0(fromClass, new File(name))) {
-                return;
-            }
-            throw new UnsatisfiedLinkError("Can't load library: " + name);
-        }
-        if (loader != null) {
-            String libfilename = loader.findLibrary(name);
-            if (libfilename != null) {
-                File libfile = new File(libfilename);
-                if (!libfile.isAbsolute()) {
-                    throw new UnsatisfiedLinkError(
-    "ClassLoader.findLibrary failed to return an absolute path: " + libfilename);
-                }
-                if (loadLibrary0(fromClass, libfile)) {
-                    return;
-                }
-                throw new UnsatisfiedLinkError("Can't load " + libfilename);
-            }
-        }
-        for (int i = 0 ; i < sys_paths.length ; i++) {
-            File libfile = new File(sys_paths[i], System.mapLibraryName(name));
-            if (loadLibrary0(fromClass, libfile)) {
-                return;
-            }
-        }
-        if (loader != null) {
-            for (int i = 0 ; i < usr_paths.length ; i++) {
-                File libfile = new File(usr_paths[i],
-                                        System.mapLibraryName(name));
-                if (loadLibrary0(fromClass, libfile)) {
-                    return;
-                }
-            }
-        }
-        // Oops, it failed
-        throw new UnsatisfiedLinkError("no " + name + " in java.library.path");
-    }
-
-    private static boolean loadLibrary0(Class fromClass, final File file) {
-        if (loadLibrary1(fromClass, file)) {
-            return true;
-        }
-        final File libfile = ClassLoaderHelper.mapAlternativeName(file);
-        if (libfile != null && loadLibrary1(fromClass, libfile)) {
-            return true;
-        }
-        return false;
-    }
-
-    private static boolean loadLibrary1(Class fromClass, final File file) {
-        boolean exists = AccessController.doPrivileged(
-            new PrivilegedAction<Object>() {
-                public Object run() {
-                    return file.exists() ? Boolean.TRUE : null;
-                }})
-            != null;
-        if (!exists) {
-            return false;
-        }
-        String name;
-        try {
-            name = file.getCanonicalPath();
-        } catch (IOException e) {
-            return false;
-        }
-        ClassLoader loader =
-            (fromClass == null) ? null : fromClass.getClassLoader();
-        Vector<NativeLibrary> libs =
-            loader != null ? loader.nativeLibraries : systemNativeLibraries;
-        synchronized (libs) {
-            int size = libs.size();
-            for (int i = 0; i < size; i++) {
-                NativeLibrary lib = libs.elementAt(i);
-                if (name.equals(lib.name)) {
-                    return true;
-                }
-            }
-
-            synchronized (loadedLibraryNames) {
-                if (loadedLibraryNames.contains(name)) {
-                    throw new UnsatisfiedLinkError
-                        ("Native Library " +
-                         name +
-                         " already loaded in another classloader");
-                }
-                /* If the library is being loaded (must be by the same thread,
-                 * because Runtime.load and Runtime.loadLibrary are
-                 * synchronous). The reason is can occur is that the JNI_OnLoad
-                 * function can cause another loadLibrary invocation.
-                 *
-                 * Thus we can use a static stack to hold the list of libraries
-                 * we are loading.
-                 *
-                 * If there is a pending load operation for the library, we
-                 * immediately return success; otherwise, we raise
-                 * UnsatisfiedLinkError.
-                 */
-                int n = nativeLibraryContext.size();
-                for (int i = 0; i < n; i++) {
-                    NativeLibrary lib = nativeLibraryContext.elementAt(i);
-                    if (name.equals(lib.name)) {
-                        if (loader == lib.fromClass.getClassLoader()) {
-                            return true;
-                        } else {
-                            throw new UnsatisfiedLinkError
-                                ("Native Library " +
-                                 name +
-                                 " is being loaded in another classloader");
-                        }
-                    }
-                }
-                NativeLibrary lib = new NativeLibrary(fromClass, name);
-                nativeLibraryContext.push(lib);
-                try {
-                    lib.load(name);
-                } finally {
-                    nativeLibraryContext.pop();
-                }
-                if (lib.handle != 0) {
-                    loadedLibraryNames.addElement(name);
-                    libs.addElement(lib);
-                    return true;
-                }
-                return false;
-            }
-        }
-    }
-
-    // Invoked in the VM class linking code.
-    static long findNative(ClassLoader loader, String name) {
-        Vector<NativeLibrary> libs =
-            loader != null ? loader.nativeLibraries : systemNativeLibraries;
-        synchronized (libs) {
-            int size = libs.size();
-            for (int i = 0; i < size; i++) {
-                NativeLibrary lib = libs.elementAt(i);
-                long entry = lib.find(name);
-                if (entry != 0)
-                    return entry;
-            }
-        }
-        return 0;
-    }
-
-
-    // -- Assertion management --
-
-    final Object assertionLock;
-
-    // The default toggle for assertion checking.
-    // @GuardedBy("assertionLock")
-    private boolean defaultAssertionStatus = false;
-
-    // Maps String packageName to Boolean package default assertion status Note
-    // that the default package is placed under a null map key.  If this field
-    // is null then we are delegating assertion status queries to the VM, i.e.,
-    // none of this ClassLoader's assertion status modification methods have
-    // been invoked.
-    // @GuardedBy("assertionLock")
-    private Map<String, Boolean> packageAssertionStatus = null;
-
-    // Maps String fullyQualifiedClassName to Boolean assertionStatus If this
-    // field is null then we are delegating assertion status queries to the VM,
-    // i.e., none of this ClassLoader's assertion status modification methods
-    // have been invoked.
-    // @GuardedBy("assertionLock")
-    Map<String, Boolean> classAssertionStatus = null;
-
-    /**
-     * Sets the default assertion status for this class loader.  This setting
-     * determines whether classes loaded by this class loader and initialized
-     * in the future will have assertions enabled or disabled by default.
-     * This setting may be overridden on a per-package or per-class basis by
-     * invoking {@link #setPackageAssertionStatus(String, boolean)} or {@link
-     * #setClassAssertionStatus(String, boolean)}.  </p>
-     *
-     * @param  enabled
-     *         <tt>true</tt> if classes loaded by this class loader will
-     *         henceforth have assertions enabled by default, <tt>false</tt>
-     *         if they will have assertions disabled by default.
-     *
-     * @since  1.4
-     */
-    public void setDefaultAssertionStatus(boolean enabled) {
-        synchronized (assertionLock) {
-            if (classAssertionStatus == null)
-                initializeJavaAssertionMaps();
-
-            defaultAssertionStatus = enabled;
-        }
-    }
-
-    /**
-     * Sets the package default assertion status for the named package.  The
-     * package default assertion status determines the assertion status for
-     * classes initialized in the future that belong to the named package or
-     * any of its "subpackages".
-     *
-     * <p> A subpackage of a package named p is any package whose name begins
-     * with "<tt>p.</tt>".  For example, <tt>javax.swing.text</tt> is a
-     * subpackage of <tt>javax.swing</tt>, and both <tt>java.util</tt> and
-     * <tt>java.lang.reflect</tt> are subpackages of <tt>java</tt>.
-     *
-     * <p> In the event that multiple package defaults apply to a given class,
-     * the package default pertaining to the most specific package takes
-     * precedence over the others.  For example, if <tt>javax.lang</tt> and
-     * <tt>javax.lang.reflect</tt> both have package defaults associated with
-     * them, the latter package default applies to classes in
-     * <tt>javax.lang.reflect</tt>.
-     *
-     * <p> Package defaults take precedence over the class loader's default
-     * assertion status, and may be overridden on a per-class basis by invoking
-     * {@link #setClassAssertionStatus(String, boolean)}.  </p>
-     *
-     * @param  packageName
-     *         The name of the package whose package default assertion status
-     *         is to be set. A <tt>null</tt> value indicates the unnamed
-     *         package that is "current"
-     *         (see section 7.4.2 of
-     *         <cite>The Java&trade; Language Specification</cite>.)
-     *
-     * @param  enabled
-     *         <tt>true</tt> if classes loaded by this classloader and
-     *         belonging to the named package or any of its subpackages will
-     *         have assertions enabled by default, <tt>false</tt> if they will
-     *         have assertions disabled by default.
-     *
-     * @since  1.4
-     */
-    public void setPackageAssertionStatus(String packageName,
-                                          boolean enabled) {
-        synchronized (assertionLock) {
-            if (packageAssertionStatus == null)
-                initializeJavaAssertionMaps();
-
-            packageAssertionStatus.put(packageName, enabled);
-        }
-    }
-
-    /**
-     * Sets the desired assertion status for the named top-level class in this
-     * class loader and any nested classes contained therein.  This setting
-     * takes precedence over the class loader's default assertion status, and
-     * over any applicable per-package default.  This method has no effect if
-     * the named class has already been initialized.  (Once a class is
-     * initialized, its assertion status cannot change.)
-     *
-     * <p> If the named class is not a top-level class, this invocation will
-     * have no effect on the actual assertion status of any class. </p>
-     *
-     * @param  className
-     *         The fully qualified class name of the top-level class whose
-     *         assertion status is to be set.
-     *
-     * @param  enabled
-     *         <tt>true</tt> if the named class is to have assertions
-     *         enabled when (and if) it is initialized, <tt>false</tt> if the
-     *         class is to have assertions disabled.
-     *
-     * @since  1.4
-     */
-    public void setClassAssertionStatus(String className, boolean enabled) {
-        synchronized (assertionLock) {
-            if (classAssertionStatus == null)
-                initializeJavaAssertionMaps();
-
-            classAssertionStatus.put(className, enabled);
-        }
-    }
-
-    /**
-     * Sets the default assertion status for this class loader to
-     * <tt>false</tt> and discards any package defaults or class assertion
-     * status settings associated with the class loader.  This method is
-     * provided so that class loaders can be made to ignore any command line or
-     * persistent assertion status settings and "start with a clean slate."
-     * </p>
-     *
-     * @since  1.4
-     */
-    public void clearAssertionStatus() {
-        /*
-         * Whether or not "Java assertion maps" are initialized, set
-         * them to empty maps, effectively ignoring any present settings.
-         */
-        synchronized (assertionLock) {
-            classAssertionStatus = new HashMap<>();
-            packageAssertionStatus = new HashMap<>();
-            defaultAssertionStatus = false;
-        }
-    }
-
-    /**
-     * Returns the assertion status that would be assigned to the specified
-     * class if it were to be initialized at the time this method is invoked.
-     * If the named class has had its assertion status set, the most recent
-     * setting will be returned; otherwise, if any package default assertion
-     * status pertains to this class, the most recent setting for the most
-     * specific pertinent package default assertion status is returned;
-     * otherwise, this class loader's default assertion status is returned.
-     * </p>
-     *
-     * @param  className
-     *         The fully qualified class name of the class whose desired
-     *         assertion status is being queried.
-     *
-     * @return  The desired assertion status of the specified class.
-     *
-     * @see  #setClassAssertionStatus(String, boolean)
-     * @see  #setPackageAssertionStatus(String, boolean)
-     * @see  #setDefaultAssertionStatus(boolean)
-     *
-     * @since  1.4
-     */
-    boolean desiredAssertionStatus(String className) {
-        synchronized (assertionLock) {
-            // assert classAssertionStatus   != null;
-            // assert packageAssertionStatus != null;
-
-            // Check for a class entry
-            Boolean result = classAssertionStatus.get(className);
-            if (result != null)
-                return result.booleanValue();
-
-            // Check for most specific package entry
-            int dotIndex = className.lastIndexOf(".");
-            if (dotIndex < 0) { // default package
-                result = packageAssertionStatus.get(null);
-                if (result != null)
-                    return result.booleanValue();
-            }
-            while(dotIndex > 0) {
-                className = className.substring(0, dotIndex);
-                result = packageAssertionStatus.get(className);
-                if (result != null)
-                    return result.booleanValue();
-                dotIndex = className.lastIndexOf(".", dotIndex-1);
-            }
-
-            // Return the classloader default
-            return defaultAssertionStatus;
-        }
-    }
-
-    // Set up the assertions with information provided by the VM.
-    // Note: Should only be called inside a synchronized block
-    private void initializeJavaAssertionMaps() {
-        // assert Thread.holdsLock(assertionLock);
-
-        classAssertionStatus = new HashMap<>();
-        packageAssertionStatus = new HashMap<>();
-        AssertionStatusDirectives directives = retrieveDirectives();
-
-        for(int i = 0; i < directives.classes.length; i++)
-            classAssertionStatus.put(directives.classes[i],
-                                     directives.classEnabled[i]);
-
-        for(int i = 0; i < directives.packages.length; i++)
-            packageAssertionStatus.put(directives.packages[i],
-                                       directives.packageEnabled[i]);
-
-        defaultAssertionStatus = directives.deflt;
-    }
-
-    // Retrieves the assertion directives from the VM.
-    private static native AssertionStatusDirectives retrieveDirectives();
-
-    // [IKVM] equivalent of HotSpot's java_lang_ClassLoader::is_trusted_loader()
-    static boolean isTrustedLoader(ClassLoader loader) {
-        ClassLoader cl = scl;
-        while (cl != null) {
-            if (cl == loader) return true;
-            cl = cl.parent;
-        }
-        return false;
-    }
-}
-
-
-class SystemClassLoaderAction
-    implements PrivilegedExceptionAction<ClassLoader> {
-    private ClassLoader parent;
-
-    SystemClassLoaderAction(ClassLoader parent) {
-        this.parent = parent;
-    }
-
-    public ClassLoader run() throws Exception {
-        String cls = System.getProperty("java.system.class.loader");
-        if (cls == null) {
-            return parent;
-        }
-
-        Constructor ctor = Class.forName(cls, true, parent)
-            .getDeclaredConstructor(new Class[] { ClassLoader.class });
-        ClassLoader sys = (ClassLoader) ctor.newInstance(
-            new Object[] { parent });
-        Thread.currentThread().setContextClassLoader(sys);
-        return sys;
-    }
-}
diff --git a/openjdk/java/lang/ClassLoaderHelper.java b/openjdk/java/lang/ClassLoaderHelper.java
deleted file mode 100644
index c37c47e8..00000000
--- a/openjdk/java/lang/ClassLoaderHelper.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.lang;
-
-import java.io.File;
-
-class ClassLoaderHelper {
-
-    private ClassLoaderHelper() {}
-
-    /**
-     * Returns an alternate path name for the given file
-     * such that if the original pathname did not exist, then the
-     * file may be located at the alternate location.
-     * For mac, this replaces the final .dylib suffix with .jnilib
-     */
-    static File mapAlternativeName(File lib) {
-        if (ikvm.internal.Util.MACOSX) {
-            String name = lib.toString();
-            int index = name.toLowerCase().lastIndexOf(".dylib");
-            if (index < 0) {
-                return null;
-            }
-            return new File(name.substring(0, index) + ".jnilib");
-        } else {
-            return null;
-        }
-    }
-}
diff --git a/openjdk/java/lang/Enum.java b/openjdk/java/lang/Enum.java
deleted file mode 100644
index b29550b4..00000000
--- a/openjdk/java/lang/Enum.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-import java.io.Serializable;
-import java.io.IOException;
-import java.io.InvalidObjectException;
-import java.io.ObjectInputStream;
-import java.io.ObjectStreamException;
-import cli.System.Runtime.Serialization.IObjectReference;
-import cli.System.Runtime.Serialization.SerializationException;
-import cli.System.Runtime.Serialization.SerializationInfo;
-import cli.System.Runtime.Serialization.StreamingContext;
-
-/**
- * This is the common base class of all Java language enumeration types.
- *
- * More information about enums, including descriptions of the
- * implicitly declared methods synthesized by the compiler, can be
- * found in section 8.9 of
- * <cite>The Java&trade; Language Specification</cite>.
- *
- * <p> Note that when using an enumeration type as the type of a set
- * or as the type of the keys in a map, specialized and efficient
- * {@linkplain java.util.EnumSet set} and {@linkplain
- * java.util.EnumMap map} implementations are available.
- *
- * @param <E> The enum type subclass
- * @author  Josh Bloch
- * @author  Neal Gafter
- * @see     Class#getEnumConstants()
- * @see     java.util.EnumSet
- * @see     java.util.EnumMap
- * @since   1.5
- */
-@cli.System.SerializableAttribute.Annotation
-public abstract class Enum<E extends Enum<E>>
-        implements Comparable<E>, Serializable {
-    /**
-     * The name of this enum constant, as declared in the enum declaration.
-     * Most programmers should use the {@link #toString} method rather than
-     * accessing this field.
-     */
-    private final String name;
-
-    /**
-     * Returns the name of this enum constant, exactly as declared in its
-     * enum declaration.
-     *
-     * <b>Most programmers should use the {@link #toString} method in
-     * preference to this one, as the toString method may return
-     * a more user-friendly name.</b>  This method is designed primarily for
-     * use in specialized situations where correctness depends on getting the
-     * exact name, which will not vary from release to release.
-     *
-     * @return the name of this enum constant
-     */
-    public final String name() {
-        return name;
-    }
-
-    /**
-     * The ordinal of this enumeration constant (its position
-     * in the enum declaration, where the initial constant is assigned
-     * an ordinal of zero).
-     *
-     * Most programmers will have no use for this field.  It is designed
-     * for use by sophisticated enum-based data structures, such as
-     * {@link java.util.EnumSet} and {@link java.util.EnumMap}.
-     */
-    private final int ordinal;
-
-    /**
-     * Returns the ordinal of this enumeration constant (its position
-     * in its enum declaration, where the initial constant is assigned
-     * an ordinal of zero).
-     *
-     * Most programmers will have no use for this method.  It is
-     * designed for use by sophisticated enum-based data structures, such
-     * as {@link java.util.EnumSet} and {@link java.util.EnumMap}.
-     *
-     * @return the ordinal of this enumeration constant
-     */
-    public final int ordinal() {
-        return ordinal;
-    }
-
-    /**
-     * Sole constructor.  Programmers cannot invoke this constructor.
-     * It is for use by code emitted by the compiler in response to
-     * enum type declarations.
-     *
-     * @param name - The name of this enum constant, which is the identifier
-     *               used to declare it.
-     * @param ordinal - The ordinal of this enumeration constant (its position
-     *         in the enum declaration, where the initial constant is assigned
-     *         an ordinal of zero).
-     */
-    protected Enum(String name, int ordinal) {
-        this.name = name;
-        this.ordinal = ordinal;
-    }
-
-    /**
-     * Returns the name of this enum constant, as contained in the
-     * declaration.  This method may be overridden, though it typically
-     * isn't necessary or desirable.  An enum type should override this
-     * method when a more "programmer-friendly" string form exists.
-     *
-     * @return the name of this enum constant
-     */
-    public String toString() {
-        return name;
-    }
-
-    /**
-     * Returns true if the specified object is equal to this
-     * enum constant.
-     *
-     * @param other the object to be compared for equality with this object.
-     * @return  true if the specified object is equal to this
-     *          enum constant.
-     */
-    public final boolean equals(Object other) {
-        return this==other;
-    }
-
-    /**
-     * Returns a hash code for this enum constant.
-     *
-     * @return a hash code for this enum constant.
-     */
-    public final int hashCode() {
-        return super.hashCode();
-    }
-
-    /**
-     * Throws CloneNotSupportedException.  This guarantees that enums
-     * are never cloned, which is necessary to preserve their "singleton"
-     * status.
-     *
-     * @return (never returns)
-     */
-    protected final Object clone() throws CloneNotSupportedException {
-        throw new CloneNotSupportedException();
-    }
-
-    /**
-     * Compares this enum with the specified object for order.  Returns a
-     * negative integer, zero, or a positive integer as this object is less
-     * than, equal to, or greater than the specified object.
-     *
-     * Enum constants are only comparable to other enum constants of the
-     * same enum type.  The natural order implemented by this
-     * method is the order in which the constants are declared.
-     */
-    public final int compareTo(E o) {
-        Enum other = (Enum)o;
-        Enum self = this;
-        if (self.getClass() != other.getClass() && // optimization
-            self.getDeclaringClass() != other.getDeclaringClass())
-            throw new ClassCastException();
-        return self.ordinal - other.ordinal;
-    }
-
-    /**
-     * Returns the Class object corresponding to this enum constant's
-     * enum type.  Two enum constants e1 and  e2 are of the
-     * same enum type if and only if
-     *   e1.getDeclaringClass() == e2.getDeclaringClass().
-     * (The value returned by this method may differ from the one returned
-     * by the {@link Object#getClass} method for enum constants with
-     * constant-specific class bodies.)
-     *
-     * @return the Class object corresponding to this enum constant's
-     *     enum type
-     */
-    public final Class<E> getDeclaringClass() {
-        Class clazz = getClass();
-        Class zuper = clazz.getSuperclass();
-        return (zuper == Enum.class) ? clazz : zuper;
-    }
-
-    /**
-     * Returns the enum constant of the specified enum type with the
-     * specified name.  The name must match exactly an identifier used
-     * to declare an enum constant in this type.  (Extraneous whitespace
-     * characters are not permitted.)
-     *
-     * <p>Note that for a particular enum type {@code T}, the
-     * implicitly declared {@code public static T valueOf(String)}
-     * method on that enum may be used instead of this method to map
-     * from a name to the corresponding enum constant.  All the
-     * constants of an enum type can be obtained by calling the
-     * implicit {@code public static T[] values()} method of that
-     * type.
-     *
-     * @param <T> The enum type whose constant is to be returned
-     * @param enumType the {@code Class} object of the enum type from which
-     *      to return a constant
-     * @param name the name of the constant to return
-     * @return the enum constant of the specified enum type with the
-     *      specified name
-     * @throws IllegalArgumentException if the specified enum type has
-     *         no constant with the specified name, or the specified
-     *         class object does not represent an enum type
-     * @throws NullPointerException if {@code enumType} or {@code name}
-     *         is null
-     * @since 1.5
-     */
-    public static <T extends Enum<T>> T valueOf(Class<T> enumType,
-                                                String name) {
-        T result = enumType.enumConstantDirectory().get(name);
-        if (result != null)
-            return result;
-        if (name == null)
-            throw new NullPointerException("Name is null");
-        throw new IllegalArgumentException(
-            "No enum constant " + enumType.getCanonicalName() + "." + name);
-    }
-
-    /**
-     * enum classes cannot have finalize methods.
-     */
-    protected final void finalize() { }
-
-    /**
-     * prevent default deserialization
-     */
-    private void readObject(ObjectInputStream in) throws IOException,
-        ClassNotFoundException {
-        throw new InvalidObjectException("can't deserialize enum");
-    }
-
-    private void readObjectNoData() throws ObjectStreamException {
-        throw new InvalidObjectException("can't deserialize enum");
-    }
-    
-    // [IKVM] .NET serialization support starts here
-    // Note that we don't have a security demand, because the info is harmless.
-    @cli.IKVM.Attributes.HideFromJavaAttribute.Annotation
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    public final void GetObjectData(SerializationInfo info, StreamingContext context)
-    {
-        info.AddValue("enumType", getDeclaringClass());
-        info.AddValue("name", name);
-        info.SetType(ikvm.runtime.Util.getInstanceTypeFromClass(EnumSerializationProxy.class));
-    }
-}
-
-@cli.System.SerializableAttribute.Annotation
-final class EnumSerializationProxy implements IObjectReference
-{
-    private Class enumType;
-    private String name;
-    
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    public Object GetRealObject(StreamingContext context)
-    {
-        try
-        {
-            return Enum.valueOf(enumType, name);
-        }
-        catch (IllegalArgumentException x)
-        {
-            ikvm.runtime.Util.throwException(new SerializationException("Enum value " + name + " not found in " + enumType, x));
-            return null;
-        }
-    }
-}
diff --git a/openjdk/java/lang/LangHelper.java b/openjdk/java/lang/LangHelper.java
deleted file mode 100644
index 8d725d43..00000000
--- a/openjdk/java/lang/LangHelper.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-  Copyright (C) 2007-2014 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-
-package java.lang;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Executable;
-import java.security.AccessControlContext;
-import java.util.Map;
-import sun.nio.ch.Interruptible;
-import sun.reflect.annotation.AnnotationType;
-
-@ikvm.lang.Internal
-public class LangHelper
-{
-    public static sun.misc.JavaLangAccess getJavaLangAccess()
-    {
-        return new sun.misc.JavaLangAccess() {
-            public sun.reflect.ConstantPool getConstantPool(Class klass) {
-                return klass.getConstantPool();
-            }
-            public boolean casAnnotationType(Class<?> klass, AnnotationType oldType, AnnotationType newType) {
-                return klass.casAnnotationType(oldType, newType);
-            }
-            public AnnotationType getAnnotationType(Class klass) {
-                return klass.getAnnotationType();
-            }
-            public Map<Class<? extends Annotation>, Annotation> getDeclaredAnnotationMap(Class<?> klass) {
-                return klass.getDeclaredAnnotationMap();
-            }
-            public byte[] getRawClassAnnotations(Class<?> klass) {
-                throw new InternalError();
-            }
-            public byte[] getRawClassTypeAnnotations(Class<?> klass) {
-                return klass.getRawTypeAnnotations();
-            }
-            public byte[] getRawExecutableTypeAnnotations(Executable executable) {
-                return Class.getExecutableTypeAnnotationBytes(executable);
-            }
-            public <E extends Enum<E>>
-                    E[] getEnumConstantsShared(Class<E> klass) {
-                return klass.getEnumConstantsShared();
-            }
-            public void blockedOn(Thread t, Interruptible b) {
-                t.blockedOn(b);
-            }
-            public void registerShutdownHook(int slot, boolean registerShutdownInProgress, Runnable hook) {
-                Shutdown.add(slot, registerShutdownInProgress, hook);
-            }
-            public int getStackTraceDepth(Throwable t) {
-                return t.getStackTraceDepth();
-            }
-            public StackTraceElement getStackTraceElement(Throwable t, int i) {
-                return t.getStackTraceElement(i);
-            }
-            public String newStringUnsafe(char[] chars) {
-                return String.valueOf(chars);
-            }
-            public Thread newThreadWithAcc(Runnable target, AccessControlContext acc) {
-                return new Thread(target, acc);
-            }
-            public void invokeFinalize(Object o) throws Throwable {
-                // we don't actually support invoking the finalize method explicitly
-            }
-        };
-    }
-}
diff --git a/openjdk/java/lang/Package.java b/openjdk/java/lang/Package.java
deleted file mode 100644
index 395cf336..00000000
--- a/openjdk/java/lang/Package.java
+++ /dev/null
@@ -1,615 +0,0 @@
-/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-import java.io.InputStream;
-import java.util.Enumeration;
-
-import java.util.StringTokenizer;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.URL;
-import java.net.MalformedURLException;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import java.util.jar.JarInputStream;
-import java.util.jar.Manifest;
-import java.util.jar.Attributes;
-import java.util.jar.Attributes.Name;
-import java.util.jar.JarException;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import java.lang.annotation.Annotation;
-import sun.net.www.ParseUtil;
-import sun.reflect.CallerSensitive;
-import sun.reflect.Reflection;
-
-/**
- * {@code Package} objects contain version information
- * about the implementation and specification of a Java package.
- * This versioning information is retrieved and made available
- * by the {@link ClassLoader} instance that
- * loaded the class(es).  Typically, it is stored in the manifest that is
- * distributed with the classes.
- *
- * <p>The set of classes that make up the package may implement a
- * particular specification and if so the specification title, version number,
- * and vendor strings identify that specification.
- * An application can ask if the package is
- * compatible with a particular version, see the {@link
- * #isCompatibleWith isCompatibleWith}
- * method for details.
- *
- * <p>Specification version numbers use a syntax that consists of nonnegative
- * decimal integers separated by periods ".", for example "2.0" or
- * "1.2.3.4.5.6.7".  This allows an extensible number to be used to represent
- * major, minor, micro, etc. versions.  The version specification is described
- * by the following formal grammar:
- * <blockquote>
- * <dl>
- * <dt><i>SpecificationVersion:
- * <dd>Digits RefinedVersion<sub>opt</sub></i>
-
- * <p><dt><i>RefinedVersion:</i>
- * <dd>{@code .} <i>Digits</i>
- * <dd>{@code .} <i>Digits RefinedVersion</i>
- *
- * <p><dt><i>Digits:
- * <dd>Digit
- * <dd>Digits</i>
- *
- * <p><dt><i>Digit:</i>
- * <dd>any character for which {@link Character#isDigit} returns {@code true},
- * e.g. 0, 1, 2, ...
- * </dl>
- * </blockquote>
- *
- * <p>The implementation title, version, and vendor strings identify an
- * implementation and are made available conveniently to enable accurate
- * reporting of the packages involved when a problem occurs. The contents
- * all three implementation strings are vendor specific. The
- * implementation version strings have no specified syntax and should
- * only be compared for equality with desired version identifiers.
- *
- * <p>Within each {@code ClassLoader} instance all classes from the same
- * java package have the same Package object.  The static methods allow a package
- * to be found by name or the set of all packages known to the current class
- * loader to be found.
- *
- * @see ClassLoader#definePackage
- */
-public class Package implements java.lang.reflect.AnnotatedElement {
-    /**
-     * Return the name of this package.
-     *
-     * @return  The fully-qualified name of this package as defined in section 6.5.3 of
-     *          <cite>The Java&trade; Language Specification</cite>,
-     *          for example, {@code java.lang}
-     */
-    public String getName() {
-        return pkgName;
-    }
-
-
-    /**
-     * Return the title of the specification that this package implements.
-     * @return the specification title, null is returned if it is not known.
-     */
-    public String getSpecificationTitle() {
-        return specTitle;
-    }
-
-    /**
-     * Returns the version number of the specification
-     * that this package implements.
-     * This version string must be a sequence of nonnegative decimal
-     * integers separated by "."'s and may have leading zeros.
-     * When version strings are compared the most significant
-     * numbers are compared.
-     * @return the specification version, null is returned if it is not known.
-     */
-    public String getSpecificationVersion() {
-        return specVersion;
-    }
-
-    /**
-     * Return the name of the organization, vendor,
-     * or company that owns and maintains the specification
-     * of the classes that implement this package.
-     * @return the specification vendor, null is returned if it is not known.
-     */
-    public String getSpecificationVendor() {
-        return specVendor;
-    }
-
-    /**
-     * Return the title of this package.
-     * @return the title of the implementation, null is returned if it is not known.
-     */
-    public String getImplementationTitle() {
-        return implTitle;
-    }
-
-    /**
-     * Return the version of this implementation. It consists of any string
-     * assigned by the vendor of this implementation and does
-     * not have any particular syntax specified or expected by the Java
-     * runtime. It may be compared for equality with other
-     * package version strings used for this implementation
-     * by this vendor for this package.
-     * @return the version of the implementation, null is returned if it is not known.
-     */
-    public String getImplementationVersion() {
-        return implVersion;
-    }
-
-    /**
-     * Returns the name of the organization,
-     * vendor or company that provided this implementation.
-     * @return the vendor that implemented this package..
-     */
-    public String getImplementationVendor() {
-        return implVendor;
-    }
-
-    /**
-     * Returns true if this package is sealed.
-     *
-     * @return true if the package is sealed, false otherwise
-     */
-    public boolean isSealed() {
-        return sealBase != null;
-    }
-
-    /**
-     * Returns true if this package is sealed with respect to the specified
-     * code source url.
-     *
-     * @param url the code source url
-     * @return true if this package is sealed with respect to url
-     */
-    public boolean isSealed(URL url) {
-        return url.equals(sealBase);
-    }
-
-    /**
-     * Compare this package's specification version with a
-     * desired version. It returns true if
-     * this packages specification version number is greater than or equal
-     * to the desired version number. <p>
-     *
-     * Version numbers are compared by sequentially comparing corresponding
-     * components of the desired and specification strings.
-     * Each component is converted as a decimal integer and the values
-     * compared.
-     * If the specification value is greater than the desired
-     * value true is returned. If the value is less false is returned.
-     * If the values are equal the period is skipped and the next pair of
-     * components is compared.
-     *
-     * @param desired the version string of the desired version.
-     * @return true if this package's version number is greater
-     *          than or equal to the desired version number
-     *
-     * @exception NumberFormatException if the desired or current version
-     *          is not of the correct dotted form.
-     */
-    public boolean isCompatibleWith(String desired)
-        throws NumberFormatException
-    {
-        if (specVersion == null || specVersion.length() < 1) {
-            throw new NumberFormatException("Empty version string");
-        }
-
-        String [] sa = specVersion.split("\\.", -1);
-        int [] si = new int[sa.length];
-        for (int i = 0; i < sa.length; i++) {
-            si[i] = Integer.parseInt(sa[i]);
-            if (si[i] < 0)
-                throw NumberFormatException.forInputString("" + si[i]);
-        }
-
-        String [] da = desired.split("\\.", -1);
-        int [] di = new int[da.length];
-        for (int i = 0; i < da.length; i++) {
-            di[i] = Integer.parseInt(da[i]);
-            if (di[i] < 0)
-                throw NumberFormatException.forInputString("" + di[i]);
-        }
-
-        int len = Math.max(di.length, si.length);
-        for (int i = 0; i < len; i++) {
-            int d = (i < di.length ? di[i] : 0);
-            int s = (i < si.length ? si[i] : 0);
-            if (s < d)
-                return false;
-            if (s > d)
-                return true;
-        }
-        return true;
-    }
-
-    /**
-     * Find a package by name in the callers {@code ClassLoader} instance.
-     * The callers {@code ClassLoader} instance is used to find the package
-     * instance corresponding to the named class. If the callers
-     * {@code ClassLoader} instance is null then the set of packages loaded
-     * by the system {@code ClassLoader} instance is searched to find the
-     * named package. <p>
-     *
-     * Packages have attributes for versions and specifications only if the class
-     * loader created the package instance with the appropriate attributes. Typically,
-     * those attributes are defined in the manifests that accompany the classes.
-     *
-     * @param name a package name, for example, java.lang.
-     * @return the package of the requested name. It may be null if no package
-     *          information is available from the archive or codebase.
-     */
-    @CallerSensitive
-    public static Package getPackage(String name) {
-        ClassLoader l = ClassLoader.getClassLoader(Reflection.getCallerClass());
-        if (l != null) {
-            return l.getPackage(name);
-        } else {
-            return getSystemPackage(name);
-        }
-    }
-
-    /**
-     * Get all the packages currently known for the caller's {@code ClassLoader}
-     * instance.  Those packages correspond to classes loaded via or accessible by
-     * name to that {@code ClassLoader} instance.  If the caller's
-     * {@code ClassLoader} instance is the bootstrap {@code ClassLoader}
-     * instance, which may be represented by {@code null} in some implementations,
-     * only packages corresponding to classes loaded by the bootstrap
-     * {@code ClassLoader} instance will be returned.
-     *
-     * @return a new array of packages known to the callers {@code ClassLoader}
-     * instance.  An zero length array is returned if none are known.
-     */
-    @CallerSensitive
-    public static Package[] getPackages() {
-        ClassLoader l = ClassLoader.getClassLoader(Reflection.getCallerClass());
-        if (l != null) {
-            return l.getPackages();
-        } else {
-            return getSystemPackages();
-        }
-    }
-
-    /**
-     * Get the package for the specified class.
-     * The class's class loader is used to find the package instance
-     * corresponding to the specified class. If the class loader
-     * is the bootstrap class loader, which may be represented by
-     * {@code null} in some implementations, then the set of packages
-     * loaded by the bootstrap class loader is searched to find the package.
-     * <p>
-     * Packages have attributes for versions and specifications only
-     * if the class loader created the package
-     * instance with the appropriate attributes. Typically those
-     * attributes are defined in the manifests that accompany
-     * the classes.
-     *
-     * @param class the class to get the package of.
-     * @return the package of the class. It may be null if no package
-     *          information is available from the archive or codebase.  */
-    static Package getPackage(Class<?> c) {
-        String name = c.getName();
-        int i = name.lastIndexOf('.');
-        if (i != -1) {
-            name = name.substring(0, i);
-            ClassLoader cl = c.getClassLoader();
-            if (cl != null) {
-                return cl.getPackage(name);
-            } else {
-                return getSystemPackage(name);
-            }
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Return the hash code computed from the package name.
-     * @return the hash code computed from the package name.
-     */
-    public int hashCode(){
-        return pkgName.hashCode();
-    }
-
-    /**
-     * Returns the string representation of this Package.
-     * Its value is the string "package " and the package name.
-     * If the package title is defined it is appended.
-     * If the package version is defined it is appended.
-     * @return the string representation of the package.
-     */
-    public String toString() {
-        String spec = specTitle;
-        String ver =  specVersion;
-        if (spec != null && spec.length() > 0)
-            spec = ", " + spec;
-        else
-            spec = "";
-        if (ver != null && ver.length() > 0)
-            ver = ", version " + ver;
-        else
-            ver = "";
-        return "package " + pkgName + spec + ver;
-    }
-
-    private Class<?> getPackageInfo() {
-        if (packageInfo == null) {
-            try {
-                packageInfo = Class.forName(pkgName + ".package-info", false, loader);
-            } catch (ClassNotFoundException ex) {
-                // store a proxy for the package info that has no annotations
-                class PackageInfoProxy {}
-                packageInfo = PackageInfoProxy.class;
-            }
-        }
-        return packageInfo;
-    }
-
-    /**
-     * @throws NullPointerException {@inheritDoc}
-     * @since 1.5
-     */
-    public <A extends Annotation> A getAnnotation(Class<A> annotationClass) {
-        return getPackageInfo().getAnnotation(annotationClass);
-    }
-
-    /**
-     * @throws NullPointerException {@inheritDoc}
-     * @since 1.5
-     */
-    public boolean isAnnotationPresent(
-        Class<? extends Annotation> annotationClass) {
-        return getPackageInfo().isAnnotationPresent(annotationClass);
-    }
-
-    /**
-     * @since 1.5
-     */
-    public Annotation[] getAnnotations() {
-        return getPackageInfo().getAnnotations();
-    }
-
-    /**
-     * @since 1.5
-     */
-    public Annotation[] getDeclaredAnnotations()  {
-        return getPackageInfo().getDeclaredAnnotations();
-    }
-
-    /**
-     * Construct a package instance with the specified version
-     * information.
-     * @param pkgName the name of the package
-     * @param spectitle the title of the specification
-     * @param specversion the version of the specification
-     * @param specvendor the organization that maintains the specification
-     * @param impltitle the title of the implementation
-     * @param implversion the version of the implementation
-     * @param implvendor the organization that maintains the implementation
-     * @return a new package for containing the specified information.
-     */
-    Package(String name,
-            String spectitle, String specversion, String specvendor,
-            String impltitle, String implversion, String implvendor,
-            URL sealbase, ClassLoader loader)
-    {
-        pkgName = name;
-        implTitle = impltitle;
-        implVersion = implversion;
-        implVendor = implvendor;
-        specTitle = spectitle;
-        specVersion = specversion;
-        specVendor = specvendor;
-        sealBase = sealbase;
-        this.loader = loader;
-    }
-
-    /*
-     * Construct a package using the attributes from the specified manifest.
-     *
-     * @param name the package name
-     * @param man the optional manifest for the package
-     * @param url the optional code source url for the package
-     */
-    private Package(String name, Manifest man, URL url, ClassLoader loader) {
-        String path = name.replace('.', '/').concat("/");
-        String sealed = null;
-        String specTitle= null;
-        String specVersion= null;
-        String specVendor= null;
-        String implTitle= null;
-        String implVersion= null;
-        String implVendor= null;
-        URL sealBase= null;
-        Attributes attr = man.getAttributes(path);
-        if (attr != null) {
-            specTitle   = attr.getValue(Name.SPECIFICATION_TITLE);
-            specVersion = attr.getValue(Name.SPECIFICATION_VERSION);
-            specVendor  = attr.getValue(Name.SPECIFICATION_VENDOR);
-            implTitle   = attr.getValue(Name.IMPLEMENTATION_TITLE);
-            implVersion = attr.getValue(Name.IMPLEMENTATION_VERSION);
-            implVendor  = attr.getValue(Name.IMPLEMENTATION_VENDOR);
-            sealed      = attr.getValue(Name.SEALED);
-        }
-        attr = man.getMainAttributes();
-        if (attr != null) {
-            if (specTitle == null) {
-                specTitle = attr.getValue(Name.SPECIFICATION_TITLE);
-            }
-            if (specVersion == null) {
-                specVersion = attr.getValue(Name.SPECIFICATION_VERSION);
-            }
-            if (specVendor == null) {
-                specVendor = attr.getValue(Name.SPECIFICATION_VENDOR);
-            }
-            if (implTitle == null) {
-                implTitle = attr.getValue(Name.IMPLEMENTATION_TITLE);
-            }
-            if (implVersion == null) {
-                implVersion = attr.getValue(Name.IMPLEMENTATION_VERSION);
-            }
-            if (implVendor == null) {
-                implVendor = attr.getValue(Name.IMPLEMENTATION_VENDOR);
-            }
-            if (sealed == null) {
-                sealed = attr.getValue(Name.SEALED);
-            }
-        }
-        if ("true".equalsIgnoreCase(sealed)) {
-            sealBase = url;
-        }
-        pkgName = name;
-        this.specTitle = specTitle;
-        this.specVersion = specVersion;
-        this.specVendor = specVendor;
-        this.implTitle = implTitle;
-        this.implVersion = implVersion;
-        this.implVendor = implVendor;
-        this.sealBase = sealBase;
-        this.loader = loader;
-    }
-
-    /*
-     * Returns the loaded system package for the specified name.
-     */
-    static Package getSystemPackage(String name) {
-        synchronized (pkgs) {
-            Package pkg = pkgs.get(name);
-            if (pkg == null) {
-                name = name.replace('.', '/').concat("/");
-                String fn = getSystemPackage0(name);
-                if (fn != null) {
-                    pkg = defineSystemPackage(name, fn);
-                }
-            }
-            return pkg;
-        }
-    }
-
-    /*
-     * Return an array of loaded system packages.
-     */
-    static Package[] getSystemPackages() {
-        // First, update the system package map with new package names
-        String[] names = getSystemPackages0();
-        synchronized (pkgs) {
-            for (int i = 0; i < names.length; i++) {
-                defineSystemPackage(names[i], getSystemPackage0(names[i]));
-            }
-            return pkgs.values().toArray(new Package[pkgs.size()]);
-        }
-    }
-
-    private static Package defineSystemPackage(final String iname,
-                                               final String fn)
-    {
-        return AccessController.doPrivileged(new PrivilegedAction<Package>() {
-            public Package run() {
-                String name = iname;
-                // Get the cached code source url for the file name
-                URL url = urls.get(fn);
-                if (url == null) {
-                    // URL not found, so create one
-                    File file = new File(fn);
-                    try {
-                        url = ParseUtil.fileToEncodedURL(file);
-                    } catch (MalformedURLException e) {
-                    }
-                    if (url != null) {
-                        urls.put(fn, url);
-                        // If loading a JAR file, then also cache the manifest
-                        if (file.isFile()) {
-                            mans.put(fn, loadManifest(fn));
-                        }
-                    }
-                }
-                // Convert to "."-separated package name
-                name = name.substring(0, name.length() - 1).replace('/', '.');
-                Package pkg;
-                Manifest man = mans.get(fn);
-                if (man != null) {
-                    pkg = new Package(name, man, url, null);
-                } else {
-                    pkg = new Package(name, null, null, null,
-                                      null, null, null, null, null);
-                }
-                pkgs.put(name, pkg);
-                return pkg;
-            }
-        });
-    }
-
-    /*
-     * Returns the Manifest for the specified JAR file name.
-     */
-    private static Manifest loadManifest(String fn) {
-        try (FileInputStream fis = new FileInputStream(fn);
-             JarInputStream jis = new JarInputStream(fis, false))
-        {
-            return jis.getManifest();
-        } catch (IOException e) {
-            return null;
-        }
-    }
-
-    // The map of loaded system packages
-    private static Map<String, Package> pkgs = new HashMap<>(31);
-
-    // Maps each directory or zip file name to its corresponding url
-    private static Map<String, URL> urls = new HashMap<>(10);
-
-    // Maps each code source url for a jar file to its manifest
-    private static Map<String, Manifest> mans = new HashMap<>(10);
-
-    private static native String getSystemPackage0(String name);
-    private static native String[] getSystemPackages0();
-
-    /*
-     * Private storage for the package name and attributes.
-     */
-    private final String pkgName;
-    private final String specTitle;
-    private final String specVersion;
-    private final String specVendor;
-    private final String implTitle;
-    private final String implVersion;
-    private final String implVendor;
-    private final URL sealBase;
-    private transient final ClassLoader loader;
-    private transient Class packageInfo;
-}
diff --git a/openjdk/java/lang/ProcessImpl.java b/openjdk/java/lang/ProcessImpl.java
deleted file mode 100644
index 0624dc17..00000000
--- a/openjdk/java/lang/ProcessImpl.java
+++ /dev/null
@@ -1,834 +0,0 @@
-/*
- * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*IKVM*/
-/*
- * Modified for IKVM by Jeroen Frijters
- */
-
-package java.lang;
-
-import java.io.IOException;
-import java.io.File;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileDescriptor;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.lang.ProcessBuilder.Redirect;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.concurrent.TimeUnit;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import cli.System.AsyncCallback;
-import cli.System.IAsyncResult;
-import cli.System.Diagnostics.ProcessStartInfo;
-import cli.System.EventArgs;
-import cli.System.EventHandler;
-import cli.System.IO.FileAccess;
-import cli.System.IO.FileShare;
-import cli.System.IO.FileMode;
-import cli.System.IO.FileOptions;
-import cli.System.IO.FileStream;
-import cli.System.IO.Stream;
-import cli.System.Security.AccessControl.FileSystemRights;
-
-/* This class is for the exclusive use of ProcessBuilder.start() to
- * create new processes.
- *
- * @author Martin Buchholz
- * @since   1.5
- */
-
-final class ProcessImpl extends Process {
-    static class fdAccess {
-        static Stream getHandle(FileDescriptor fd) {
-            return fd.getStream();
-        }
-    }
-
-    /**
-     * Open a file for writing. If {@code append} is {@code true} then the file
-     * is opened for atomic append directly and a FileOutputStream constructed
-     * with the resulting handle. This is because a FileOutputStream created
-     * to append to a file does not open the file in a manner that guarantees
-     * that writes by the child process will be atomic.
-     */
-    private static FileOutputStream newFileOutputStream(File f, boolean append)
-        throws IOException
-    {
-        if (append) {
-            String path = f.getPath();
-            SecurityManager sm = System.getSecurityManager();
-            if (sm != null)
-                sm.checkWrite(path);
-            final FileDescriptor fd = openForAtomicAppend(path);
-            return AccessController.doPrivileged(
-                new PrivilegedAction<FileOutputStream>() {
-                    public FileOutputStream run() {
-                        return new FileOutputStream(fd);
-                    }
-                }
-            );
-        } else {
-            return new FileOutputStream(f);
-        }
-    }
-
-    // System-dependent portion of ProcessBuilder.start()
-    static Process start(String cmdarray[],
-                         java.util.Map<String,String> environment,
-                         String dir,
-                         ProcessBuilder.Redirect[] redirects,
-                         boolean redirectErrorStream)
-        throws IOException
-    {
-        FileInputStream  f0 = null;
-        FileOutputStream f1 = null;
-        FileOutputStream f2 = null;
-
-        try {
-            Stream[] stdHandles;
-            if (redirects == null) {
-                stdHandles = new Stream[3];
-            } else {
-                stdHandles = new Stream[3];
-
-                if (redirects[0] == Redirect.PIPE)
-                    stdHandles[0] = null;
-                else if (redirects[0] == Redirect.INHERIT)
-                    stdHandles[0] = fdAccess.getHandle(FileDescriptor.in);
-                else {
-                    f0 = new FileInputStream(redirects[0].file());
-                    stdHandles[0] = fdAccess.getHandle(f0.getFD());
-                }
-
-                if (redirects[1] == Redirect.PIPE)
-                    stdHandles[1] = null;
-                else if (redirects[1] == Redirect.INHERIT)
-                    stdHandles[1] = fdAccess.getHandle(FileDescriptor.out);
-                else {
-                    f1 = newFileOutputStream(redirects[1].file(),
-                                             redirects[1].append());
-                    stdHandles[1] = fdAccess.getHandle(f1.getFD());
-                }
-
-                if (redirects[2] == Redirect.PIPE)
-                    stdHandles[2] = null;
-                else if (redirects[2] == Redirect.INHERIT)
-                    stdHandles[2] = fdAccess.getHandle(FileDescriptor.err);
-                else {
-                    f2 = newFileOutputStream(redirects[2].file(),
-                                             redirects[2].append());
-                    stdHandles[2] = fdAccess.getHandle(f2.getFD());
-                }
-            }
-
-            return new ProcessImpl(cmdarray, environment, dir,
-                                   stdHandles, redirectErrorStream);
-        } catch (Throwable t) {
-            if (f0 != null)
-                f0.close();
-            if (f1 != null)
-                f1.close();
-            if (f2 != null)
-                f2.close();
-            throw t;
-        } finally {
-            // HACK prevent the File[In|Out]putStream objects from closing the streams
-            // (the System.IO.FileStream will eventually be closed explicitly or by its finalizer)
-            if (f0 != null)
-                cli.System.GC.SuppressFinalize(f0);
-            if (f1 != null)
-                cli.System.GC.SuppressFinalize(f1);
-            if (f2 != null)
-                cli.System.GC.SuppressFinalize(f2);
-        }
-
-    }
-
-    private static class LazyPattern {
-        // Escape-support version:
-        //    "(\")((?:\\\\\\1|.)+?)\\1|([^\\s\"]+)";
-        private static final Pattern PATTERN =
-            Pattern.compile("[^\\s\"]+|\"[^\"]*\"");
-    };
-
-    /* Parses the command string parameter into the executable name and
-     * program arguments.
-     *
-     * The command string is broken into tokens. The token separator is a space
-     * or quota character. The space inside quotation is not a token separator.
-     * There are no escape sequences.
-     */
-    private static String[] getTokensFromCommand(String command) {
-        ArrayList<String> matchList = new ArrayList<>(8);
-        Matcher regexMatcher = LazyPattern.PATTERN.matcher(command);
-        while (regexMatcher.find())
-            matchList.add(regexMatcher.group());
-        return matchList.toArray(new String[matchList.size()]);
-    }
-
-    private static final int VERIFICATION_CMD_BAT = 0;
-    private static final int VERIFICATION_WIN32 = 1;
-    private static final int VERIFICATION_LEGACY = 2;
-    private static final char ESCAPE_VERIFICATION[][] = {
-        // We guarantee the only command file execution for implicit [cmd.exe] run.
-        //    http://technet.microsoft.com/en-us/library/bb490954.aspx
-        {' ', '\t', '<', '>', '&', '|', '^'},
-
-        {' ', '\t', '<', '>'},
-        {' ', '\t'}
-    };
-
-    private static String createCommandLine(int verificationType,
-                                     final String executablePath,
-                                     final String cmd[])
-    {
-        StringBuilder cmdbuf = new StringBuilder(80);
-
-        cmdbuf.append(executablePath);
-
-        for (int i = 1; i < cmd.length; ++i) {
-            cmdbuf.append(' ');
-            String s = cmd[i];
-            if (needsEscaping(verificationType, s)) {
-                cmdbuf.append('"').append(s);
-
-                // The code protects the [java.exe] and console command line
-                // parser, that interprets the [\"] combination as an escape
-                // sequence for the ["] char.
-                //     http://msdn.microsoft.com/en-us/library/17w5ykft.aspx
-                //
-                // If the argument is an FS path, doubling of the tail [\]
-                // char is not a problem for non-console applications.
-                //
-                // The [\"] sequence is not an escape sequence for the [cmd.exe]
-                // command line parser. The case of the [""] tail escape
-                // sequence could not be realized due to the argument validation
-                // procedure.
-                if ((verificationType != VERIFICATION_CMD_BAT) && s.endsWith("\\")) {
-                    cmdbuf.append('\\');
-                }
-                cmdbuf.append('"');
-            } else {
-                cmdbuf.append(s);
-            }
-        }
-        return cmdbuf.toString();
-    }
-
-    private static boolean isQuoted(boolean noQuotesInside, String arg,
-            String errorMessage) {
-        int lastPos = arg.length() - 1;
-        if (lastPos >=1 && arg.charAt(0) == '"' && arg.charAt(lastPos) == '"') {
-            // The argument has already been quoted.
-            if (noQuotesInside) {
-                if (arg.indexOf('"', 1) != lastPos) {
-                    // There is ["] inside.
-                    throw new IllegalArgumentException(errorMessage);
-                }
-            }
-            return true;
-        }
-        if (noQuotesInside) {
-            if (arg.indexOf('"') >= 0) {
-                // There is ["] inside.
-                throw new IllegalArgumentException(errorMessage);
-            }
-        }
-        return false;
-    }
-
-    private static boolean needsEscaping(int verificationType, String arg) {
-        // Switch off MS heuristic for internal ["].
-        // Please, use the explicit [cmd.exe] call
-        // if you need the internal ["].
-        //    Example: "cmd.exe", "/C", "Extended_MS_Syntax"
-
-        // For [.exe] or [.com] file the unpaired/internal ["]
-        // in the argument is not a problem.
-        boolean argIsQuoted = isQuoted(
-            (verificationType == VERIFICATION_CMD_BAT),
-            arg, "Argument has embedded quote, use the explicit CMD.EXE call.");
-
-        if (!argIsQuoted) {
-            char testEscape[] = ESCAPE_VERIFICATION[verificationType];
-            for (int i = 0; i < testEscape.length; ++i) {
-                if (arg.indexOf(testEscape[i]) >= 0) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    private static String getExecutablePath(String path)
-        throws IOException
-    {
-        boolean pathIsQuoted = isQuoted(true, path,
-                "Executable name has embedded quote, split the arguments");
-
-        // Win32 CreateProcess requires path to be normalized
-        File fileToRun = new File(pathIsQuoted
-            ? path.substring(1, path.length() - 1)
-            : path);
-
-        // From the [CreateProcess] function documentation:
-        //
-        // "If the file name does not contain an extension, .exe is appended.
-        // Therefore, if the file name extension is .com, this parameter
-        // must include the .com extension. If the file name ends in
-        // a period (.) with no extension, or if the file name contains a path,
-        // .exe is not appended."
-        //
-        // "If the file name !does not contain a directory path!,
-        // the system searches for the executable file in the following
-        // sequence:..."
-        //
-        // In practice ANY non-existent path is extended by [.exe] extension
-        // in the [CreateProcess] funcion with the only exception:
-        // the path ends by (.)
-
-        return fileToRun.getPath();
-    }
-
-
-    private boolean isShellFile(String executablePath) {
-        String upPath = executablePath.toUpperCase();
-        return (upPath.endsWith(".CMD") || upPath.endsWith(".BAT"));
-    }
-
-    private String quoteString(String arg) {
-        StringBuilder argbuf = new StringBuilder(arg.length() + 2);
-        return argbuf.append('"').append(arg).append('"').toString();
-    }
-
-
-    private cli.System.Diagnostics.Process handle;
-    private OutputStream stdin_stream;
-    private InputStream stdout_stream;
-    private InputStream stderr_stream;
-
-    private ProcessImpl(String cmd[],
-                        final java.util.Map<String,String> envblock,
-                        final String path,
-                        final Stream[] stdHandles,
-                        final boolean redirectErrorStream)
-        throws IOException
-    {
-        String cmdstr;
-        SecurityManager security = System.getSecurityManager();
-        boolean allowAmbiguousCommands = false;
-        if (security == null) {
-            allowAmbiguousCommands = true;
-            String value = System.getProperty("jdk.lang.Process.allowAmbiguousCommands");
-            if (value != null)
-                allowAmbiguousCommands = !"false".equalsIgnoreCase(value);
-        }
-        if (allowAmbiguousCommands) {
-            // Legacy mode.
-
-            // Normalize path if possible.
-            String executablePath = new File(cmd[0]).getPath();
-
-            // No worry about internal, unpaired ["], and redirection/piping.
-            if (needsEscaping(VERIFICATION_LEGACY, executablePath) )
-                executablePath = quoteString(executablePath);
-
-            cmdstr = createCommandLine(
-                //legacy mode doesn't worry about extended verification
-                VERIFICATION_LEGACY,
-                executablePath,
-                cmd);
-        } else {
-            String executablePath;
-            try {
-                executablePath = getExecutablePath(cmd[0]);
-            } catch (IllegalArgumentException e) {
-                // Workaround for the calls like
-                // Runtime.getRuntime().exec("\"C:\\Program Files\\foo\" bar")
-
-                // No chance to avoid CMD/BAT injection, except to do the work
-                // right from the beginning. Otherwise we have too many corner
-                // cases from
-                //    Runtime.getRuntime().exec(String[] cmd [, ...])
-                // calls with internal ["] and escape sequences.
-
-                // Restore original command line.
-                StringBuilder join = new StringBuilder();
-                // terminal space in command line is ok
-                for (String s : cmd)
-                    join.append(s).append(' ');
-
-                // Parse the command line again.
-                cmd = getTokensFromCommand(join.toString());
-                executablePath = getExecutablePath(cmd[0]);
-
-                // Check new executable name once more
-                if (security != null)
-                    security.checkExec(executablePath);
-            }
-
-            // Quotation protects from interpretation of the [path] argument as
-            // start of longer path with spaces. Quotation has no influence to
-            // [.exe] extension heuristic.
-            cmdstr = createCommandLine(
-                    // We need the extended verification procedure for CMD files.
-                    isShellFile(executablePath)
-                        ? VERIFICATION_CMD_BAT
-                        : VERIFICATION_WIN32,
-                    quoteString(executablePath),
-                    cmd);
-        }
-
-        handle = create(cmdstr, envblock, path,
-                        stdHandles, redirectErrorStream);
-
-        java.security.AccessController.doPrivileged(
-        new java.security.PrivilegedAction<Void>() {
-        public Void run() {
-            if (stdHandles[0] == null)
-                stdin_stream = ProcessBuilder.NullOutputStream.INSTANCE;
-            else {
-                FileDescriptor stdin_fd = FileDescriptor.fromStream(stdHandles[0]);
-                stdin_stream = new BufferedOutputStream(
-                    new FileOutputStream(stdin_fd));
-            }
-
-            if (stdHandles[1] == null)
-                stdout_stream = ProcessBuilder.NullInputStream.INSTANCE;
-            else {
-                FileDescriptor stdout_fd = FileDescriptor.fromStream(stdHandles[1]);
-                stdout_stream = new BufferedInputStream(
-                    new FileInputStream(stdout_fd));
-            }
-
-            if (stdHandles[2] == null)
-                stderr_stream = ProcessBuilder.NullInputStream.INSTANCE;
-            else {
-                FileDescriptor stderr_fd = FileDescriptor.fromStream(stdHandles[2]);
-                stderr_stream = new FileInputStream(stderr_fd);
-            }
-
-            return null; }});
-    }
-
-    private static native String mapVfsExecutable(String path);
-
-    public OutputStream getOutputStream() {
-        return stdin_stream;
-    }
-
-    public InputStream getInputStream() {
-        return stdout_stream;
-    }
-
-    public InputStream getErrorStream() {
-        return stderr_stream;
-    }
-
-    public int exitValue() {
-        if (!handle.get_HasExited())
-            throw new IllegalThreadStateException("process has not exited");
-        return handle.get_ExitCode();
-    }
-
-    public int waitFor() throws InterruptedException {
-        waitForInterruptibly(handle);
-        if (Thread.interrupted())
-            throw new InterruptedException();
-        return exitValue();
-    }
-
-    private static void waitForInterruptibly(cli.System.Diagnostics.Process handle) throws InterruptedException {
-        // to be interruptable we have to use polling
-        // (on .NET 2.0 WaitForExit is actually interruptible, but this isn't documented)
-        Thread current = Thread.currentThread();
-        while (!current.isInterrupted() && !handle.WaitForExit(100))
-            ;
-    }
-
-    @Override
-    public boolean waitFor(long timeout, TimeUnit unit)
-        throws InterruptedException
-    {
-        if (handle.get_HasExited()) return true;
-        if (timeout <= 0) return false;
-
-        long msTimeout = unit.toMillis(timeout);
-
-        waitForTimeoutInterruptibly(handle, msTimeout);
-        if (Thread.interrupted())
-            throw new InterruptedException();
-        return handle.get_HasExited();
-    }
-
-    private static void waitForTimeoutInterruptibly(
-        cli.System.Diagnostics.Process handle, long timeout) {
-        long now = System.currentTimeMillis();
-        long exp = now + timeout;
-        if (exp < now) {
-            // if we overflowed, just wait for a really long time
-            exp = Long.MAX_VALUE;
-        }
-        Thread current = Thread.currentThread();
-        for (;;) {
-            if (current.isInterrupted()) {
-                return;
-            }
-            // wait for a maximum of 100 ms to be interruptible
-            if (handle.WaitForExit((int)Math.min(100, exp - now))) {
-                return;
-            }
-            now = System.currentTimeMillis();
-            if (now >= exp) {
-                return;
-            }
-        }
-    }
-
-    public void destroy() { terminateProcess(handle); }
-
-    @Override
-    public Process destroyForcibly() {
-        destroy();
-        return this;
-    }
-
-    private static void terminateProcess(cli.System.Diagnostics.Process handle) {
-        try {
-            if (false) throw new cli.System.ComponentModel.Win32Exception();
-            if (false) throw new cli.System.InvalidOperationException();
-            handle.Kill();
-        } catch (cli.System.ComponentModel.Win32Exception _) {
-        } catch (cli.System.InvalidOperationException _) {
-        }
-    }
-
-    @Override
-    public boolean isAlive() {
-        return isProcessAlive(handle);
-    }
-
-    private static boolean isProcessAlive(cli.System.Diagnostics.Process handle) {
-        return !handle.get_HasExited();
-    }
-
-    /**
-     * Create a process using the win32 function CreateProcess.
-     * The method is synchronized due to MS kb315939 problem.
-     * All native handles should restore the inherit flag at the end of call.
-     *
-     * @param cmdstr the Windows command line
-     * @param envblock NUL-separated, double-NUL-terminated list of
-     *        environment strings in VAR=VALUE form
-     * @param dir the working directory of the process, or null if
-     *        inheriting the current directory from the parent process
-     * @param stdHandles array of windows HANDLEs.  Indexes 0, 1, and
-     *        2 correspond to standard input, standard output and
-     *        standard error, respectively.  On input, a value of -1
-     *        means to create a pipe to connect child and parent
-     *        processes.  On output, a value which is not -1 is the
-     *        parent pipe handle corresponding to the pipe which has
-     *        been created.  An element of this array is -1 on input
-     *        if and only if it is <em>not</em> -1 on output.
-     * @param redirectErrorStream redirectErrorStream attribute
-     * @return the native subprocess HANDLE returned by CreateProcess
-     */
-    private static cli.System.Diagnostics.Process create(String cmdstr,
-                                      java.util.Map<String,String> envblock,
-                                      String dir,
-                                      Stream[] stdHandles,
-                                      boolean redirectErrorStream)
-        throws IOException {
-
-        int programEnd = parseCommandString(cmdstr);
-        int argumentsStart = programEnd;
-        if (cmdstr.length() > argumentsStart && cmdstr.charAt(argumentsStart) == ' ') {
-            argumentsStart++;
-        }
-
-        String fileName = cmdstr.substring(0, programEnd);
-        ProcessStartInfo si = new ProcessStartInfo(mapVfsExecutable(fileName), cmdstr.substring(argumentsStart));
-        si.set_UseShellExecute(false);
-        si.set_RedirectStandardError(true);
-        si.set_RedirectStandardOutput(true);
-        si.set_RedirectStandardInput(true);
-        si.set_CreateNoWindow(true);
-        if (dir != null) {
-            si.set_WorkingDirectory(dir);
-        }
-        if (envblock != null) {
-            si.get_EnvironmentVariables().Clear();
-            for (String key : envblock.keySet()) {
-                si.get_EnvironmentVariables().set_Item(key, envblock.get(key));
-            }
-        }
-
-        cli.System.Diagnostics.Process proc;
-        try {
-            if (false) throw new cli.System.ComponentModel.Win32Exception();
-            if (false) throw new cli.System.InvalidOperationException();
-            proc = cli.System.Diagnostics.Process.Start(si);
-        } catch (cli.System.ComponentModel.Win32Exception x1) {
-            throw new IOException(x1.getMessage());
-        } catch (cli.System.InvalidOperationException x2) {
-            throw new IOException(x2.getMessage());
-        }
-
-        // if any of the handles is redirected to/from a file,
-        // we need to close the files as soon as the process exits
-        if (stdHandles[0] instanceof FileStream
-            || stdHandles[1] instanceof FileStream
-            || stdHandles[2] instanceof FileStream) {
-            final Stream s0 = stdHandles[0];
-            final Stream s1 = stdHandles[1];
-            final Stream s2 = stdHandles[2];
-            proc.set_EnableRaisingEvents(true);
-            proc.add_Exited(new EventHandler(new EventHandler.Method() {
-                public void Invoke(Object sender, EventArgs e) {
-                    if (s0 instanceof FileStream)
-                        s0.Close();
-                    if (s1 instanceof FileStream)
-                        s1.Close();
-                    if (s2 instanceof FileStream)
-                        s2.Close();
-                }
-            }));
-        }
-        
-        Stream stdin = proc.get_StandardInput().get_BaseStream();
-        Stream stdout = proc.get_StandardOutput().get_BaseStream();
-        Stream stderr = proc.get_StandardError().get_BaseStream();
-
-        if (stdHandles[0] != null) {
-            connectPipe(stdHandles[0], stdin);
-            stdHandles[0] = null;
-        } else {
-            stdHandles[0] = stdin;
-        }
-
-        Stream stdoutDrain = null;
-        if (stdHandles[1] != null) {
-            stdoutDrain = stdHandles[1];
-            connectPipe(stdout, stdoutDrain);
-            stdHandles[1] = null;
-        } else if (redirectErrorStream) {
-            PipeStream pipe = new PipeStream();
-            connectPipe(stdout, pipe);
-            connectPipe(stderr, pipe);
-            stdHandles[1] = pipe;
-        } else {
-            stdHandles[1] = stdout;
-        }
-
-        if (redirectErrorStream) {
-            if (stdoutDrain != null) {
-                connectPipe(stderr, stdoutDrain);
-            }
-            stdHandles[2] = null;
-        } else if (stdHandles[2] != null) {
-            connectPipe(stderr, stdHandles[2]);
-            stdHandles[2] = null;
-        } else {
-            stdHandles[2] = stderr;
-        }
-
-        return proc;
-    }
-
-    private static final class PipeStream extends Stream
-    {
-        private final byte[] buf = new byte[4096];
-        private int pos;
-        private int users = 2;
-
-        @Override
-        public synchronized int Read(byte[] buffer, int offset, int count)
-        {
-            if (count == 0)
-            {
-                return 0;
-            }
-            while (pos == 0)
-            {
-                try
-                {
-                    wait();
-                }
-                catch (InterruptedException _) { }
-            }
-            if (pos == -1)
-            {
-                return 0;
-            }
-            count = Math.min(count, pos);
-            System.arraycopy(buf, 0, buffer, offset, count);
-            pos -= count;
-            System.arraycopy(buf, count, buf, 0, pos);
-            notifyAll();
-            return count;
-        }
-
-        @Override
-        public synchronized void Write(byte[] buffer, int offset, int count)
-        {
-            while (buf.length - pos < count)
-            {
-                try
-                {
-                    wait();
-                }
-                catch (InterruptedException _) { }
-            }
-            System.arraycopy(buffer, offset, buf, pos, count);
-            pos += count;
-            notifyAll();
-        }
-
-        @Override
-        public synchronized void Close()
-        {
-            if (--users == 0)
-            {
-                pos = -1;
-                notifyAll();
-            }
-        }
-
-        @Override
-        public boolean get_CanRead()
-        {
-            return true;
-        }
-
-        @Override
-        public boolean get_CanSeek()
-        {
-            return false;
-        }
-
-        @Override
-        public boolean get_CanWrite()
-        {
-            return true;
-        }
-
-        @Override
-        public void Flush()
-        {
-        }
-
-        @Override
-        public long get_Length()
-        {
-            ikvm.runtime.Util.throwException(new cli.System.NotSupportedException());
-            return 0;
-        }
-
-        @Override
-        public long get_Position()
-        {
-            ikvm.runtime.Util.throwException(new cli.System.NotSupportedException());
-            return 0;
-        }
-
-        @Override
-        public long Seek(long offset, cli.System.IO.SeekOrigin origin)
-        {
-            ikvm.runtime.Util.throwException(new cli.System.NotSupportedException());
-            return 0;
-        }
-
-        @Override
-        public void SetLength(long value)
-        {
-            ikvm.runtime.Util.throwException(new cli.System.NotSupportedException());
-        }
-
-        @Override
-        public void set_Position(long position)
-        {
-            ikvm.runtime.Util.throwException(new cli.System.NotSupportedException());
-        }
-    }
-
-    private static native int parseCommandString(String cmdstr);
-
-    /**
-     * Opens a file for atomic append. The file is created if it doesn't
-     * already exist.
-     *
-     * @param file the file to open or create
-     * @return the native HANDLE
-     */
-    private static FileDescriptor openForAtomicAppend(String path)
-        throws IOException {
-        try {
-            if (false) throw new cli.System.ArgumentException();
-            if (false) throw new cli.System.IO.IOException();
-            if (false) throw new cli.System.Security.SecurityException();
-            if (false) throw new cli.System.UnauthorizedAccessException();
-            return FileDescriptor.fromStream(new FileStream(path, FileMode.wrap(FileMode.Append), FileSystemRights.wrap(FileSystemRights.AppendData), FileShare.wrap(FileShare.ReadWrite), 1, FileOptions.wrap(FileOptions.None)));
-        } catch (cli.System.ArgumentException x) {
-            throw new IOException(x.getMessage());
-        } catch (cli.System.IO.IOException x) {
-            throw new IOException(x.getMessage());
-        } catch (cli.System.Security.SecurityException x) {
-            throw new IOException(x.getMessage());
-        } catch (cli.System.UnauthorizedAccessException x) {
-            throw new IOException(x.getMessage());
-        }
-    }
-
-    private static void connectPipe(final Stream in, final Stream out) {
-        final byte[] buf = new byte[4096];
-        final AsyncCallback[] callback = new AsyncCallback[1];
-        callback[0] = new AsyncCallback(new AsyncCallback.Method() {
-            public void Invoke(IAsyncResult ar) {
-                try {
-                    int count = in.EndRead(ar);
-                    if (count > 0) {
-                        out.Write(buf, 0, count);
-                        out.Flush();
-                        in.BeginRead(buf, 0, buf.length, callback[0], null);
-                    } else {
-                        out.Close();
-                    }
-                } catch (Throwable _) {
-                }
-            }
-        });
-        try {
-            in.BeginRead(buf, 0, buf.length, callback[0], null);
-        } catch (Throwable _) {
-        }
-    }
-}
diff --git a/openjdk/java/lang/PropertyConstants.java.in b/openjdk/java/lang/PropertyConstants.java.in
deleted file mode 100644
index 69e7796f..00000000
--- a/openjdk/java/lang/PropertyConstants.java.in
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-  Copyright (C) 2007, 2009 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-package java.lang;
-
-interface PropertyConstants
-{
-    String awt_toolkit = "ikvm.awt.NetToolkit, @AWTASSEMBLY@";
-    String java_awt_graphicsenv = "ikvm.awt.NetGraphicsEnvironment, @AWTASSEMBLY@";
-    String java_vm_version = "@VERSION@";
-    String java_runtime_version = "@VERSION@";
-    String openjdk_version = "@OPENJDK_VERSION@";
-}
diff --git a/openjdk/java/lang/Shutdown.java b/openjdk/java/lang/Shutdown.java
deleted file mode 100644
index 947f0e39..00000000
--- a/openjdk/java/lang/Shutdown.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-import cli.System.AppDomain;
-import cli.System.EventArgs;
-import cli.System.EventHandler;
-import cli.System.Threading.Monitor;
-
-/**
- * Package-private utility class containing data structures and logic
- * governing the virtual-machine shutdown sequence.
- *
- * @author   Mark Reinhold
- * @since    1.3
- */
-
-class Shutdown {
-
-    /* Shutdown state */
-    private static final int RUNNING = 0;
-    private static final int HOOKS = 1;
-    private static final int FINALIZERS = 2;
-    private static int state = RUNNING;
-
-    /* Should we run all finalizers upon exit? */
-    static volatile boolean runFinalizersOnExit = false;
-
-    // The system shutdown hooks are registered with a predefined slot.
-    // The list of shutdown hooks is as follows:
-    // (0) Console restore hook
-    // (1) Application hooks
-    // (2) DeleteOnExit hook
-    private static final int MAX_SYSTEM_HOOKS = 10;
-    private static final Runnable[] hooks = new Runnable[MAX_SYSTEM_HOOKS];
-
-    // the index of the currently running shutdown hook to the hooks array
-    private static int currentRunningHook = 0;
-
-    // [IKVM] have we registered the AppDomain.ProcessExit event handler?
-    private static boolean registeredProcessExit;
-
-    /* The preceding static fields are protected by this lock */
-    private static class Lock { };
-    private static Object lock = new Lock();
-
-    /* Lock object for the native halt method */
-    private static Object haltLock = new Lock();
-
-    /* Invoked by Runtime.runFinalizersOnExit */
-    static void setRunFinalizersOnExit(boolean run) {
-        synchronized (lock) {
-            runFinalizersOnExit = run;
-        }
-    }
-    
-    private static void registerProcessExit() {
-        try {
-            // MONOBUG Mono doesn't support starting a new thread during ProcessExit
-            // (and application shutdown hooks are based on threads)
-            // see https://bugzilla.xamarin.com/show_bug.cgi?id=5650
-            if (!ikvm.internal.Util.MONO) {
-                // AppDomain.ProcessExit has a LinkDemand, so we have to have a separate method
-                registerShutdownHook();
-                if (false) throw new cli.System.Security.SecurityException();
-            }
-        }
-        catch (cli.System.Security.SecurityException _) {
-        }
-    }
-
-    private static void registerShutdownHook()
-    {
-        AppDomain.get_CurrentDomain().add_ProcessExit(new EventHandler(new EventHandler.Method() {
-            public void Invoke(Object sender, EventArgs e) {
-                shutdown();
-            }
-        }));
-    }
-
-    /**
-     * Add a new shutdown hook.  Checks the shutdown state and the hook itself,
-     * but does not do any security checks.
-     *
-     * The registerShutdownInProgress parameter should be false except
-     * registering the DeleteOnExitHook since the first file may
-     * be added to the delete on exit list by the application shutdown
-     * hooks.
-     *
-     * @params slot  the slot in the shutdown hook array, whose element
-     *               will be invoked in order during shutdown
-     * @params registerShutdownInProgress true to allow the hook
-     *               to be registered even if the shutdown is in progress.
-     * @params hook  the hook to be registered
-     *
-     * @throw IllegalStateException
-     *        if registerShutdownInProgress is false and shutdown is in progress; or
-     *        if registerShutdownInProgress is true and the shutdown process
-     *           already passes the given slot
-     */
-    static void add(int slot, boolean registerShutdownInProgress, Runnable hook) {
-        synchronized (lock) {
-            if (hooks[slot] != null)
-                throw new InternalError("Shutdown hook at slot " + slot + " already registered");
-
-            if (!registerShutdownInProgress) {
-                if (state > RUNNING)
-                    throw new IllegalStateException("Shutdown in progress");
-            } else {
-                if (state > HOOKS || (state == HOOKS && slot <= currentRunningHook))
-                    throw new IllegalStateException("Shutdown in progress");
-            }
-
-            if (!registeredProcessExit) {
-                registeredProcessExit = true;
-                registerProcessExit();
-            }
-
-            hooks[slot] = hook;
-        }
-    }
-
-    /* Run all registered shutdown hooks
-     */
-    private static void runHooks() {
-        for (int i=0; i < MAX_SYSTEM_HOOKS; i++) {
-            try {
-                Runnable hook;
-                synchronized (lock) {
-                    // acquire the lock to make sure the hook registered during
-                    // shutdown is visible here.
-                    currentRunningHook = i;
-                    hook = hooks[i];
-                }
-                if (hook != null) hook.run();
-            } catch(Throwable t) {
-                if (t instanceof ThreadDeath) {
-                    ThreadDeath td = (ThreadDeath)t;
-                    throw td;
-                }
-            }
-        }
-    }
-
-    /* The halt method is synchronized on the halt lock
-     * to avoid corruption of the delete-on-shutdown file list.
-     * It invokes the true native halt method.
-     */
-    static void halt(int status) {
-        synchronized (haltLock) {
-            halt0(status);
-        }
-    }
-
-    static void halt0(int status) {
-        cli.System.Environment.Exit(status);
-    }
-
-    /* Wormhole for invoking java.lang.ref.Finalizer.runAllFinalizers */
-    private static void runAllFinalizers() { /* [IKVM] Don't need to do anything here */ }
-
-
-    /* The actual shutdown sequence is defined here.
-     *
-     * If it weren't for runFinalizersOnExit, this would be simple -- we'd just
-     * run the hooks and then halt.  Instead we need to keep track of whether
-     * we're running hooks or finalizers.  In the latter case a finalizer could
-     * invoke exit(1) to cause immediate termination, while in the former case
-     * any further invocations of exit(n), for any n, simply stall.  Note that
-     * if on-exit finalizers are enabled they're run iff the shutdown is
-     * initiated by an exit(0); they're never run on exit(n) for n != 0 or in
-     * response to SIGINT, SIGTERM, etc.
-     */
-    private static void sequence() {
-        synchronized (lock) {
-            /* Guard against the possibility of a daemon thread invoking exit
-             * after DestroyJavaVM initiates the shutdown sequence
-             */
-            if (state != HOOKS) return;
-        }
-        runHooks();
-        boolean rfoe;
-        synchronized (lock) {
-            state = FINALIZERS;
-            rfoe = runFinalizersOnExit;
-        }
-        if (rfoe) runAllFinalizers();
-    }
-
-
-    /* Invoked by Runtime.exit, which does all the security checks.
-     * Also invoked by handlers for system-provided termination events,
-     * which should pass a nonzero status code.
-     */
-    static void exit(int status) {
-        boolean runMoreFinalizers = false;
-        synchronized (lock) {
-            if (status != 0) runFinalizersOnExit = false;
-            switch (state) {
-            case RUNNING:       /* Initiate shutdown */
-                state = HOOKS;
-                break;
-            case HOOKS:         /* Stall and halt */
-                break;
-            case FINALIZERS:
-                if (status != 0) {
-                    /* Halt immediately on nonzero status */
-                    halt(status);
-                } else {
-                    /* Compatibility with old behavior:
-                     * Run more finalizers and then halt
-                     */
-                    runMoreFinalizers = runFinalizersOnExit;
-                }
-                break;
-            }
-        }
-        if (runMoreFinalizers) {
-            runAllFinalizers();
-            halt(status);
-        }
-        synchronized (Shutdown.class) {
-            /* Synchronize on the class object, causing any other thread
-             * that attempts to initiate shutdown to stall indefinitely
-             */
-            sequence();
-            halt(status);
-        }
-    }
-
-
-    /* Invoked by the JNI DestroyJavaVM procedure when the last non-daemon
-     * thread has finished.  Unlike the exit method, this method does not
-     * actually halt the VM.
-     */
-    static void shutdown() {
-        synchronized (lock) {
-            switch (state) {
-            case RUNNING:       /* Initiate shutdown */
-                state = HOOKS;
-                break;
-            case HOOKS:         /* Stall and then return */
-            case FINALIZERS:
-                break;
-            }
-        }
-        // [IKVM] We don't block here, because we're being called
-        // from the AppDomain.ProcessExit event and we don't want to
-        // deadlock with the thread that called exit.
-        // Note that our JNI DestroyJavaVM implementation doesn't
-        // call this method.
-        if (Monitor.TryEnter(Shutdown.class)) {
-            try {
-                sequence();
-            } finally {
-                Monitor.Exit(Shutdown.class);
-            }
-        }
-    }
-
-}
diff --git a/openjdk/java/lang/StringHelper.java b/openjdk/java/lang/StringHelper.java
deleted file mode 100644
index 98f7816c..00000000
--- a/openjdk/java/lang/StringHelper.java
+++ /dev/null
@@ -1,2592 +0,0 @@
-/*
- * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.lang;
-
-import java.io.ObjectStreamField;
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Formatter;
-import java.util.Locale;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-
-/**
- * The <code>String</code> class represents character strings. All
- * string literals in Java programs, such as <code>"abc"</code>, are
- * implemented as instances of this class.
- * <p>
- * Strings are constant; their values cannot be changed after they
- * are created. String buffers support mutable strings.
- * Because String objects are immutable they can be shared. For example:
- * <p><blockquote><pre>
- *     String str = "abc";
- * </pre></blockquote><p>
- * is equivalent to:
- * <p><blockquote><pre>
- *     char data[] = {'a', 'b', 'c'};
- *     String str = new String(data);
- * </pre></blockquote><p>
- * Here are some more examples of how strings can be used:
- * <p><blockquote><pre>
- *     System.out.println("abc");
- *     String cde = "cde";
- *     System.out.println("abc" + cde);
- *     String c = "abc".substring(2,3);
- *     String d = cde.substring(1, 2);
- * </pre></blockquote>
- * <p>
- * The class <code>String</code> includes methods for examining
- * individual characters of the sequence, for comparing strings, for
- * searching strings, for extracting substrings, and for creating a
- * copy of a string with all characters translated to uppercase or to
- * lowercase. Case mapping is based on the Unicode Standard version
- * specified by the {@link java.lang.Character Character} class.
- * <p>
- * The Java language provides special support for the string
- * concatenation operator (&nbsp;+&nbsp;), and for conversion of
- * other objects to strings. String concatenation is implemented
- * through the <code>StringBuilder</code>(or <code>StringBuffer</code>)
- * class and its <code>append</code> method.
- * String conversions are implemented through the method
- * <code>toString</code>, defined by <code>Object</code> and
- * inherited by all classes in Java. For additional information on
- * string concatenation and conversion, see Gosling, Joy, and Steele,
- * <i>The Java Language Specification</i>.
- *
- * <p> Unless otherwise noted, passing a <tt>null</tt> argument to a constructor
- * or method in this class will cause a {@link NullPointerException} to be
- * thrown.
- *
- * <p>A <code>String</code> represents a string in the UTF-16 format
- * in which <em>supplementary characters</em> are represented by <em>surrogate
- * pairs</em> (see the section <a href="Character.html#unicode">Unicode
- * Character Representations</a> in the <code>Character</code> class for
- * more information).
- * Index values refer to <code>char</code> code units, so a supplementary
- * character uses two positions in a <code>String</code>.
- * <p>The <code>String</code> class provides methods for dealing with
- * Unicode code points (i.e., characters), in addition to those for
- * dealing with Unicode code units (i.e., <code>char</code> values).
- *
- * @author  Lee Boynton
- * @author  Arthur van Hoff
- * @author  Martin Buchholz
- * @author  Ulf Zibis
- * @see     java.lang.Object#toString()
- * @see     java.lang.StringBuffer
- * @see     java.lang.StringBuilder
- * @see     java.nio.charset.Charset
- * @since   JDK1.0
- */
-
-final class StringHelper
-{
-    /**
-     * Allocates a new {@code String} that contains characters from a subarray
-     * of the <a href="Character.html#unicode">Unicode code point</a> array
-     * argument.  The {@code offset} argument is the index of the first code
-     * point of the subarray and the {@code count} argument specifies the
-     * length of the subarray.  The contents of the subarray are converted to
-     * {@code char}s; subsequent modification of the {@code int} array does not
-     * affect the newly created string.
-     *
-     * @param  codePoints
-     *         Array that is the source of Unicode code points
-     *
-     * @param  offset
-     *         The initial offset
-     *
-     * @param  count
-     *         The length
-     *
-     * @throws  IllegalArgumentException
-     *          If any invalid Unicode code point is found in {@code
-     *          codePoints}
-     *
-     * @throws  IndexOutOfBoundsException
-     *          If the {@code offset} and {@code count} arguments index
-     *          characters outside the bounds of the {@code codePoints} array
-     *
-     * @since  1.5
-     */
-    static String NewString(int[] codePoints, int offset, int count) {
-        if (offset < 0) {
-            throw new StringIndexOutOfBoundsException(offset);
-        }
-        if (count < 0) {
-            throw new StringIndexOutOfBoundsException(count);
-        }
-        // Note: offset or count might be near -1>>>1.
-        if (offset > codePoints.length - count) {
-            throw new StringIndexOutOfBoundsException(offset + count);
-        }
-
-        final int end = offset + count;
-
-        // Pass 1: Compute precise size of char[]
-        int n = count;
-        for (int i = offset; i < end; i++) {
-            int c = codePoints[i];
-            if (Character.isBmpCodePoint(c))
-                continue;
-            else if (Character.isValidCodePoint(c))
-                n++;
-            else throw new IllegalArgumentException(Integer.toString(c));
-        }
-
-        // Pass 2: Allocate and fill in char[]
-        final char[] v = new char[n];
-
-        for (int i = offset, j = 0; i < end; i++, j++) {
-            int c = codePoints[i];
-            if (Character.isBmpCodePoint(c))
-                v[j] = (char)c;
-            else
-                Character.toSurrogates(c, v, j++);
-        }
-
-        return new String(v);
-    }
-
-    /**
-     * Allocates a new {@code String} constructed from a subarray of an array
-     * of 8-bit integer values.
-     *
-     * <p> The {@code offset} argument is the index of the first byte of the
-     * subarray, and the {@code count} argument specifies the length of the
-     * subarray.
-     *
-     * <p> Each {@code byte} in the subarray is converted to a {@code char} as
-     * specified in the method above.
-     *
-     * @deprecated This method does not properly convert bytes into characters.
-     * As of JDK&nbsp;1.1, the preferred way to do this is via the
-     * {@code String} constructors that take a {@link
-     * java.nio.charset.Charset}, charset name, or that use the platform's
-     * default charset.
-     *
-     * @param  ascii
-     *         The bytes to be converted to characters
-     *
-     * @param  hibyte
-     *         The top 8 bits of each 16-bit Unicode code unit
-     *
-     * @param  offset
-     *         The initial offset
-     * @param  count
-     *         The length
-     *
-     * @throws  IndexOutOfBoundsException
-     *          If the {@code offset} or {@code count} argument is invalid
-     *
-     * @see  #String(byte[], int)
-     * @see  #String(byte[], int, int, java.lang.String)
-     * @see  #String(byte[], int, int, java.nio.charset.Charset)
-     * @see  #String(byte[], int, int)
-     * @see  #String(byte[], java.lang.String)
-     * @see  #String(byte[], java.nio.charset.Charset)
-     * @see  #String(byte[])
-     */
-    @Deprecated
-    static String NewString(byte ascii[], int hibyte, int offset, int count) {
-        checkBounds(ascii, offset, count);
-        char value[] = new char[count];
-
-        if (hibyte == 0) {
-            for (int i = count; i-- > 0;) {
-                value[i] = (char)(ascii[i + offset] & 0xff);
-            }
-        } else {
-            hibyte <<= 8;
-            for (int i = count; i-- > 0;) {
-                value[i] = (char)(hibyte | (ascii[i + offset] & 0xff));
-            }
-        }
-        return new String(value, 0, count);
-    }
-
-    /**
-     * Allocates a new {@code String} containing characters constructed from
-     * an array of 8-bit integer values. Each character <i>c</i>in the
-     * resulting string is constructed from the corresponding component
-     * <i>b</i> in the byte array such that:
-     *
-     * <blockquote><pre>
-     *     <b><i>c</i></b> == (char)(((hibyte &amp; 0xff) &lt;&lt; 8)
-     *                         | (<b><i>b</i></b> &amp; 0xff))
-     * </pre></blockquote>
-     *
-     * @deprecated  This method does not properly convert bytes into
-     * characters.  As of JDK&nbsp;1.1, the preferred way to do this is via the
-     * {@code String} constructors that take a {@link
-     * java.nio.charset.Charset}, charset name, or that use the platform's
-     * default charset.
-     *
-     * @param  ascii
-     *         The bytes to be converted to characters
-     *
-     * @param  hibyte
-     *         The top 8 bits of each 16-bit Unicode code unit
-     *
-     * @see  #String(byte[], int, int, java.lang.String)
-     * @see  #String(byte[], int, int, java.nio.charset.Charset)
-     * @see  #String(byte[], int, int)
-     * @see  #String(byte[], java.lang.String)
-     * @see  #String(byte[], java.nio.charset.Charset)
-     * @see  #String(byte[])
-     */
-    @Deprecated
-    static String NewString(byte ascii[], int hibyte) {
-        return NewString(ascii, hibyte, 0, ascii.length);
-    }
-
-    /* Common private utility method used to bounds check the byte array
-     * and requested offset & length values used by the String(byte[],..)
-     * constructors.
-     */
-    private static void checkBounds(byte[] bytes, int offset, int length) {
-        if (length < 0)
-            throw new StringIndexOutOfBoundsException(length);
-        if (offset < 0)
-            throw new StringIndexOutOfBoundsException(offset);
-        if (offset > bytes.length - length)
-            throw new StringIndexOutOfBoundsException(offset + length);
-    }
-
-    /**
-     * Constructs a new {@code String} by decoding the specified subarray of
-     * bytes using the specified charset.  The length of the new {@code String}
-     * is a function of the charset, and hence may not be equal to the length
-     * of the subarray.
-     *
-     * <p> The behavior of this constructor when the given bytes are not valid
-     * in the given charset is unspecified.  The {@link
-     * java.nio.charset.CharsetDecoder} class should be used when more control
-     * over the decoding process is required.
-     *
-     * @param  bytes
-     *         The bytes to be decoded into characters
-     *
-     * @param  offset
-     *         The index of the first byte to decode
-     *
-     * @param  length
-     *         The number of bytes to decode
-
-     * @param  charsetName
-     *         The name of a supported {@linkplain java.nio.charset.Charset
-     *         charset}
-     *
-     * @throws  UnsupportedEncodingException
-     *          If the named charset is not supported
-     *
-     * @throws  IndexOutOfBoundsException
-     *          If the {@code offset} and {@code length} arguments index
-     *          characters outside the bounds of the {@code bytes} array
-     *
-     * @since  JDK1.1
-     */
-    static String NewString(byte bytes[], int offset, int length, String charsetName)
-            throws UnsupportedEncodingException {
-        if (charsetName == null)
-            throw new NullPointerException("charsetName");
-        checkBounds(bytes, offset, length);
-        char[] v = StringCoding.decode(charsetName, bytes, offset, length);
-        return new String(v);
-    }
-
-    /**
-     * Constructs a new {@code String} by decoding the specified subarray of
-     * bytes using the specified {@linkplain java.nio.charset.Charset charset}.
-     * The length of the new {@code String} is a function of the charset, and
-     * hence may not be equal to the length of the subarray.
-     *
-     * <p> This method always replaces malformed-input and unmappable-character
-     * sequences with this charset's default replacement string.  The {@link
-     * java.nio.charset.CharsetDecoder} class should be used when more control
-     * over the decoding process is required.
-     *
-     * @param  bytes
-     *         The bytes to be decoded into characters
-     *
-     * @param  offset
-     *         The index of the first byte to decode
-     *
-     * @param  length
-     *         The number of bytes to decode
-     *
-     * @param  charset
-     *         The {@linkplain java.nio.charset.Charset charset} to be used to
-     *         decode the {@code bytes}
-     *
-     * @throws  IndexOutOfBoundsException
-     *          If the {@code offset} and {@code length} arguments index
-     *          characters outside the bounds of the {@code bytes} array
-     *
-     * @since  1.6
-     */
-    static String NewString(byte bytes[], int offset, int length, Charset charset) {
-        if (charset == null)
-            throw new NullPointerException("charset");
-        checkBounds(bytes, offset, length);
-        char[] v = StringCoding.decode(charset, bytes, offset, length);
-        return new String(v);
-    }
-
-    /**
-     * Constructs a new {@code String} by decoding the specified array of bytes
-     * using the specified {@linkplain java.nio.charset.Charset charset}.  The
-     * length of the new {@code String} is a function of the charset, and hence
-     * may not be equal to the length of the byte array.
-     *
-     * <p> The behavior of this constructor when the given bytes are not valid
-     * in the given charset is unspecified.  The {@link
-     * java.nio.charset.CharsetDecoder} class should be used when more control
-     * over the decoding process is required.
-     *
-     * @param  bytes
-     *         The bytes to be decoded into characters
-     *
-     * @param  charsetName
-     *         The name of a supported {@linkplain java.nio.charset.Charset
-     *         charset}
-     *
-     * @throws  UnsupportedEncodingException
-     *          If the named charset is not supported
-     *
-     * @since  JDK1.1
-     */
-    static String NewString(byte bytes[], String charsetName)
-            throws UnsupportedEncodingException {
-        return NewString(bytes, 0, bytes.length, charsetName);
-    }
-
-    /**
-     * Constructs a new {@code String} by decoding the specified array of
-     * bytes using the specified {@linkplain java.nio.charset.Charset charset}.
-     * The length of the new {@code String} is a function of the charset, and
-     * hence may not be equal to the length of the byte array.
-     *
-     * <p> This method always replaces malformed-input and unmappable-character
-     * sequences with this charset's default replacement string.  The {@link
-     * java.nio.charset.CharsetDecoder} class should be used when more control
-     * over the decoding process is required.
-     *
-     * @param  bytes
-     *         The bytes to be decoded into characters
-     *
-     * @param  charset
-     *         The {@linkplain java.nio.charset.Charset charset} to be used to
-     *         decode the {@code bytes}
-     *
-     * @since  1.6
-     */
-    static String NewString(byte bytes[], Charset charset) {
-        return NewString(bytes, 0, bytes.length, charset);
-    }
-
-    /**
-     * Constructs a new {@code String} by decoding the specified subarray of
-     * bytes using the platform's default charset.  The length of the new
-     * {@code String} is a function of the charset, and hence may not be equal
-     * to the length of the subarray.
-     *
-     * <p> The behavior of this constructor when the given bytes are not valid
-     * in the default charset is unspecified.  The {@link
-     * java.nio.charset.CharsetDecoder} class should be used when more control
-     * over the decoding process is required.
-     *
-     * @param  bytes
-     *         The bytes to be decoded into characters
-     *
-     * @param  offset
-     *         The index of the first byte to decode
-     *
-     * @param  length
-     *         The number of bytes to decode
-     *
-     * @throws  IndexOutOfBoundsException
-     *          If the {@code offset} and the {@code length} arguments index
-     *          characters outside the bounds of the {@code bytes} array
-     *
-     * @since  JDK1.1
-     */
-    static String NewString(byte bytes[], int offset, int length) {
-        checkBounds(bytes, offset, length);
-        char[] v  = StringCoding.decode(bytes, offset, length);
-        return new String(v);
-    }
-
-    /**
-     * Constructs a new {@code String} by decoding the specified array of bytes
-     * using the platform's default charset.  The length of the new {@code
-     * String} is a function of the charset, and hence may not be equal to the
-     * length of the byte array.
-     *
-     * <p> The behavior of this constructor when the given bytes are not valid
-     * in the default charset is unspecified.  The {@link
-     * java.nio.charset.CharsetDecoder} class should be used when more control
-     * over the decoding process is required.
-     *
-     * @param  bytes
-     *         The bytes to be decoded into characters
-     *
-     * @since  JDK1.1
-     */
-    static String NewString(byte bytes[]) {
-        return NewString(bytes, 0, bytes.length);
-    }
-
-    /**
-     * Allocates a new string that contains the sequence of characters
-     * currently contained in the string buffer argument. The contents of the
-     * string buffer are copied; subsequent modification of the string buffer
-     * does not affect the newly created string.
-     *
-     * @param  buffer
-     *         A {@code StringBuffer}
-     */
-    static String NewString(StringBuffer buffer) {
-        return buffer.toString();
-    }
-
-    /**
-     * Allocates a new string that contains the sequence of characters
-     * currently contained in the string builder argument. The contents of the
-     * string builder are copied; subsequent modification of the string builder
-     * does not affect the newly created string.
-     *
-     * <p> This constructor is provided to ease migration to {@code
-     * StringBuilder}. Obtaining a string from a string builder via the {@code
-     * toString} method is likely to run faster and is generally preferred.
-     *
-     * @param   builder
-     *          A {@code StringBuilder}
-     *
-     * @since  1.5
-     */
-    static String NewString(StringBuilder builder) {
-        return builder.toString();
-    }
-
-
-    // Package private constructor which shares value array for speed.
-    static String NewString(int offset, int count, char value[]) {
-        return new String(value, offset, count);
-    }
-
-    /**
-     * Returns the character (Unicode code point) at the specified
-     * index. The index refers to <code>char</code> values
-     * (Unicode code units) and ranges from <code>0</code> to
-     * {@link #length()}<code> - 1</code>.
-     *
-     * <p> If the <code>char</code> value specified at the given index
-     * is in the high-surrogate range, the following index is less
-     * than the length of this <code>String</code>, and the
-     * <code>char</code> value at the following index is in the
-     * low-surrogate range, then the supplementary code point
-     * corresponding to this surrogate pair is returned. Otherwise,
-     * the <code>char</code> value at the given index is returned.
-     *
-     * @param      index the index to the <code>char</code> values
-     * @return     the code point value of the character at the
-     *             <code>index</code>
-     * @exception  IndexOutOfBoundsException  if the <code>index</code>
-     *             argument is negative or not less than the length of this
-     *             string.
-     * @since      1.5
-     */
-    static int codePointAt(String _this, int index) {
-        if ((index < 0) || (index >= _this.length())) {
-            throw new StringIndexOutOfBoundsException(index);
-        }
-        char c1 = _this.charAt(index++);
-        if (Character.isHighSurrogate(c1)) {
-            if (index < _this.length()) {
-                char c2 = _this.charAt(index);
-                if (Character.isLowSurrogate(c2)) {
-                    return Character.toCodePoint(c1, c2);
-                }
-            }
-        }
-        return c1;
-    }
-
-    /**
-     * Returns the character (Unicode code point) before the specified
-     * index. The index refers to <code>char</code> values
-     * (Unicode code units) and ranges from <code>1</code> to {@link
-     * CharSequence#length() length}.
-     *
-     * <p> If the <code>char</code> value at <code>(index - 1)</code>
-     * is in the low-surrogate range, <code>(index - 2)</code> is not
-     * negative, and the <code>char</code> value at <code>(index -
-     * 2)</code> is in the high-surrogate range, then the
-     * supplementary code point value of the surrogate pair is
-     * returned. If the <code>char</code> value at <code>index -
-     * 1</code> is an unpaired low-surrogate or a high-surrogate, the
-     * surrogate value is returned.
-     *
-     * @param     index the index following the code point that should be returned
-     * @return    the Unicode code point value before the given index.
-     * @exception IndexOutOfBoundsException if the <code>index</code>
-     *            argument is less than 1 or greater than the length
-     *            of this string.
-     * @since     1.5
-     */
-    static int codePointBefore(String _this, int index) {
-        int i = index - 1;
-        if ((i < 0) || (i >= _this.length())) {
-            throw new StringIndexOutOfBoundsException(index);
-        }
-        char c2 = _this.charAt(--index);
-        if (Character.isLowSurrogate(c2)) {
-            if (index > 0) {
-                char c1 = _this.charAt(--index);
-                if (Character.isHighSurrogate(c1)) {
-                    return Character.toCodePoint(c1, c2);
-                }
-            }
-        }
-        return c2;
-    }
-
-    /**
-     * Returns the number of Unicode code points in the specified text
-     * range of this <code>String</code>. The text range begins at the
-     * specified <code>beginIndex</code> and extends to the
-     * <code>char</code> at index <code>endIndex - 1</code>. Thus the
-     * length (in <code>char</code>s) of the text range is
-     * <code>endIndex-beginIndex</code>. Unpaired surrogates within
-     * the text range count as one code point each.
-     *
-     * @param beginIndex the index to the first <code>char</code> of
-     * the text range.
-     * @param endIndex the index after the last <code>char</code> of
-     * the text range.
-     * @return the number of Unicode code points in the specified text
-     * range
-     * @exception IndexOutOfBoundsException if the
-     * <code>beginIndex</code> is negative, or <code>endIndex</code>
-     * is larger than the length of this <code>String</code>, or
-     * <code>beginIndex</code> is larger than <code>endIndex</code>.
-     * @since  1.5
-     */
-    static int codePointCount(String _this, int beginIndex, int endIndex) {
-        if (beginIndex < 0 || endIndex > _this.length() || beginIndex > endIndex) {
-            throw new IndexOutOfBoundsException();
-        }
-        int n = 0;
-        for (int i = beginIndex; i < endIndex; ) {
-            n++;
-            if (Character.isHighSurrogate(_this.charAt(i++))) {
-                if (i < endIndex && Character.isLowSurrogate(_this.charAt(i))) {
-                    i++;
-                }
-            }
-        }
-        return n;
-    }
-
-    /**
-     * Returns the index within this <code>String</code> that is
-     * offset from the given <code>index</code> by
-     * <code>codePointOffset</code> code points. Unpaired surrogates
-     * within the text range given by <code>index</code> and
-     * <code>codePointOffset</code> count as one code point each.
-     *
-     * @param index the index to be offset
-     * @param codePointOffset the offset in code points
-     * @return the index within this <code>String</code>
-     * @exception IndexOutOfBoundsException if <code>index</code>
-     *   is negative or larger then the length of this
-     *   <code>String</code>, or if <code>codePointOffset</code> is positive
-     *   and the substring starting with <code>index</code> has fewer
-     *   than <code>codePointOffset</code> code points,
-     *   or if <code>codePointOffset</code> is negative and the substring
-     *   before <code>index</code> has fewer than the absolute value
-     *   of <code>codePointOffset</code> code points.
-     * @since 1.5
-     */
-    static int offsetByCodePoints(String _this, int index, int codePointOffset) {
-        int count = _this.length();
-        if (index < 0 || index > count) {
-            throw new IndexOutOfBoundsException();
-        }
-        int x = index;
-        if (codePointOffset >= 0) {
-            int limit = count;
-            int i;
-            for (i = 0; x < limit && i < codePointOffset; i++) {
-                if (Character.isHighSurrogate(_this.charAt(x++))) {
-                    if (x < limit && Character.isLowSurrogate(_this.charAt(x))) {
-                        x++;
-                    }
-                }
-            }
-            if (i < codePointOffset) {
-                throw new IndexOutOfBoundsException();
-            }
-        } else {
-            int i;
-            for (i = codePointOffset; x > 0 && i < 0; i++) {
-                if (Character.isLowSurrogate(_this.charAt(--x))) {
-                    if (x > 0 && Character.isHighSurrogate(_this.charAt(x-1))) {
-                        x--;
-                    }
-                }
-            } 
-            if (i < 0) {
-                throw new IndexOutOfBoundsException();
-            }
-        }
-        return x;
-    }
-
-    /**
-     * Copy characters from this string into dst starting at dstBegin.
-     * This method doesn't perform any range checking.
-     */
-    static void getChars(String _this, char dst[], int dstBegin) {
-        _this.getChars(0, _this.length(), dst, dstBegin);
-    }
-
-    /**
-     * Copies characters from this string into the destination character
-     * array.
-     * <p>
-     * The first character to be copied is at index <code>srcBegin</code>;
-     * the last character to be copied is at index <code>srcEnd-1</code>
-     * (thus the total number of characters to be copied is
-     * <code>srcEnd-srcBegin</code>). The characters are copied into the
-     * subarray of <code>dst</code> starting at index <code>dstBegin</code>
-     * and ending at index:
-     * <p><blockquote><pre>
-     *     dstbegin + (srcEnd-srcBegin) - 1
-     * </pre></blockquote>
-     *
-     * @param      srcBegin   index of the first character in the string
-     *                        to copy.
-     * @param      srcEnd     index after the last character in the string
-     *                        to copy.
-     * @param      dst        the destination array.
-     * @param      dstBegin   the start offset in the destination array.
-     * @exception IndexOutOfBoundsException If any of the following
-     *            is true:
-     *            <ul><li><code>srcBegin</code> is negative.
-     *            <li><code>srcBegin</code> is greater than <code>srcEnd</code>
-     *            <li><code>srcEnd</code> is greater than the length of this
-     *                string
-     *            <li><code>dstBegin</code> is negative
-     *            <li><code>dstBegin+(srcEnd-srcBegin)</code> is larger than
-     *                <code>dst.length</code></ul>
-     */
-    static void getChars(cli.System.String _this, int srcBegin, int srcEnd, char dst[], int dstBegin) {
-        if (srcBegin < 0) {
-            throw new StringIndexOutOfBoundsException(srcBegin);
-        }
-        if (srcEnd > _this.get_Length()) {
-            throw new StringIndexOutOfBoundsException(srcEnd);
-        }
-        if (srcBegin > srcEnd) {
-            throw new StringIndexOutOfBoundsException(srcEnd - srcBegin);
-        }
-        _this.CopyTo(srcBegin, dst, dstBegin, srcEnd - srcBegin);
-    }
-
-    /**
-     * Copies characters from this string into the destination byte array. Each
-     * byte receives the 8 low-order bits of the corresponding character. The
-     * eight high-order bits of each character are not copied and do not
-     * participate in the transfer in any way.
-     *
-     * <p> The first character to be copied is at index {@code srcBegin}; the
-     * last character to be copied is at index {@code srcEnd-1}.  The total
-     * number of characters to be copied is {@code srcEnd-srcBegin}. The
-     * characters, converted to bytes, are copied into the subarray of {@code
-     * dst} starting at index {@code dstBegin} and ending at index:
-     *
-     * <blockquote><pre>
-     *     dstbegin + (srcEnd-srcBegin) - 1
-     * </pre></blockquote>
-     *
-     * @deprecated  This method does not properly convert characters into
-     * bytes.  As of JDK&nbsp;1.1, the preferred way to do this is via the
-     * {@link #getBytes()} method, which uses the platform's default charset.
-     *
-     * @param  srcBegin
-     *         Index of the first character in the string to copy
-     *
-     * @param  srcEnd
-     *         Index after the last character in the string to copy
-     *
-     * @param  dst
-     *         The destination array
-     *
-     * @param  dstBegin
-     *         The start offset in the destination array
-     *
-     * @throws  IndexOutOfBoundsException
-     *          If any of the following is true:
-     *          <ul>
-     *            <li> {@code srcBegin} is negative
-     *            <li> {@code srcBegin} is greater than {@code srcEnd}
-     *            <li> {@code srcEnd} is greater than the length of this String
-     *            <li> {@code dstBegin} is negative
-     *            <li> {@code dstBegin+(srcEnd-srcBegin)} is larger than {@code
-     *                 dst.length}
-     *          </ul>
-     */
-    @Deprecated
-    static void getBytes(String _this, int srcBegin, int srcEnd, byte dst[], int dstBegin) {
-        if (srcBegin < 0) {
-            throw new StringIndexOutOfBoundsException(srcBegin);
-        }
-        if (srcEnd > _this.length()) {
-            throw new StringIndexOutOfBoundsException(srcEnd);
-        }
-        if (srcBegin > srcEnd) {
-            throw new StringIndexOutOfBoundsException(srcEnd - srcBegin);
-        }
-        int j = dstBegin;
-        int n = srcEnd;
-        int i = srcBegin;
-
-        while (i < n) {
-            dst[j++] = (byte)_this.charAt(i++);
-        }
-    }
-
-    /**
-     * Encodes this {@code String} into a sequence of bytes using the named
-     * charset, storing the result into a new byte array.
-     *
-     * <p> The behavior of this method when this string cannot be encoded in
-     * the given charset is unspecified.  The {@link
-     * java.nio.charset.CharsetEncoder} class should be used when more control
-     * over the encoding process is required.
-     *
-     * @param  charsetName
-     *         The name of a supported {@linkplain java.nio.charset.Charset
-     *         charset}
-     *
-     * @return  The resultant byte array
-     *
-     * @throws  UnsupportedEncodingException
-     *          If the named charset is not supported
-     *
-     * @since  JDK1.1
-     */
-    static byte[] getBytes(String _this, String charsetName)
-            throws UnsupportedEncodingException {
-        if (charsetName == null) throw new NullPointerException();
-        char[] value = _this.toCharArray();
-        return StringCoding.encode(charsetName, value, 0, value.length);
-    }
-
-    /**
-     * Encodes this {@code String} into a sequence of bytes using the given
-     * {@linkplain java.nio.charset.Charset charset}, storing the result into a
-     * new byte array.
-     *
-     * <p> This method always replaces malformed-input and unmappable-character
-     * sequences with this charset's default replacement byte array.  The
-     * {@link java.nio.charset.CharsetEncoder} class should be used when more
-     * control over the encoding process is required.
-     *
-     * @param  charset
-     *         The {@linkplain java.nio.charset.Charset} to be used to encode
-     *         the {@code String}
-     *
-     * @return  The resultant byte array
-     *
-     * @since  1.6
-     */
-    static byte[] getBytes(String _this, Charset charset) {
-        if (charset == null) throw new NullPointerException();
-        char[] value = _this.toCharArray();
-        return StringCoding.encode(charset, value, 0, value.length);
-    }
-
-    /**
-     * Encodes this {@code String} into a sequence of bytes using the
-     * platform's default charset, storing the result into a new byte array.
-     *
-     * <p> The behavior of this method when this string cannot be encoded in
-     * the default charset is unspecified.  The {@link
-     * java.nio.charset.CharsetEncoder} class should be used when more control
-     * over the encoding process is required.
-     *
-     * @return  The resultant byte array
-     *
-     * @since      JDK1.1
-     */
-    static byte[] getBytes(String _this) {
-        char[] value = _this.toCharArray();
-        return StringCoding.encode(value, 0, value.length);
-    }
-
-    /**
-     * Compares this string to the specified {@code StringBuffer}.  The result
-     * is {@code true} if and only if this {@code String} represents the same
-     * sequence of characters as the specified {@code StringBuffer}.
-     *
-     * @param  sb
-     *         The {@code StringBuffer} to compare this {@code String} against
-     *
-     * @return  {@code true} if this {@code String} represents the same
-     *          sequence of characters as the specified {@code StringBuffer},
-     *          {@code false} otherwise
-     *
-     * @since  1.4
-     */
-    static boolean contentEquals(String _this, StringBuffer sb) {
-        synchronized (sb) {
-            return contentEquals(_this, (CharSequence) sb);
-        }
-    }
-
-    /**
-     * Compares this string to the specified {@code CharSequence}.  The result
-     * is {@code true} if and only if this {@code String} represents the same
-     * sequence of char values as the specified sequence.
-     *
-     * @param  cs
-     *         The sequence to compare this {@code String} against
-     *
-     * @return  {@code true} if this {@code String} represents the same
-     *          sequence of char values as the specified sequence, {@code
-     *          false} otherwise
-     *
-     * @since  1.5
-     */
-    static boolean contentEquals(String _this, CharSequence cs) {
-        if (_this.length() != cs.length())
-            return false;
-        // Argument is a StringBuffer, StringBuilder
-        if (cs instanceof AbstractStringBuilder) {
-            char v2[] = ((AbstractStringBuilder) cs).getValue();
-            int i = 0;
-            int n = _this.length();
-            while (n-- != 0) {
-                if (_this.charAt(i) != v2[i])
-                    return false;
-                i++;
-            }
-            return true;
-        }
-        // Argument is a String
-        if (cs.equals(_this))
-            return true;
-        // Argument is a generic CharSequence
-        int i = 0;
-        int n = _this.length();
-        while (n-- != 0) {
-            if (_this.charAt(i) != cs.charAt(i))
-                return false;
-            i++;
-        }
-        return true;
-    }
-
-    /**
-     * Compares this {@code String} to another {@code String}, ignoring case
-     * considerations.  Two strings are considered equal ignoring case if they
-     * are of the same length and corresponding characters in the two strings
-     * are equal ignoring case.
-     *
-     * <p> Two characters {@code c1} and {@code c2} are considered the same
-     * ignoring case if at least one of the following is true:
-     * <ul>
-     *   <li> The two characters are the same (as compared by the
-     *        {@code ==} operator)
-     *   <li> Applying the method {@link
-     *        java.lang.Character#toUpperCase(char)} to each character
-     *        produces the same result
-     *   <li> Applying the method {@link
-     *        java.lang.Character#toLowerCase(char)} to each character
-     *        produces the same result
-     * </ul>
-     *
-     * @param  anotherString
-     *         The {@code String} to compare this {@code String} against
-     *
-     * @return  {@code true} if the argument is not {@code null} and it
-     *          represents an equivalent {@code String} ignoring case; {@code
-     *          false} otherwise
-     *
-     * @see  #equals(Object)
-     */
-    static boolean equalsIgnoreCase(String _this, String anotherString) {
-        return (_this == anotherString) ? true
-                : (anotherString != null)
-                && (anotherString.length() == _this.length())
-                && regionMatches(_this, true, 0, anotherString, 0, _this.length());
-    }
-
-    /**
-     * Compares two strings lexicographically.
-     * The comparison is based on the Unicode value of each character in
-     * the strings. The character sequence represented by this
-     * <code>String</code> object is compared lexicographically to the
-     * character sequence represented by the argument string. The result is
-     * a negative integer if this <code>String</code> object
-     * lexicographically precedes the argument string. The result is a
-     * positive integer if this <code>String</code> object lexicographically
-     * follows the argument string. The result is zero if the strings
-     * are equal; <code>compareTo</code> returns <code>0</code> exactly when
-     * the {@link #equals(Object)} method would return <code>true</code>.
-     * <p>
-     * This is the definition of lexicographic ordering. If two strings are
-     * different, then either they have different characters at some index
-     * that is a valid index for both strings, or their lengths are different,
-     * or both. If they have different characters at one or more index
-     * positions, let <i>k</i> be the smallest such index; then the string
-     * whose character at position <i>k</i> has the smaller value, as
-     * determined by using the &lt; operator, lexicographically precedes the
-     * other string. In this case, <code>compareTo</code> returns the
-     * difference of the two character values at position <code>k</code> in
-     * the two string -- that is, the value:
-     * <blockquote><pre>
-     * this.charAt(k)-anotherString.charAt(k)
-     * </pre></blockquote>
-     * If there is no index position at which they differ, then the shorter
-     * string lexicographically precedes the longer string. In this case,
-     * <code>compareTo</code> returns the difference of the lengths of the
-     * strings -- that is, the value:
-     * <blockquote><pre>
-     * this.length()-anotherString.length()
-     * </pre></blockquote>
-     *
-     * @param   anotherString   the <code>String</code> to be compared.
-     * @return  the value <code>0</code> if the argument string is equal to
-     *          this string; a value less than <code>0</code> if this string
-     *          is lexicographically less than the string argument; and a
-     *          value greater than <code>0</code> if this string is
-     *          lexicographically greater than the string argument.
-     */
-    static int compareTo(String _this, String anotherString) {
-        int len = Math.min(_this.length(), anotherString.length());
-        for (int i = 0; i < len; i++)
-        {
-            int diff = _this.charAt(i) - anotherString.charAt(i);
-            if (diff != 0)
-            {
-                return diff;
-            }
-        }
-        return _this.length() - anotherString.length();
-    }
-
-    /**
-     * Compares two strings lexicographically, ignoring case
-     * differences. This method returns an integer whose sign is that of
-     * calling <code>compareTo</code> with normalized versions of the strings
-     * where case differences have been eliminated by calling
-     * <code>Character.toLowerCase(Character.toUpperCase(character))</code> on
-     * each character.
-     * <p>
-     * Note that this method does <em>not</em> take locale into account,
-     * and will result in an unsatisfactory ordering for certain locales.
-     * The java.text package provides <em>collators</em> to allow
-     * locale-sensitive ordering.
-     *
-     * @param   str   the <code>String</code> to be compared.
-     * @return  a negative integer, zero, or a positive integer as the
-     *          specified String is greater than, equal to, or less
-     *          than this String, ignoring case considerations.
-     * @see     java.text.Collator#compare(String, String)
-     * @since   1.2
-     */
-    static int compareToIgnoreCase(String _this, String str) {
-        return String.CASE_INSENSITIVE_ORDER.compare(_this, str);
-    }
-
-    /**
-     * Tests if two string regions are equal.
-     * <p>
-     * A substring of this <tt>String</tt> object is compared to a substring
-     * of the argument other. The result is true if these substrings
-     * represent identical character sequences. The substring of this
-     * <tt>String</tt> object to be compared begins at index <tt>toffset</tt>
-     * and has length <tt>len</tt>. The substring of other to be compared
-     * begins at index <tt>ooffset</tt> and has length <tt>len</tt>. The
-     * result is <tt>false</tt> if and only if at least one of the following
-     * is true:
-     * <ul><li><tt>toffset</tt> is negative.
-     * <li><tt>ooffset</tt> is negative.
-     * <li><tt>toffset+len</tt> is greater than the length of this
-     * <tt>String</tt> object.
-     * <li><tt>ooffset+len</tt> is greater than the length of the other
-     * argument.
-     * <li>There is some nonnegative integer <i>k</i> less than <tt>len</tt>
-     * such that:
-     * <tt>this.charAt(toffset+<i>k</i>)&nbsp;!=&nbsp;other.charAt(ooffset+<i>k</i>)</tt>
-     * </ul>
-     *
-     * @param   toffset   the starting offset of the subregion in this string.
-     * @param   other     the string argument.
-     * @param   ooffset   the starting offset of the subregion in the string
-     *                    argument.
-     * @param   len       the number of characters to compare.
-     * @return  <code>true</code> if the specified subregion of this string
-     *          exactly matches the specified subregion of the string argument;
-     *          <code>false</code> otherwise.
-     */
-    static boolean regionMatches(String _this, int toffset, String other, int ooffset,
-            int len) {
-        int to = toffset;
-        int po = ooffset;
-        // Note: toffset, ooffset, or len might be near -1>>>1.
-        if ((ooffset < 0) || (toffset < 0)
-            || (toffset > (long)_this.length() - len)
-            || (ooffset > (long)other.length() - len)) {
-            return false;
-        }
-        while (len-- > 0) {
-            if (_this.charAt(to++) != other.charAt(po++)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Tests if two string regions are equal.
-     * <p>
-     * A substring of this <tt>String</tt> object is compared to a substring
-     * of the argument <tt>other</tt>. The result is <tt>true</tt> if these
-     * substrings represent character sequences that are the same, ignoring
-     * case if and only if <tt>ignoreCase</tt> is true. The substring of
-     * this <tt>String</tt> object to be compared begins at index
-     * <tt>toffset</tt> and has length <tt>len</tt>. The substring of
-     * <tt>other</tt> to be compared begins at index <tt>ooffset</tt> and
-     * has length <tt>len</tt>. The result is <tt>false</tt> if and only if
-     * at least one of the following is true:
-     * <ul><li><tt>toffset</tt> is negative.
-     * <li><tt>ooffset</tt> is negative.
-     * <li><tt>toffset+len</tt> is greater than the length of this
-     * <tt>String</tt> object.
-     * <li><tt>ooffset+len</tt> is greater than the length of the other
-     * argument.
-     * <li><tt>ignoreCase</tt> is <tt>false</tt> and there is some nonnegative
-     * integer <i>k</i> less than <tt>len</tt> such that:
-     * <blockquote><pre>
-     * this.charAt(toffset+k) != other.charAt(ooffset+k)
-     * </pre></blockquote>
-     * <li><tt>ignoreCase</tt> is <tt>true</tt> and there is some nonnegative
-     * integer <i>k</i> less than <tt>len</tt> such that:
-     * <blockquote><pre>
-     * Character.toLowerCase(this.charAt(toffset+k)) !=
-     Character.toLowerCase(other.charAt(ooffset+k))
-     * </pre></blockquote>
-     * and:
-     * <blockquote><pre>
-     * Character.toUpperCase(this.charAt(toffset+k)) !=
-     *         Character.toUpperCase(other.charAt(ooffset+k))
-     * </pre></blockquote>
-     * </ul>
-     *
-     * @param   ignoreCase   if <code>true</code>, ignore case when comparing
-     *                       characters.
-     * @param   toffset      the starting offset of the subregion in this
-     *                       string.
-     * @param   other        the string argument.
-     * @param   ooffset      the starting offset of the subregion in the string
-     *                       argument.
-     * @param   len          the number of characters to compare.
-     * @return  <code>true</code> if the specified subregion of this string
-     *          matches the specified subregion of the string argument;
-     *          <code>false</code> otherwise. Whether the matching is exact
-     *          or case insensitive depends on the <code>ignoreCase</code>
-     *          argument.
-     */
-    static boolean regionMatches(String _this, boolean ignoreCase, int toffset,
-            String other, int ooffset, int len) {
-        int to = toffset;
-        int po = ooffset;
-        // Note: toffset, ooffset, or len might be near -1>>>1.
-        if ((ooffset < 0) || (toffset < 0)
-               || (toffset > (long)_this.length() - len)
-               || (ooffset > (long)other.length() - len)) {
-            return false;
-        }
-        while (len-- > 0) {
-            char c1 = _this.charAt(to++);
-            char c2 = other.charAt(po++);
-            if (c1 == c2) {
-                continue;
-            }
-            if (ignoreCase) {
-                // If characters don't match but case may be ignored,
-                // try converting both characters to uppercase.
-                // If the results match, then the comparison scan should
-                // continue.
-                char u1 = Character.toUpperCase(c1);
-                char u2 = Character.toUpperCase(c2);
-                if (u1 == u2) {
-                    continue;
-                }
-                // Unfortunately, conversion to uppercase does not work properly
-                // for the Georgian alphabet, which has strange rules about case
-                // conversion.  So we need to make one last check before
-                // exiting.
-                if (Character.toLowerCase(u1) == Character.toLowerCase(u2)) {
-                    continue;
-                }
-            }
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Returns a hash code for this string. The hash code for a
-     * <code>String</code> object is computed as
-     * <blockquote><pre>
-     * s[0]*31^(n-1) + s[1]*31^(n-2) + ... + s[n-1]
-     * </pre></blockquote>
-     * using <code>int</code> arithmetic, where <code>s[i]</code> is the
-     * <i>i</i>th character of the string, <code>n</code> is the length of
-     * the string, and <code>^</code> indicates exponentiation.
-     * (The hash value of the empty string is zero.)
-     *
-     * @return  a hash code value for this object.
-     */
-    static int hashCode(cli.System.String _this) {
-        int h = 0;
-        // NOTE having the get_Length in the for condition is actually faster than hoisting it,
-        // the CLR JIT recognizes this pattern and optimizes the array bounds check in get_Chars.
-        for (int i = 0; i < _this.get_Length(); i++)
-        {
-            h = h * 31 + _this.get_Chars(i);
-        }
-        return h;
-    }
-
-    /**
-     * Returns the index within this string of the first occurrence of
-     * the specified character. If a character with value
-     * <code>ch</code> occurs in the character sequence represented by
-     * this <code>String</code> object, then the index (in Unicode
-     * code units) of the first such occurrence is returned. For
-     * values of <code>ch</code> in the range from 0 to 0xFFFF
-     * (inclusive), this is the smallest value <i>k</i> such that:
-     * <blockquote><pre>
-     * this.charAt(<i>k</i>) == ch
-     * </pre></blockquote>
-     * is true. For other values of <code>ch</code>, it is the
-     * smallest value <i>k</i> such that:
-     * <blockquote><pre>
-     * this.codePointAt(<i>k</i>) == ch
-     * </pre></blockquote>
-     * is true. In either case, if no such character occurs in this
-     * string, then <code>-1</code> is returned.
-     *
-     * @param   ch   a character (Unicode code point).
-     * @return  the index of the first occurrence of the character in the
-     *          character sequence represented by this object, or
-     *          <code>-1</code> if the character does not occur.
-     */
-    static int indexOf(cli.System.String _this, int ch) {
-        return indexOf(_this, ch, 0);
-    }
-
-    /**
-     * Returns the index within this string of the first occurrence of the
-     * specified character, starting the search at the specified index.
-     * <p>
-     * If a character with value <code>ch</code> occurs in the
-     * character sequence represented by this <code>String</code>
-     * object at an index no smaller than <code>fromIndex</code>, then
-     * the index of the first such occurrence is returned. For values
-     * of <code>ch</code> in the range from 0 to 0xFFFF (inclusive),
-     * this is the smallest value <i>k</i> such that:
-     * <blockquote><pre>
-     * (this.charAt(<i>k</i>) == ch) && (<i>k</i> &gt;= fromIndex)
-     * </pre></blockquote>
-     * is true. For other values of <code>ch</code>, it is the
-     * smallest value <i>k</i> such that:
-     * <blockquote><pre>
-     * (this.codePointAt(<i>k</i>) == ch) && (<i>k</i> &gt;= fromIndex)
-     * </pre></blockquote>
-     * is true. In either case, if no such character occurs in this
-     * string at or after position <code>fromIndex</code>, then
-     * <code>-1</code> is returned.
-     *
-     * <p>
-     * There is no restriction on the value of <code>fromIndex</code>. If it
-     * is negative, it has the same effect as if it were zero: this entire
-     * string may be searched. If it is greater than the length of this
-     * string, it has the same effect as if it were equal to the length of
-     * this string: <code>-1</code> is returned.
-     *
-     * <p>All indices are specified in <code>char</code> values
-     * (Unicode code units).
-     *
-     * @param   ch          a character (Unicode code point).
-     * @param   fromIndex   the index to start the search from.
-     * @return  the index of the first occurrence of the character in the
-     *          character sequence represented by this object that is greater
-     *          than or equal to <code>fromIndex</code>, or <code>-1</code>
-     *          if the character does not occur.
-     */
-    static int indexOf(cli.System.String _this, int ch, int fromIndex) {
-        int max = _this.get_Length();
-
-        if (fromIndex < 0) {
-            fromIndex = 0;
-        } else if (fromIndex >= max) {
-            // Note: fromIndex might be near -1>>>1.
-            return -1;
-        }
-
-        int i = fromIndex;
-        if (ch < Character.MIN_SUPPLEMENTARY_CODE_POINT) {
-            // handle most cases here (ch is a BMP code point or a
-            // negative value (invalid code point))
-            for (; i < max ; i++) {
-                if (_this.get_Chars(i) == ch) {
-                    return i;
-                }
-            }
-            return -1;
-        } else {
-            return indexOfSupplementary(_this, ch, fromIndex);
-        }
-    }
-
-    /**
-     * Handles (rare) calls of indexOf with a supplementary character.
-     */
-    private static int indexOfSupplementary(cli.System.String _this, int ch, int fromIndex) {
-        if (Character.isValidCodePoint(ch)) {
-            final char hi = Character.highSurrogate(ch);
-            final char lo = Character.lowSurrogate(ch);
-            final int max = _this.get_Length() - 1;
-            for (int i = fromIndex; i < max; i++) {
-                if (_this.get_Chars(i) == hi && _this.get_Chars(i+1) == lo) {
-                    return i;
-                }
-            }
-        }
-        return -1;
-    }
-
-    /**
-     * Returns the index within this string of the last occurrence of
-     * the specified character. For values of <code>ch</code> in the
-     * range from 0 to 0xFFFF (inclusive), the index (in Unicode code
-     * units) returned is the largest value <i>k</i> such that:
-     * <blockquote><pre>
-     * this.charAt(<i>k</i>) == ch
-     * </pre></blockquote>
-     * is true. For other values of <code>ch</code>, it is the
-     * largest value <i>k</i> such that:
-     * <blockquote><pre>
-     * this.codePointAt(<i>k</i>) == ch
-     * </pre></blockquote>
-     * is true.  In either case, if no such character occurs in this
-     * string, then <code>-1</code> is returned.  The
-     * <code>String</code> is searched backwards starting at the last
-     * character.
-     *
-     * @param   ch   a character (Unicode code point).
-     * @return  the index of the last occurrence of the character in the
-     *          character sequence represented by this object, or
-     *          <code>-1</code> if the character does not occur.
-     */
-    static int lastIndexOf(cli.System.String _this, int ch) {
-        return lastIndexOf(_this, ch, _this.get_Length() - 1);
-    }
-
-    /**
-     * Returns the index within this string of the last occurrence of
-     * the specified character, searching backward starting at the
-     * specified index. For values of <code>ch</code> in the range
-     * from 0 to 0xFFFF (inclusive), the index returned is the largest
-     * value <i>k</i> such that:
-     * <blockquote><pre>
-     * (this.charAt(<i>k</i>) == ch) && (<i>k</i> &lt;= fromIndex)
-     * </pre></blockquote>
-     * is true. For other values of <code>ch</code>, it is the
-     * largest value <i>k</i> such that:
-     * <blockquote><pre>
-     * (this.codePointAt(<i>k</i>) == ch) && (<i>k</i> &lt;= fromIndex)
-     * </pre></blockquote>
-     * is true. In either case, if no such character occurs in this
-     * string at or before position <code>fromIndex</code>, then
-     * <code>-1</code> is returned.
-     *
-     * <p>All indices are specified in <code>char</code> values
-     * (Unicode code units).
-     *
-     * @param   ch          a character (Unicode code point).
-     * @param   fromIndex   the index to start the search from. There is no
-     *          restriction on the value of <code>fromIndex</code>. If it is
-     *          greater than or equal to the length of this string, it has
-     *          the same effect as if it were equal to one less than the
-     *          length of this string: this entire string may be searched.
-     *          If it is negative, it has the same effect as if it were -1:
-     *          -1 is returned.
-     * @return  the index of the last occurrence of the character in the
-     *          character sequence represented by this object that is less
-     *          than or equal to <code>fromIndex</code>, or <code>-1</code>
-     *          if the character does not occur before that point.
-     */
-    static int lastIndexOf(cli.System.String _this, int ch, int fromIndex) {
-        if (ch < Character.MIN_SUPPLEMENTARY_CODE_POINT) {
-            // handle most cases here (ch is a BMP code point or a
-            // negative value (invalid code point))
-            int i = Math.min(fromIndex, _this.get_Length() - 1);
-            for (; i >= 0; i--) {
-                if (_this.get_Chars(i) == ch) {
-                    return i;
-                }
-            }
-            return -1;
-        } else {
-            return lastIndexOfSupplementary(_this, ch, fromIndex);
-        }
-    }
-
-    /**
-     * Handles (rare) calls of lastIndexOf with a supplementary character.
-     */
-    private static int lastIndexOfSupplementary(cli.System.String _this, int ch, int fromIndex) {
-        if (Character.isValidCodePoint(ch)) {
-            char hi = Character.highSurrogate(ch);
-            char lo = Character.lowSurrogate(ch);
-            int i = Math.min(fromIndex, _this.get_Length() - 2);
-            for (; i >= 0; i--) {
-                if (_this.get_Chars(i) == hi && _this.get_Chars(i+1) == lo) {
-                    return i;
-                }
-            }
-        }
-        return -1;
-    }
-
-    /**
-     * Returns the index within this string of the first occurrence of the
-     * specified substring.
-     *
-     * <p>The returned index is the smallest value <i>k</i> for which:
-     * <blockquote><pre>
-     * this.startsWith(str, <i>k</i>)
-     * </pre></blockquote>
-     * If no such value of <i>k</i> exists, then {@code -1} is returned.
-     *
-     * @param   str   the substring to search for.
-     * @return  the index of the first occurrence of the specified substring,
-     *          or {@code -1} if there is no such occurrence.
-     */
-    static int indexOf(String _this, String str) {
-        return indexOf(_this, str, 0);
-    }
-
-    /**
-     * Returns the index within this string of the first occurrence of the
-     * specified substring, starting at the specified index.
-     *
-     * <p>The returned index is the smallest value <i>k</i> for which:
-     * <blockquote><pre>
-     * <i>k</i> &gt;= fromIndex && this.startsWith(str, <i>k</i>)
-     * </pre></blockquote>
-     * If no such value of <i>k</i> exists, then {@code -1} is returned.
-     *
-     * @param   str         the substring to search for.
-     * @param   fromIndex   the index from which to start the search.
-     * @return  the index of the first occurrence of the specified substring,
-     *          starting at the specified index,
-     *          or {@code -1} if there is no such occurrence.
-     */
-    static int indexOf(String _this, String str, int fromIndex) {
-        // start by dereferencing _this, to make sure we throw a NullPointerException if _this is null
-        int slen = _this.length();
-        int olen = str.length();
-        if (olen == 0)
-        {
-            return Math.max(0, Math.min(fromIndex, slen));
-        }
-        if (olen > slen)
-        {
-            return -1;
-        }
-        char firstChar = str.charAt(0);
-        // Java allows fromIndex to both below zero or above the length of the string, .NET doesn't
-        int index = Math.max(0, Math.min(slen, fromIndex));
-        int end = slen - olen;
-        while (index >= 0 && index <= end)
-        {
-            if (cli.System.String.CompareOrdinal(_this, index, str, 0, olen) == 0)
-            {
-                return index;
-            }
-            index = _this.indexOf(firstChar, index + 1);
-        }
-        return -1;
-    }
-
-    /**
-     * Code shared by String and StringBuffer to do searches. The
-     * source is the character array being searched, and the target
-     * is the string being searched for.
-     *
-     * @param   source       the characters being searched.
-     * @param   sourceOffset offset of the source string.
-     * @param   sourceCount  count of the source string.
-     * @param   target       the characters being searched for.
-     * @param   targetOffset offset of the target string.
-     * @param   targetCount  count of the target string.
-     * @param   fromIndex    the index to begin searching from.
-     */
-    static int indexOf(char[] source, int sourceOffset, int sourceCount,
-            char[] target, int targetOffset, int targetCount,
-            int fromIndex) {
-        if (fromIndex >= sourceCount) {
-            return (targetCount == 0 ? sourceCount : -1);
-        }
-        if (fromIndex < 0) {
-            fromIndex = 0;
-        }
-        if (targetCount == 0) {
-            return fromIndex;
-        }
-
-        char first = target[targetOffset];
-        int max = sourceOffset + (sourceCount - targetCount);
-
-        for (int i = sourceOffset + fromIndex; i <= max; i++) {
-            /* Look for first character. */
-            if (source[i] != first) {
-                while (++i <= max && source[i] != first);
-            }
-
-            /* Found first character, now look at the rest of v2 */
-            if (i <= max) {
-                int j = i + 1;
-                int end = j + targetCount - 1;
-                for (int k = targetOffset + 1; j < end && source[j]
-                        == target[k]; j++, k++);
-
-                if (j == end) {
-                    /* Found whole string. */
-                    return i - sourceOffset;
-                }
-            }
-        }
-        return -1;
-    }
-
-    /**
-     * Returns the index within this string of the last occurrence of the
-     * specified substring.  The last occurrence of the empty string ""
-     * is considered to occur at the index value {@code this.length()}.
-     *
-     * <p>The returned index is the largest value <i>k</i> for which:
-     * <blockquote><pre>
-     * this.startsWith(str, <i>k</i>)
-     * </pre></blockquote>
-     * If no such value of <i>k</i> exists, then {@code -1} is returned.
-     *
-     * @param   str   the substring to search for.
-     * @return  the index of the last occurrence of the specified substring,
-     *          or {@code -1} if there is no such occurrence.
-     */
-    static int lastIndexOf(String _this, String str) {
-        return lastIndexOf(_this, str, _this.length());
-    }
-
-    /**
-     * Returns the index within this string of the last occurrence of the
-     * specified substring, searching backward starting at the specified index.
-     *
-     * <p>The returned index is the largest value <i>k</i> for which:
-     * <blockquote><pre>
-     * <i>k</i> &lt;= fromIndex && this.startsWith(str, <i>k</i>)
-     * </pre></blockquote>
-     * If no such value of <i>k</i> exists, then {@code -1} is returned.
-     *
-     * @param   str         the substring to search for.
-     * @param   fromIndex   the index to start the search from.
-     * @return  the index of the last occurrence of the specified substring,
-     *          searching backward from the specified index,
-     *          or {@code -1} if there is no such occurrence.
-     */
-    static int lastIndexOf(String _this, String str, int fromIndex) {
-        // start by dereferencing s, to make sure we throw a NullPointerException if s is null
-        int slen = _this.length();
-        if (fromIndex < 0)
-        {
-            return -1;
-        }
-        int olen = str.length();
-        if (olen == 0)
-        {
-            return Math.min(slen, fromIndex);
-        }
-        if (olen > slen)
-        {
-            return -1;
-        }
-        cli.System.String cliStr = (cli.System.String)(Object)_this;
-        char firstChar = str.charAt(0);
-        // Java allows fromIndex to both below zero or above the length of the string, .NET doesn't
-        int index = Math.max(0, Math.min(slen - olen, fromIndex));
-        while (index > 0)
-        {
-            if (cli.System.String.CompareOrdinal(_this, index, str, 0, olen) == 0)
-            {
-                return index;
-            }
-            index = cliStr.LastIndexOf(firstChar, index - 1);
-        }
-        return cli.System.String.CompareOrdinal(_this, 0, str, 0, olen) == 0 ? 0 : -1;
-    }
-
-    /**
-     * Code shared by String and StringBuffer to do searches. The
-     * source is the character array being searched, and the target
-     * is the string being searched for.
-     *
-     * @param   source       the characters being searched.
-     * @param   sourceOffset offset of the source string.
-     * @param   sourceCount  count of the source string.
-     * @param   target       the characters being searched for.
-     * @param   targetOffset offset of the target string.
-     * @param   targetCount  count of the target string.
-     * @param   fromIndex    the index to begin searching from.
-     */
-    static int lastIndexOf(char[] source, int sourceOffset, int sourceCount,
-            char[] target, int targetOffset, int targetCount,
-            int fromIndex) {
-        /*
-         * Check arguments; return immediately where possible. For
-         * consistency, don't check for null str.
-         */
-        int rightIndex = sourceCount - targetCount;
-        if (fromIndex < 0) {
-            return -1;
-        }
-        if (fromIndex > rightIndex) {
-            fromIndex = rightIndex;
-        }
-        /* Empty string always matches. */
-        if (targetCount == 0) {
-            return fromIndex;
-        }
-
-        int strLastIndex = targetOffset + targetCount - 1;
-        char strLastChar = target[strLastIndex];
-        int min = sourceOffset + targetCount - 1;
-        int i = min + fromIndex;
-
-        startSearchForLastChar:
-        while (true) {
-            while (i >= min && source[i] != strLastChar) {
-                i--;
-            }
-            if (i < min) {
-                return -1;
-            }
-            int j = i - 1;
-            int start = j - (targetCount - 1);
-            int k = strLastIndex - 1;
-
-            while (j > start) {
-                if (source[j--] != target[k--]) {
-                    i--;
-                    continue startSearchForLastChar;
-                }
-            }
-            return start - sourceOffset + 1;
-        }
-    }
-
-    /**
-     * Returns a new string that is a substring of this string. The
-     * substring begins at the specified <code>beginIndex</code> and
-     * extends to the character at index <code>endIndex - 1</code>.
-     * Thus the length of the substring is <code>endIndex-beginIndex</code>.
-     * <p>
-     * Examples:
-     * <blockquote><pre>
-     * "hamburger".substring(4, 8) returns "urge"
-     * "smiles".substring(1, 5) returns "mile"
-     * </pre></blockquote>
-     *
-     * @param      beginIndex   the beginning index, inclusive.
-     * @param      endIndex     the ending index, exclusive.
-     * @return     the specified substring.
-     * @exception  IndexOutOfBoundsException  if the
-     *             <code>beginIndex</code> is negative, or
-     *             <code>endIndex</code> is larger than the length of
-     *             this <code>String</code> object, or
-     *             <code>beginIndex</code> is larger than
-     *             <code>endIndex</code>.
-     */
-    static String substring(cli.System.String _this, int beginIndex, int endIndex) {
-        if (beginIndex < 0) {
-            throw new StringIndexOutOfBoundsException(beginIndex);
-        }
-        if (endIndex > _this.get_Length()) {
-            throw new StringIndexOutOfBoundsException(endIndex);
-        }
-        int subLen = endIndex - beginIndex;
-        if (subLen < 0) {
-            throw new StringIndexOutOfBoundsException(subLen);
-        }
-        return ((beginIndex == 0) && (endIndex == _this.get_Length())) ? (String)(Object)_this
-                : _this.Substring(beginIndex, subLen);
-    }
-
-    /**
-     * Concatenates the specified string to the end of this string.
-     * <p>
-     * If the length of the argument string is <code>0</code>, then this
-     * <code>String</code> object is returned. Otherwise, a new
-     * <code>String</code> object is created, representing a character
-     * sequence that is the concatenation of the character sequence
-     * represented by this <code>String</code> object and the character
-     * sequence represented by the argument string.<p>
-     * Examples:
-     * <blockquote><pre>
-     * "cares".concat("s") returns "caress"
-     * "to".concat("get").concat("her") returns "together"
-     * </pre></blockquote>
-     *
-     * @param   str   the <code>String</code> that is concatenated to the end
-     *                of this <code>String</code>.
-     * @return  a string that represents the concatenation of this object's
-     *          characters followed by the string argument's characters.
-     */
-    static String concat(String _this, String str) {
-        int otherLen = str.length();
-        if (otherLen == 0) {
-            return _this;
-        }
-        return cli.System.String.Concat(_this, str);
-    }
-
-    /**
-     * Returns a new string resulting from replacing all occurrences of
-     * <code>oldChar</code> in this string with <code>newChar</code>.
-     * <p>
-     * If the character <code>oldChar</code> does not occur in the
-     * character sequence represented by this <code>String</code> object,
-     * then a reference to this <code>String</code> object is returned.
-     * Otherwise, a new <code>String</code> object is created that
-     * represents a character sequence identical to the character sequence
-     * represented by this <code>String</code> object, except that every
-     * occurrence of <code>oldChar</code> is replaced by an occurrence
-     * of <code>newChar</code>.
-     * <p>
-     * Examples:
-     * <blockquote><pre>
-     * "mesquite in your cellar".replace('e', 'o')
-     *         returns "mosquito in your collar"
-     * "the war of baronets".replace('r', 'y')
-     *         returns "the way of bayonets"
-     * "sparring with a purple porpoise".replace('p', 't')
-     *         returns "starring with a turtle tortoise"
-     * "JonL".replace('q', 'x') returns "JonL" (no change)
-     * </pre></blockquote>
-     *
-     * @param   oldChar   the old character.
-     * @param   newChar   the new character.
-     * @return  a string derived from this string by replacing every
-     *          occurrence of <code>oldChar</code> with <code>newChar</code>.
-     */
-    static String replace(String _this, char oldChar, char newChar) {
-        if (oldChar != newChar) {
-            int len = _this.length();
-            int i = -1;
-
-            while (++i < len) {
-                if (_this.charAt(i) == oldChar) {
-                    break;
-                }
-            }
-            if (i < len) {
-                char buf[] = new char[len];
-                for (int j = 0 ; j < i ; j++) {
-                    buf[j] = _this.charAt(j);
-                }
-                while (i < len) {
-                    char c = _this.charAt(i);
-                    buf[i] = (c == oldChar) ? newChar : c;
-                    i++;
-                }
-                return new String(buf, true);
-            }
-        }
-        return _this;
-    }
-
-    /**
-     * Returns true if and only if this string contains the specified
-     * sequence of char values.
-     *
-     * @param s the sequence to search for
-     * @return true if this string contains <code>s</code>, false otherwise
-     * @throws NullPointerException if <code>s</code> is <code>null</code>
-     * @since 1.5
-     */
-    static boolean contains(String _this, CharSequence s) {
-        return indexOf(_this, s.toString()) > -1;
-    }
-
-    /**
-     * Replaces each substring of this string that matches the literal target
-     * sequence with the specified literal replacement sequence. The
-     * replacement proceeds from the beginning of the string to the end, for
-     * example, replacing "aa" with "b" in the string "aaa" will result in
-     * "ba" rather than "ab".
-     *
-     * @param  target The sequence of char values to be replaced
-     * @param  replacement The replacement sequence of char values
-     * @return  The resulting string
-     * @throws NullPointerException if <code>target</code> or
-     *         <code>replacement</code> is <code>null</code>.
-     * @since 1.5
-     */
-    static String replace(String _this, CharSequence target, CharSequence replacement) {
-        return Pattern.compile(target.toString(), Pattern.LITERAL).matcher(
-            _this).replaceAll(Matcher.quoteReplacement(replacement.toString()));
-    }
-
-    /**
-     * Splits this string around matches of the given
-     * <a href="../util/regex/Pattern.html#sum">regular expression</a>.
-     *
-     * <p> The array returned by this method contains each substring of this
-     * string that is terminated by another substring that matches the given
-     * expression or is terminated by the end of the string.  The substrings in
-     * the array are in the order in which they occur in this string.  If the
-     * expression does not match any part of the input then the resulting array
-     * has just one element, namely this string.
-     *
-     * <p> The <tt>limit</tt> parameter controls the number of times the
-     * pattern is applied and therefore affects the length of the resulting
-     * array.  If the limit <i>n</i> is greater than zero then the pattern
-     * will be applied at most <i>n</i>&nbsp;-&nbsp;1 times, the array's
-     * length will be no greater than <i>n</i>, and the array's last entry
-     * will contain all input beyond the last matched delimiter.  If <i>n</i>
-     * is non-positive then the pattern will be applied as many times as
-     * possible and the array can have any length.  If <i>n</i> is zero then
-     * the pattern will be applied as many times as possible, the array can
-     * have any length, and trailing empty strings will be discarded.
-     *
-     * <p> The string <tt>"boo:and:foo"</tt>, for example, yields the
-     * following results with these parameters:
-     *
-     * <blockquote><table cellpadding=1 cellspacing=0 summary="Split example showing regex, limit, and result">
-     * <tr>
-     *     <th>Regex</th>
-     *     <th>Limit</th>
-     *     <th>Result</th>
-     * </tr>
-     * <tr><td align=center>:</td>
-     *     <td align=center>2</td>
-     *     <td><tt>{ "boo", "and:foo" }</tt></td></tr>
-     * <tr><td align=center>:</td>
-     *     <td align=center>5</td>
-     *     <td><tt>{ "boo", "and", "foo" }</tt></td></tr>
-     * <tr><td align=center>:</td>
-     *     <td align=center>-2</td>
-     *     <td><tt>{ "boo", "and", "foo" }</tt></td></tr>
-     * <tr><td align=center>o</td>
-     *     <td align=center>5</td>
-     *     <td><tt>{ "b", "", ":and:f", "", "" }</tt></td></tr>
-     * <tr><td align=center>o</td>
-     *     <td align=center>-2</td>
-     *     <td><tt>{ "b", "", ":and:f", "", "" }</tt></td></tr>
-     * <tr><td align=center>o</td>
-     *     <td align=center>0</td>
-     *     <td><tt>{ "b", "", ":and:f" }</tt></td></tr>
-     * </table></blockquote>
-     *
-     * <p> An invocation of this method of the form
-     * <i>str.</i><tt>split(</tt><i>regex</i><tt>,</tt>&nbsp;<i>n</i><tt>)</tt>
-     * yields the same result as the expression
-     *
-     * <blockquote>
-     * {@link java.util.regex.Pattern}.{@link java.util.regex.Pattern#compile
-     * compile}<tt>(</tt><i>regex</i><tt>)</tt>.{@link
-     * java.util.regex.Pattern#split(java.lang.CharSequence,int)
-     * split}<tt>(</tt><i>str</i><tt>,</tt>&nbsp;<i>n</i><tt>)</tt>
-     * </blockquote>
-     *
-     *
-     * @param  regex
-     *         the delimiting regular expression
-     *
-     * @param  limit
-     *         the result threshold, as described above
-     *
-     * @return  the array of strings computed by splitting this string
-     *          around matches of the given regular expression
-     *
-     * @throws  PatternSyntaxException
-     *          if the regular expression's syntax is invalid
-     *
-     * @see java.util.regex.Pattern
-     *
-     * @since 1.4
-     * @spec JSR-51
-     */
-    static String[] split(String _this, String regex, int limit) {
-        /* fastpath if the regex is a
-         (1)one-char String and this character is not one of the
-            RegEx's meta characters ".$|()[{^?*+\\", or
-         (2)two-char String and the first char is the backslash and
-            the second is not the ascii digit or ascii letter.
-         */
-        char ch = 0;
-        if (((regex.length() == 1 &&
-             ".$|()[{^?*+\\".indexOf(ch = regex.charAt(0)) == -1) ||
-             (regex.length() == 2 &&
-              regex.charAt(0) == '\\' &&
-              (((ch = regex.charAt(1))-'0')|('9'-ch)) < 0 &&
-              ((ch-'a')|('z'-ch)) < 0 &&
-              ((ch-'A')|('Z'-ch)) < 0)) &&
-            (ch < Character.MIN_HIGH_SURROGATE ||
-             ch > Character.MAX_LOW_SURROGATE))
-        {
-            int off = 0;
-            int next = 0;
-            boolean limited = limit > 0;
-            ArrayList<String> list = new ArrayList<>();
-            while ((next = _this.indexOf(ch, off)) != -1) {
-                if (!limited || list.size() < limit - 1) {
-                    list.add(_this.substring(off, next));
-                    off = next + 1;
-                } else {    // last one
-                    //assert (list.size() == limit - 1);
-                    list.add(_this.substring(off, _this.length()));
-                    off = _this.length();
-                    break;
-                }
-            }
-            // If no match was found, return this
-            if (off == 0)
-                return new String[]{_this};
-
-            // Add remaining segment
-            if (!limited || list.size() < limit)
-                list.add(_this.substring(off, _this.length()));
-
-            // Construct result
-            int resultSize = list.size();
-            if (limit == 0)
-                while (resultSize > 0 && list.get(resultSize - 1).length() == 0)
-                    resultSize--;
-            String[] result = new String[resultSize];
-            return list.subList(0, resultSize).toArray(result);
-        }
-        return Pattern.compile(regex).split(_this, limit);
-    }
-
-    /**
-     * Converts all of the characters in this <code>String</code> to lower
-     * case using the rules of the given <code>Locale</code>.  Case mapping is based
-     * on the Unicode Standard version specified by the {@link java.lang.Character Character}
-     * class. Since case mappings are not always 1:1 char mappings, the resulting
-     * <code>String</code> may be a different length than the original <code>String</code>.
-     * <p>
-     * Examples of lowercase  mappings are in the following table:
-     * <table border="1" summary="Lowercase mapping examples showing language code of locale, upper case, lower case, and description">
-     * <tr>
-     *   <th>Language Code of Locale</th>
-     *   <th>Upper Case</th>
-     *   <th>Lower Case</th>
-     *   <th>Description</th>
-     * </tr>
-     * <tr>
-     *   <td>tr (Turkish)</td>
-     *   <td>&#92;u0130</td>
-     *   <td>&#92;u0069</td>
-     *   <td>capital letter I with dot above -&gt; small letter i</td>
-     * </tr>
-     * <tr>
-     *   <td>tr (Turkish)</td>
-     *   <td>&#92;u0049</td>
-     *   <td>&#92;u0131</td>
-     *   <td>capital letter I -&gt; small letter dotless i </td>
-     * </tr>
-     * <tr>
-     *   <td>(all)</td>
-     *   <td>French Fries</td>
-     *   <td>french fries</td>
-     *   <td>lowercased all chars in String</td>
-     * </tr>
-     * <tr>
-     *   <td>(all)</td>
-     *   <td><img src="doc-files/capiota.gif" alt="capiota"><img src="doc-files/capchi.gif" alt="capchi">
-     *       <img src="doc-files/captheta.gif" alt="captheta"><img src="doc-files/capupsil.gif" alt="capupsil">
-     *       <img src="doc-files/capsigma.gif" alt="capsigma"></td>
-     *   <td><img src="doc-files/iota.gif" alt="iota"><img src="doc-files/chi.gif" alt="chi">
-     *       <img src="doc-files/theta.gif" alt="theta"><img src="doc-files/upsilon.gif" alt="upsilon">
-     *       <img src="doc-files/sigma1.gif" alt="sigma"></td>
-     *   <td>lowercased all chars in String</td>
-     * </tr>
-     * </table>
-     *
-     * @param locale use the case transformation rules for this locale
-     * @return the <code>String</code>, converted to lowercase.
-     * @see     java.lang.String#toLowerCase()
-     * @see     java.lang.String#toUpperCase()
-     * @see     java.lang.String#toUpperCase(Locale)
-     * @since   1.1
-     */
-    static String toLowerCase(String _this, Locale locale) {
-        if (locale == null) {
-            throw new NullPointerException();
-        }
-
-        int firstUpper;
-        final int len = _this.length();
-
-        /* Now check if there are any characters that need to be changed. */
-        scan: {
-            for (firstUpper = 0 ; firstUpper < len; ) {
-                char c = _this.charAt(firstUpper);
-                if ((c >= Character.MIN_HIGH_SURROGATE)
-                        && (c <= Character.MAX_HIGH_SURROGATE)) {
-                    int supplChar = _this.codePointAt(firstUpper);
-                    if (supplChar != Character.toLowerCase(supplChar)) {
-                        break scan;
-                    }
-                    firstUpper += Character.charCount(supplChar);
-                } else {
-                    if (c != Character.toLowerCase(c)) {
-                        break scan;
-                    }
-                    firstUpper++;
-                }
-            }
-            return _this;
-        }
-
-        char[] result = new char[len];
-        int resultOffset = 0;  /* result may grow, so i+resultOffset
-                                * is the write location in result */
-
-        /* Just copy the first few lowerCase characters. */
-        _this.getChars(0, firstUpper, result, 0);
-
-        String lang = locale.getLanguage();
-        boolean localeDependent =
-                (lang == "tr" || lang == "az" || lang == "lt");
-        char[] lowerCharArray;
-        int lowerChar;
-        int srcChar;
-        int srcCount;
-        for (int i = firstUpper; i < len; i += srcCount) {
-            srcChar = (int)_this.charAt(i);
-            if ((char)srcChar >= Character.MIN_HIGH_SURROGATE
-                    && (char)srcChar <= Character.MAX_HIGH_SURROGATE) {
-                srcChar = _this.codePointAt(i);
-                srcCount = Character.charCount(srcChar);
-            } else {
-                srcCount = 1;
-            }
-            if (localeDependent || srcChar == '\u03A3') { // GREEK CAPITAL LETTER SIGMA
-                lowerChar = ConditionalSpecialCasing.toLowerCaseEx(_this, i, locale);
-            } else if (srcChar == '\u0130') { // LATIN CAPITAL LETTER I DOT
-                lowerChar = Character.ERROR;
-            } else {
-                lowerChar = Character.toLowerCase(srcChar);
-            }
-            if ((lowerChar == Character.ERROR)
-                    || (lowerChar >= Character.MIN_SUPPLEMENTARY_CODE_POINT)) {
-                if (lowerChar == Character.ERROR) {
-                    if (!localeDependent && srcChar == '\u0130') {
-                        lowerCharArray =
-                                ConditionalSpecialCasing.toLowerCaseCharArray(_this, i, Locale.ENGLISH);
-                    } else {
-                        lowerCharArray =
-                                ConditionalSpecialCasing.toLowerCaseCharArray(_this, i, locale);
-                    }
-                } else if (srcCount == 2) {
-                    resultOffset += Character.toChars(lowerChar, result, i + resultOffset) - srcCount;
-                    continue;
-                } else {
-                    lowerCharArray = Character.toChars(lowerChar);
-                }
-
-                /* Grow result if needed */
-                int mapLen = lowerCharArray.length;
-                if (mapLen > srcCount) {
-                    char[] result2 = new char[result.length + mapLen - srcCount];
-                    System.arraycopy(result, 0, result2, 0, i + resultOffset);
-                    result = result2;
-                }
-                for (int x = 0; x < mapLen; ++x) {
-                    result[i + resultOffset + x] = lowerCharArray[x];
-                }
-                resultOffset += (mapLen - srcCount);
-            } else {
-                result[i + resultOffset] = (char)lowerChar;
-            }
-        }
-        return new String(result, 0, len + resultOffset);
-    }
-
-    /**
-     * Converts all of the characters in this <code>String</code> to lower
-     * case using the rules of the default locale. This is equivalent to calling
-     * <code>toLowerCase(Locale.getDefault())</code>.
-     * <p>
-     * <b>Note:</b> This method is locale sensitive, and may produce unexpected
-     * results if used for strings that are intended to be interpreted locale
-     * independently.
-     * Examples are programming language identifiers, protocol keys, and HTML
-     * tags.
-     * For instance, <code>"TITLE".toLowerCase()</code> in a Turkish locale
-     * returns <code>"t\u005Cu0131tle"</code>, where '\u005Cu0131' is the
-     * LATIN SMALL LETTER DOTLESS I character.
-     * To obtain correct results for locale insensitive strings, use
-     * <code>toLowerCase(Locale.ENGLISH)</code>.
-     * <p>
-     * @return  the <code>String</code>, converted to lowercase.
-     * @see     java.lang.String#toLowerCase(Locale)
-     */
-    static String toLowerCase(String _this) {
-        return toLowerCase(_this, Locale.getDefault());
-    }
-
-    /**
-     * Converts all of the characters in this <code>String</code> to upper
-     * case using the rules of the given <code>Locale</code>. Case mapping is based
-     * on the Unicode Standard version specified by the {@link java.lang.Character Character}
-     * class. Since case mappings are not always 1:1 char mappings, the resulting
-     * <code>String</code> may be a different length than the original <code>String</code>.
-     * <p>
-     * Examples of locale-sensitive and 1:M case mappings are in the following table.
-     * <p>
-     * <table border="1" summary="Examples of locale-sensitive and 1:M case mappings. Shows Language code of locale, lower case, upper case, and description.">
-     * <tr>
-     *   <th>Language Code of Locale</th>
-     *   <th>Lower Case</th>
-     *   <th>Upper Case</th>
-     *   <th>Description</th>
-     * </tr>
-     * <tr>
-     *   <td>tr (Turkish)</td>
-     *   <td>&#92;u0069</td>
-     *   <td>&#92;u0130</td>
-     *   <td>small letter i -&gt; capital letter I with dot above</td>
-     * </tr>
-     * <tr>
-     *   <td>tr (Turkish)</td>
-     *   <td>&#92;u0131</td>
-     *   <td>&#92;u0049</td>
-     *   <td>small letter dotless i -&gt; capital letter I</td>
-     * </tr>
-     * <tr>
-     *   <td>(all)</td>
-     *   <td>&#92;u00df</td>
-     *   <td>&#92;u0053 &#92;u0053</td>
-     *   <td>small letter sharp s -&gt; two letters: SS</td>
-     * </tr>
-     * <tr>
-     *   <td>(all)</td>
-     *   <td>Fahrvergn&uuml;gen</td>
-     *   <td>FAHRVERGN&Uuml;GEN</td>
-     *   <td></td>
-     * </tr>
-     * </table>
-     * @param locale use the case transformation rules for this locale
-     * @return the <code>String</code>, converted to uppercase.
-     * @see     java.lang.String#toUpperCase()
-     * @see     java.lang.String#toLowerCase()
-     * @see     java.lang.String#toLowerCase(Locale)
-     * @since   1.1
-     */
-    static String toUpperCase(String _this, Locale locale) {
-        if (locale == null) {
-            throw new NullPointerException();
-        }
-
-        int firstLower;
-        final int len = _this.length();
-
-        /* Now check if there are any characters that need to be changed. */
-        scan: {
-           for (firstLower = 0 ; firstLower < len; ) {
-                int c = (int)_this.charAt(firstLower);
-                int srcCount;
-                if ((c >= Character.MIN_HIGH_SURROGATE)
-                        && (c <= Character.MAX_HIGH_SURROGATE)) {
-                    c = _this.codePointAt(firstLower);
-                    srcCount = Character.charCount(c);
-                } else {
-                    srcCount = 1;
-                }
-                int upperCaseChar = Character.toUpperCaseEx(c);
-                if ((upperCaseChar == Character.ERROR)
-                        || (c != upperCaseChar)) {
-                    break scan;
-                }
-                firstLower += srcCount;
-            }
-            return _this;
-        }
-
-        char[] result = new char[len]; /* may grow */
-        int resultOffset = 0;  /* result may grow, so i+resultOffset
-         * is the write location in result */
-
-        /* Just copy the first few upperCase characters. */
-        _this.getChars(0, firstLower, result, 0);
-
-        String lang = locale.getLanguage();
-        boolean localeDependent =
-                (lang == "tr" || lang == "az" || lang == "lt");
-        char[] upperCharArray;
-        int upperChar;
-        int srcChar;
-        int srcCount;
-        for (int i = firstLower; i < len; i += srcCount) {
-            srcChar = (int)_this.charAt(i);
-            if ((char)srcChar >= Character.MIN_HIGH_SURROGATE &&
-                (char)srcChar <= Character.MAX_HIGH_SURROGATE) {
-                srcChar = _this.codePointAt(i);
-                srcCount = Character.charCount(srcChar);
-            } else {
-                srcCount = 1;
-            }
-            if (localeDependent) {
-                upperChar = ConditionalSpecialCasing.toUpperCaseEx(_this, i, locale);
-            } else {
-                upperChar = Character.toUpperCaseEx(srcChar);
-            }
-            if ((upperChar == Character.ERROR)
-                    || (upperChar >= Character.MIN_SUPPLEMENTARY_CODE_POINT)) {
-                if (upperChar == Character.ERROR) {
-                    if (localeDependent) {
-                        upperCharArray =
-                                ConditionalSpecialCasing.toUpperCaseCharArray(_this, i, locale);
-                    } else {
-                        upperCharArray = Character.toUpperCaseCharArray(srcChar);
-                    }
-                } else if (srcCount == 2) {
-                    resultOffset += Character.toChars(upperChar, result, i + resultOffset) - srcCount;
-                    continue;
-                } else {
-                    upperCharArray = Character.toChars(upperChar);
-                }
-
-                /* Grow result if needed */
-                int mapLen = upperCharArray.length;
-                if (mapLen > srcCount) {
-                    char[] result2 = new char[result.length + mapLen - srcCount];
-                    System.arraycopy(result, 0, result2, 0, i + resultOffset);
-                    result = result2;
-                }
-                for (int x = 0; x < mapLen; ++x) {
-                    result[i + resultOffset + x] = upperCharArray[x];
-                }
-                resultOffset += (mapLen - srcCount);
-            } else {
-                result[i + resultOffset] = (char)upperChar;
-            }
-        }
-        return new String(result, 0, len + resultOffset);
-    }
-
-    /**
-     * Converts all of the characters in this <code>String</code> to upper
-     * case using the rules of the default locale. This method is equivalent to
-     * <code>toUpperCase(Locale.getDefault())</code>.
-     * <p>
-     * <b>Note:</b> This method is locale sensitive, and may produce unexpected
-     * results if used for strings that are intended to be interpreted locale
-     * independently.
-     * Examples are programming language identifiers, protocol keys, and HTML
-     * tags.
-     * For instance, <code>"title".toUpperCase()</code> in a Turkish locale
-     * returns <code>"T\u005Cu0130TLE"</code>, where '\u005Cu0130' is the
-     * LATIN CAPITAL LETTER I WITH DOT ABOVE character.
-     * To obtain correct results for locale insensitive strings, use
-     * <code>toUpperCase(Locale.ENGLISH)</code>.
-     * <p>
-     * @return  the <code>String</code>, converted to uppercase.
-     * @see     java.lang.String#toUpperCase(Locale)
-     */
-    static String toUpperCase(String _this) {
-        return toUpperCase(_this, Locale.getDefault());
-    }
-
-    /**
-     * Returns a copy of the string, with leading and trailing whitespace
-     * omitted.
-     * <p>
-     * If this <code>String</code> object represents an empty character
-     * sequence, or the first and last characters of character sequence
-     * represented by this <code>String</code> object both have codes
-     * greater than <code>'&#92;u0020'</code> (the space character), then a
-     * reference to this <code>String</code> object is returned.
-     * <p>
-     * Otherwise, if there is no character with a code greater than
-     * <code>'&#92;u0020'</code> in the string, then a new
-     * <code>String</code> object representing an empty string is created
-     * and returned.
-     * <p>
-     * Otherwise, let <i>k</i> be the index of the first character in the
-     * string whose code is greater than <code>'&#92;u0020'</code>, and let
-     * <i>m</i> be the index of the last character in the string whose code
-     * is greater than <code>'&#92;u0020'</code>. A new <code>String</code>
-     * object is created, representing the substring of this string that
-     * begins with the character at index <i>k</i> and ends with the
-     * character at index <i>m</i>-that is, the result of
-     * <code>this.substring(<i>k</i>,&nbsp;<i>m</i>+1)</code>.
-     * <p>
-     * This method may be used to trim whitespace (as defined above) from
-     * the beginning and end of a string.
-     *
-     * @return  A copy of this string with leading and trailing white
-     *          space removed, or this string if it has no leading or
-     *          trailing white space.
-     */
-    static String trim(String _this) {
-        int len = _this.length();
-        int st = 0;
-
-        while ((st < len) && (_this.charAt(st) <= ' ')) {
-            st++;
-        }
-        while ((st < len) && (_this.charAt(len - 1) <= ' ')) {
-            len--;
-        }
-        return ((st > 0) || (len < _this.length())) ? _this.substring(st, len) : _this;
-    }
-
-    /**
-     * Returns a formatted string using the specified format string and
-     * arguments.
-     *
-     * <p> The locale always used is the one returned by {@link
-     * java.util.Locale#getDefault() Locale.getDefault()}.
-     *
-     * @param  format
-     *         A <a href="../util/Formatter.html#syntax">format string</a>
-     *
-     * @param  args
-     *         Arguments referenced by the format specifiers in the format
-     *         string.  If there are more arguments than format specifiers, the
-     *         extra arguments are ignored.  The number of arguments is
-     *         variable and may be zero.  The maximum number of arguments is
-     *         limited by the maximum dimension of a Java array as defined by
-     *         <cite>The Java&trade; Virtual Machine Specification</cite>.
-     *         The behaviour on a
-     *         <tt>null</tt> argument depends on the <a
-     *         href="../util/Formatter.html#syntax">conversion</a>.
-     *
-     * @throws  IllegalFormatException
-     *          If a format string contains an illegal syntax, a format
-     *          specifier that is incompatible with the given arguments,
-     *          insufficient arguments given the format string, or other
-     *          illegal conditions.  For specification of all possible
-     *          formatting errors, see the <a
-     *          href="../util/Formatter.html#detail">Details</a> section of the
-     *          formatter class specification.
-     *
-     * @throws  NullPointerException
-     *          If the <tt>format</tt> is <tt>null</tt>
-     *
-     * @return  A formatted string
-     *
-     * @see  java.util.Formatter
-     * @since  1.5
-     */
-    public static String format(String format, Object... args) {
-        return new Formatter().format(format, args).toString();
-    }
-
-    /**
-     * Returns a formatted string using the specified locale, format string,
-     * and arguments.
-     *
-     * @param  l
-     *         The {@linkplain java.util.Locale locale} to apply during
-     *         formatting.  If <tt>l</tt> is <tt>null</tt> then no localization
-     *         is applied.
-     *
-     * @param  format
-     *         A <a href="../util/Formatter.html#syntax">format string</a>
-     *
-     * @param  args
-     *         Arguments referenced by the format specifiers in the format
-     *         string.  If there are more arguments than format specifiers, the
-     *         extra arguments are ignored.  The number of arguments is
-     *         variable and may be zero.  The maximum number of arguments is
-     *         limited by the maximum dimension of a Java array as defined by
-     *         <cite>The Java&trade; Virtual Machine Specification</cite>.
-     *         The behaviour on a
-     *         <tt>null</tt> argument depends on the <a
-     *         href="../util/Formatter.html#syntax">conversion</a>.
-     *
-     * @throws  IllegalFormatException
-     *          If a format string contains an illegal syntax, a format
-     *          specifier that is incompatible with the given arguments,
-     *          insufficient arguments given the format string, or other
-     *          illegal conditions.  For specification of all possible
-     *          formatting errors, see the <a
-     *          href="../util/Formatter.html#detail">Details</a> section of the
-     *          formatter class specification
-     *
-     * @throws  NullPointerException
-     *          If the <tt>format</tt> is <tt>null</tt>
-     *
-     * @return  A formatted string
-     *
-     * @see  java.util.Formatter
-     * @since  1.5
-     */
-    public static String format(Locale l, String format, Object... args) {
-        return new Formatter(l).format(format, args).toString();
-    }
-
-    /**
-     * Returns the string representation of the <code>Object</code> argument.
-     *
-     * @param   obj   an <code>Object</code>.
-     * @return  if the argument is <code>null</code>, then a string equal to
-     *          <code>"null"</code>; otherwise, the value of
-     *          <code>obj.toString()</code> is returned.
-     * @see     java.lang.Object#toString()
-     */
-    public static String valueOf(Object obj) {
-        return (obj == null) ? "null" : obj.toString();
-    }
-
-    /**
-     * Returns the string representation of the <code>char</code> array
-     * argument. The contents of the character array are copied; subsequent
-     * modification of the character array does not affect the newly
-     * created string.
-     *
-     * @param   data   a <code>char</code> array.
-     * @return  a newly allocated string representing the same sequence of
-     *          characters contained in the character array argument.
-     */
-    public static String valueOf(char data[]) {
-        return new String(data);
-    }
-
-    /**
-     * Returns the string representation of a specific subarray of the
-     * <code>char</code> array argument.
-     * <p>
-     * The <code>offset</code> argument is the index of the first
-     * character of the subarray. The <code>count</code> argument
-     * specifies the length of the subarray. The contents of the subarray
-     * are copied; subsequent modification of the character array does not
-     * affect the newly created string.
-     *
-     * @param   data     the character array.
-     * @param   offset   the initial offset into the value of the
-     *                  <code>String</code>.
-     * @param   count    the length of the value of the <code>String</code>.
-     * @return  a string representing the sequence of characters contained
-     *          in the subarray of the character array argument.
-     * @exception IndexOutOfBoundsException if <code>offset</code> is
-     *          negative, or <code>count</code> is negative, or
-     *          <code>offset+count</code> is larger than
-     *          <code>data.length</code>.
-     */
-    public static String valueOf(char data[], int offset, int count) {
-        return new String(data, offset, count);
-    }
-
-    /**
-     * Returns a String that represents the character sequence in the
-     * array specified.
-     *
-     * @param   data     the character array.
-     * @param   offset   initial offset of the subarray.
-     * @param   count    length of the subarray.
-     * @return  a <code>String</code> that contains the characters of the
-     *          specified subarray of the character array.
-     */
-    public static String copyValueOf(char data[], int offset, int count) {
-        // All public String constructors now copy the data.
-        return new String(data, offset, count);
-    }
-
-    /**
-     * Returns a String that represents the character sequence in the
-     * array specified.
-     *
-     * @param   data   the character array.
-     * @return  a <code>String</code> that contains the characters of the
-     *          character array.
-     */
-    public static String copyValueOf(char data[]) {
-        return new String(data);
-    }
-
-    /**
-     * Returns the string representation of the <code>boolean</code> argument.
-     *
-     * @param   b   a <code>boolean</code>.
-     * @return  if the argument is <code>true</code>, a string equal to
-     *          <code>"true"</code> is returned; otherwise, a string equal to
-     *          <code>"false"</code> is returned.
-     */
-    public static String valueOf(boolean b) {
-        return b ? "true" : "false";
-    }
-
-    /**
-     * Returns the string representation of the <code>int</code> argument.
-     * <p>
-     * The representation is exactly the one returned by the
-     * <code>Integer.toString</code> method of one argument.
-     *
-     * @param   i   an <code>int</code>.
-     * @return  a string representation of the <code>int</code> argument.
-     * @see     java.lang.Integer#toString(int, int)
-     */
-    public static String valueOf(int i) {
-        return Integer.toString(i);
-    }
-
-    /**
-     * Returns the string representation of the <code>long</code> argument.
-     * <p>
-     * The representation is exactly the one returned by the
-     * <code>Long.toString</code> method of one argument.
-     *
-     * @param   l   a <code>long</code>.
-     * @return  a string representation of the <code>long</code> argument.
-     * @see     java.lang.Long#toString(long)
-     */
-    public static String valueOf(long l) {
-        return Long.toString(l);
-    }
-
-    /**
-     * Returns the string representation of the <code>float</code> argument.
-     * <p>
-     * The representation is exactly the one returned by the
-     * <code>Float.toString</code> method of one argument.
-     *
-     * @param   f   a <code>float</code>.
-     * @return  a string representation of the <code>float</code> argument.
-     * @see     java.lang.Float#toString(float)
-     */
-    public static String valueOf(float f) {
-        return Float.toString(f);
-    }
-
-    /**
-     * Returns the string representation of the <code>double</code> argument.
-     * <p>
-     * The representation is exactly the one returned by the
-     * <code>Double.toString</code> method of one argument.
-     *
-     * @param   d   a <code>double</code>.
-     * @return  a  string representation of the <code>double</code> argument.
-     * @see     java.lang.Double#toString(double)
-     */
-    public static String valueOf(double d) {
-        return Double.toString(d);
-    }
-
-    /**
-     * Seed value used for each alternative hash calculated.
-     */
-    private static final int HASHING_SEED;
-
-    static {
-        long nanos = System.nanoTime();
-        long now = System.currentTimeMillis();
-        int SEED_MATERIAL[] = {
-                System.identityHashCode(String.class),
-                System.identityHashCode(System.class),
-                (int) (nanos >>> 32),
-                (int) nanos,
-                (int) (now >>> 32),
-                (int) now,
-                (int) (System.nanoTime() >>> 2)
-        };
-
-        // Use murmur3 to scramble the seeding material.
-        // Inline implementation to avoid loading classes
-        int h1 = 0;
-
-        // body
-        for (int k1 : SEED_MATERIAL) {
-            k1 *= 0xcc9e2d51;
-            k1 = (k1 << 15) | (k1 >>> 17);
-            k1 *= 0x1b873593;
-
-            h1 ^= k1;
-            h1 = (h1 << 13) | (h1 >>> 19);
-            h1 = h1 * 5 + 0xe6546b64;
-        }
-
-        // tail (always empty, as body is always 32-bit chunks)
-
-        // finalization
-
-        h1 ^= SEED_MATERIAL.length * 4;
-
-        // finalization mix force all bits of a hash block to avalanche
-        h1 ^= h1 >>> 16;
-        h1 *= 0x85ebca6b;
-        h1 ^= h1 >>> 13;
-        h1 *= 0xc2b2ae35;
-        h1 ^= h1 >>> 16;
-
-        HASHING_SEED = h1;
-    }
-
-    /**
-     * Calculates a 32-bit hash value for this string.
-     *
-     * @return a 32-bit hash value for this string.
-     */
-    static int hash32(String _this) {
-        // [IKVM] We don't bother with murmur32 and just use the .NET hash code
-        // and hope that it is good enough. We xor with HASHING_SEED to avoid
-        // returning predictable values (this does not help against DoS attacks,
-        // but it will surface constant hash code dependencies).
-        // If truly randomized string hashes are required (to protect against
-        // DoS) the .NET 4.5 <UseRandomizedStringHashAlgorithm enabled="1" />
-        // app.config setting can be used.
-        return HASHING_SEED ^ ((cli.System.String)(Object)_this).GetHashCode();
-    }
-
-}
diff --git a/openjdk/java/lang/System.java b/openjdk/java/lang/System.java
deleted file mode 100644
index e74187b9..00000000
--- a/openjdk/java/lang/System.java
+++ /dev/null
@@ -1,1168 +0,0 @@
-/*
- * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.lang;
-
-import java.io.*;
-import java.util.Properties;
-import java.util.PropertyPermission;
-import java.util.StringTokenizer;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.AllPermission;
-import java.nio.channels.Channel;
-import java.nio.channels.spi.SelectorProvider;
-import sun.reflect.CallerSensitive;
-import sun.reflect.Reflection;
-import sun.security.util.SecurityConstants;
-
-final class StdIO
-{
-    private StdIO() { }
-    static InputStream in = new BufferedInputStream(new FileInputStream(FileDescriptor.in));
-    static PrintStream out = new PrintStream(new BufferedOutputStream(new FileOutputStream(FileDescriptor.out), 128), true);
-    static PrintStream err = new PrintStream(new BufferedOutputStream(new FileOutputStream(FileDescriptor.err), 128), true);
-}
-
-final class Props
-{
-    private Props() { }
-
-    static Properties props;
-    static String lineSeparator;
-    
-    static
-    {
-        props = new Properties();
-        VMSystemProperties.initProperties(props);
-        lineSeparator = props.getProperty("line.separator");
-
-        // after we've initialized the system properties, we need to fixate certain
-        // results that depend on system properties, because we don't want Java code to
-        // be able to change the behavior by setting these system properties.
-        ClassLoader.initializeLibraryPaths(props);
-        sun.misc.VM.saveAndRemoveProperties(props);
-        
-        // now that we've initialized the system properties (which are our only
-        // notion of "booting" the VM) we set the booted flag.
-        sun.misc.VM.booted();
-    }
-}
-
-/**
- * The <code>System</code> class contains several useful class fields
- * and methods. It cannot be instantiated.
- *
- * <p>Among the facilities provided by the <code>System</code> class
- * are standard input, standard output, and error output streams;
- * access to externally defined properties and environment
- * variables; a means of loading files and libraries; and a utility
- * method for quickly copying a portion of an array.
- *
- * @author  unascribed
- * @since   JDK1.0
- */
-public final class System {
-
-    /** Don't let anyone instantiate this class */
-    private System() {
-    }
-
-    /**
-     * The "standard" input stream. This stream is already
-     * open and ready to supply input data. Typically this stream
-     * corresponds to keyboard input or another input source specified by
-     * the host environment or user.
-     */
-    @ikvm.lang.Property(get="get_in")
-    public final static InputStream in;
-    
-    static { in = null; }
-    
-    private static InputStream get_in()
-    {
-        return StdIO.in;
-    }
-
-    /**
-     * The "standard" output stream. This stream is already
-     * open and ready to accept output data. Typically this stream
-     * corresponds to display output or another output destination
-     * specified by the host environment or user.
-     * <p>
-     * For simple stand-alone Java applications, a typical way to write
-     * a line of output data is:
-     * <blockquote><pre>
-     *     System.out.println(data)
-     * </pre></blockquote>
-     * <p>
-     * See the <code>println</code> methods in class <code>PrintStream</code>.
-     *
-     * @see     java.io.PrintStream#println()
-     * @see     java.io.PrintStream#println(boolean)
-     * @see     java.io.PrintStream#println(char)
-     * @see     java.io.PrintStream#println(char[])
-     * @see     java.io.PrintStream#println(double)
-     * @see     java.io.PrintStream#println(float)
-     * @see     java.io.PrintStream#println(int)
-     * @see     java.io.PrintStream#println(long)
-     * @see     java.io.PrintStream#println(java.lang.Object)
-     * @see     java.io.PrintStream#println(java.lang.String)
-     */
-    @ikvm.lang.Property(get="get_out")
-    public final static PrintStream out;
-    
-    static { out = null; }
-    
-    private static PrintStream get_out()
-    {
-        return StdIO.out;
-    }
-
-    /**
-     * The "standard" error output stream. This stream is already
-     * open and ready to accept output data.
-     * <p>
-     * Typically this stream corresponds to display output or another
-     * output destination specified by the host environment or user. By
-     * convention, this output stream is used to display error messages
-     * or other information that should come to the immediate attention
-     * of a user even if the principal output stream, the value of the
-     * variable <code>out</code>, has been redirected to a file or other
-     * destination that is typically not continuously monitored.
-     */
-    @ikvm.lang.Property(get="get_err")
-    public final static PrintStream err;
-    
-    static { err = null ; }
-
-    private static PrintStream get_err()
-    {
-        return StdIO.err;
-    }
-
-    /* The security manager for the system.
-     */
-    private static volatile SecurityManager security;
-
-    /**
-     * Reassigns the "standard" input stream.
-     *
-     * <p>First, if there is a security manager, its <code>checkPermission</code>
-     * method is called with a <code>RuntimePermission("setIO")</code> permission
-     *  to see if it's ok to reassign the "standard" input stream.
-     * <p>
-     *
-     * @param in the new standard input stream.
-     *
-     * @throws SecurityException
-     *        if a security manager exists and its
-     *        <code>checkPermission</code> method doesn't allow
-     *        reassigning of the standard input stream.
-     *
-     * @see SecurityManager#checkPermission
-     * @see java.lang.RuntimePermission
-     *
-     * @since   JDK1.1
-     */
-    public static void setIn(InputStream in) {
-        checkIO();
-        StdIO.in = in;
-    }
-
-    /**
-     * Reassigns the "standard" output stream.
-     *
-     * <p>First, if there is a security manager, its <code>checkPermission</code>
-     * method is called with a <code>RuntimePermission("setIO")</code> permission
-     *  to see if it's ok to reassign the "standard" output stream.
-     *
-     * @param out the new standard output stream
-     *
-     * @throws SecurityException
-     *        if a security manager exists and its
-     *        <code>checkPermission</code> method doesn't allow
-     *        reassigning of the standard output stream.
-     *
-     * @see SecurityManager#checkPermission
-     * @see java.lang.RuntimePermission
-     *
-     * @since   JDK1.1
-     */
-    public static void setOut(PrintStream out) {
-        checkIO();
-        StdIO.out = out;
-    }
-
-    /**
-     * Reassigns the "standard" error output stream.
-     *
-     * <p>First, if there is a security manager, its <code>checkPermission</code>
-     * method is called with a <code>RuntimePermission("setIO")</code> permission
-     *  to see if it's ok to reassign the "standard" error output stream.
-     *
-     * @param err the new standard error output stream.
-     *
-     * @throws SecurityException
-     *        if a security manager exists and its
-     *        <code>checkPermission</code> method doesn't allow
-     *        reassigning of the standard error output stream.
-     *
-     * @see SecurityManager#checkPermission
-     * @see java.lang.RuntimePermission
-     *
-     * @since   JDK1.1
-     */
-    public static void setErr(PrintStream err) {
-        checkIO();
-        StdIO.err = err;
-    }
-
-    private static volatile Console cons;
-    /**
-     * Returns the unique {@link java.io.Console Console} object associated
-     * with the current Java virtual machine, if any.
-     *
-     * @return  The system console, if any, otherwise <tt>null</tt>.
-     *
-     * @since   1.6
-     */
-     public static Console console() {
-         if (cons == null) {
-             synchronized (System.class) {
-                 cons = sun.misc.SharedSecrets.getJavaIOAccess().console();
-             }
-         }
-         return cons;
-     }
-
-    /**
-     * Returns the channel inherited from the entity that created this
-     * Java virtual machine.
-     *
-     * <p> This method returns the channel obtained by invoking the
-     * {@link java.nio.channels.spi.SelectorProvider#inheritedChannel
-     * inheritedChannel} method of the system-wide default
-     * {@link java.nio.channels.spi.SelectorProvider} object. </p>
-     *
-     * <p> In addition to the network-oriented channels described in
-     * {@link java.nio.channels.spi.SelectorProvider#inheritedChannel
-     * inheritedChannel}, this method may return other kinds of
-     * channels in the future.
-     *
-     * @return  The inherited channel, if any, otherwise <tt>null</tt>.
-     *
-     * @throws  IOException
-     *          If an I/O error occurs
-     *
-     * @throws  SecurityException
-     *          If a security manager is present and it does not
-     *          permit access to the channel.
-     *
-     * @since 1.5
-     */
-    public static Channel inheritedChannel() throws IOException {
-        return SelectorProvider.provider().inheritedChannel();
-    }
-
-    private static void checkIO() {
-        SecurityManager sm = getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(new RuntimePermission("setIO"));
-        }
-    }
-
-    /**
-     * Sets the System security.
-     *
-     * <p> If there is a security manager already installed, this method first
-     * calls the security manager's <code>checkPermission</code> method
-     * with a <code>RuntimePermission("setSecurityManager")</code>
-     * permission to ensure it's ok to replace the existing
-     * security manager.
-     * This may result in throwing a <code>SecurityException</code>.
-     *
-     * <p> Otherwise, the argument is established as the current
-     * security manager. If the argument is <code>null</code> and no
-     * security manager has been established, then no action is taken and
-     * the method simply returns.
-     *
-     * @param      s   the security manager.
-     * @exception  SecurityException  if the security manager has already
-     *             been set and its <code>checkPermission</code> method
-     *             doesn't allow it to be replaced.
-     * @see #getSecurityManager
-     * @see SecurityManager#checkPermission
-     * @see java.lang.RuntimePermission
-     */
-    public static
-    void setSecurityManager(final SecurityManager s) {
-        try {
-            s.checkPackageAccess("java.lang");
-        } catch (Exception e) {
-            // no-op
-        }
-        setSecurityManager0(s);
-    }
-
-    private static synchronized
-    void setSecurityManager0(final SecurityManager s) {
-        // [IKVM] force sun.misc.Launcher to initialize, because it assumes that it runs without a SecurityManager
-        sun.misc.Launcher.getLauncher();
-
-        SecurityManager sm = getSecurityManager();
-        if (sm != null) {
-            // ask the currently installed security manager if we
-            // can replace it.
-            sm.checkPermission(new RuntimePermission
-                                     ("setSecurityManager"));
-        }
-
-        if ((s != null) && (s.getClass().getClassLoader() != null)) {
-            // New security manager class is not on bootstrap classpath.
-            // Cause policy to get initialized before we install the new
-            // security manager, in order to prevent infinite loops when
-            // trying to initialize the policy (which usually involves
-            // accessing some security and/or system properties, which in turn
-            // calls the installed security manager's checkPermission method
-            // which will loop infinitely if there is a non-system class
-            // (in this case: the new security manager class) on the stack).
-            AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                public Object run() {
-                    s.getClass().getProtectionDomain().implies
-                        (SecurityConstants.ALL_PERMISSION);
-                    return null;
-                }
-            });
-        }
-
-        security = s;
-    }
-
-    /**
-     * Gets the system security interface.
-     *
-     * @return  if a security manager has already been established for the
-     *          current application, then that security manager is returned;
-     *          otherwise, <code>null</code> is returned.
-     * @see     #setSecurityManager
-     */
-    public static SecurityManager getSecurityManager() {
-        return security;
-    }
-
-    /**
-     * Returns the current time in milliseconds.  Note that
-     * while the unit of time of the return value is a millisecond,
-     * the granularity of the value depends on the underlying
-     * operating system and may be larger.  For example, many
-     * operating systems measure time in units of tens of
-     * milliseconds.
-     *
-     * <p> See the description of the class <code>Date</code> for
-     * a discussion of slight discrepancies that may arise between
-     * "computer time" and coordinated universal time (UTC).
-     *
-     * @return  the difference, measured in milliseconds, between
-     *          the current time and midnight, January 1, 1970 UTC.
-     * @see     java.util.Date
-     */
-    public static long currentTimeMillis() {
-        long january_1st_1970 = 62135596800000L;
-        return cli.System.DateTime.get_UtcNow().get_Ticks() / 10000L - january_1st_1970;
-    }
-
-    /**
-     * Returns the current value of the running Java Virtual Machine's
-     * high-resolution time source, in nanoseconds.
-     *
-     * <p>This method can only be used to measure elapsed time and is
-     * not related to any other notion of system or wall-clock time.
-     * The value returned represents nanoseconds since some fixed but
-     * arbitrary <i>origin</i> time (perhaps in the future, so values
-     * may be negative).  The same origin is used by all invocations of
-     * this method in an instance of a Java virtual machine; other
-     * virtual machine instances are likely to use a different origin.
-     *
-     * <p>This method provides nanosecond precision, but not necessarily
-     * nanosecond resolution (that is, how frequently the value changes)
-     * - no guarantees are made except that the resolution is at least as
-     * good as that of {@link #currentTimeMillis()}.
-     *
-     * <p>Differences in successive calls that span greater than
-     * approximately 292 years (2<sup>63</sup> nanoseconds) will not
-     * correctly compute elapsed time due to numerical overflow.
-     *
-     * <p>The values returned by this method become meaningful only when
-     * the difference between two such values, obtained within the same
-     * instance of a Java virtual machine, is computed.
-     *
-     * <p> For example, to measure how long some code takes to execute:
-     *  <pre> {@code
-     * long startTime = System.nanoTime();
-     * // ... the code being measured ...
-     * long estimatedTime = System.nanoTime() - startTime;}</pre>
-     *
-     * <p>To compare two nanoTime values
-     *  <pre> {@code
-     * long t0 = System.nanoTime();
-     * ...
-     * long t1 = System.nanoTime();}</pre>
-     *
-     * one should use {@code t1 - t0 < 0}, not {@code t1 < t0},
-     * because of the possibility of numerical overflow.
-     *
-     * @return the current value of the running Java Virtual Machine's
-     *         high-resolution time source, in nanoseconds
-     * @since 1.5
-     */
-    public static long nanoTime() {
-        long NANOS_PER_SEC = 1000000000;
-        double current = cli.System.Diagnostics.Stopwatch.GetTimestamp();
-        double freq = cli.System.Diagnostics.Stopwatch.Frequency;
-        return (long)((current / freq) * NANOS_PER_SEC);
-    }
-
-    /**
-     * Copies an array from the specified source array, beginning at the
-     * specified position, to the specified position of the destination array.
-     * A subsequence of array components are copied from the source
-     * array referenced by <code>src</code> to the destination array
-     * referenced by <code>dest</code>. The number of components copied is
-     * equal to the <code>length</code> argument. The components at
-     * positions <code>srcPos</code> through
-     * <code>srcPos+length-1</code> in the source array are copied into
-     * positions <code>destPos</code> through
-     * <code>destPos+length-1</code>, respectively, of the destination
-     * array.
-     * <p>
-     * If the <code>src</code> and <code>dest</code> arguments refer to the
-     * same array object, then the copying is performed as if the
-     * components at positions <code>srcPos</code> through
-     * <code>srcPos+length-1</code> were first copied to a temporary
-     * array with <code>length</code> components and then the contents of
-     * the temporary array were copied into positions
-     * <code>destPos</code> through <code>destPos+length-1</code> of the
-     * destination array.
-     * <p>
-     * If <code>dest</code> is <code>null</code>, then a
-     * <code>NullPointerException</code> is thrown.
-     * <p>
-     * If <code>src</code> is <code>null</code>, then a
-     * <code>NullPointerException</code> is thrown and the destination
-     * array is not modified.
-     * <p>
-     * Otherwise, if any of the following is true, an
-     * <code>ArrayStoreException</code> is thrown and the destination is
-     * not modified:
-     * <ul>
-     * <li>The <code>src</code> argument refers to an object that is not an
-     *     array.
-     * <li>The <code>dest</code> argument refers to an object that is not an
-     *     array.
-     * <li>The <code>src</code> argument and <code>dest</code> argument refer
-     *     to arrays whose component types are different primitive types.
-     * <li>The <code>src</code> argument refers to an array with a primitive
-     *    component type and the <code>dest</code> argument refers to an array
-     *     with a reference component type.
-     * <li>The <code>src</code> argument refers to an array with a reference
-     *    component type and the <code>dest</code> argument refers to an array
-     *     with a primitive component type.
-     * </ul>
-     * <p>
-     * Otherwise, if any of the following is true, an
-     * <code>IndexOutOfBoundsException</code> is
-     * thrown and the destination is not modified:
-     * <ul>
-     * <li>The <code>srcPos</code> argument is negative.
-     * <li>The <code>destPos</code> argument is negative.
-     * <li>The <code>length</code> argument is negative.
-     * <li><code>srcPos+length</code> is greater than
-     *     <code>src.length</code>, the length of the source array.
-     * <li><code>destPos+length</code> is greater than
-     *     <code>dest.length</code>, the length of the destination array.
-     * </ul>
-     * <p>
-     * Otherwise, if any actual component of the source array from
-     * position <code>srcPos</code> through
-     * <code>srcPos+length-1</code> cannot be converted to the component
-     * type of the destination array by assignment conversion, an
-     * <code>ArrayStoreException</code> is thrown. In this case, let
-     * <b><i>k</i></b> be the smallest nonnegative integer less than
-     * length such that <code>src[srcPos+</code><i>k</i><code>]</code>
-     * cannot be converted to the component type of the destination
-     * array; when the exception is thrown, source array components from
-     * positions <code>srcPos</code> through
-     * <code>srcPos+</code><i>k</i><code>-1</code>
-     * will already have been copied to destination array positions
-     * <code>destPos</code> through
-     * <code>destPos+</code><i>k</I><code>-1</code> and no other
-     * positions of the destination array will have been modified.
-     * (Because of the restrictions already itemized, this
-     * paragraph effectively applies only to the situation where both
-     * arrays have component types that are reference types.)
-     *
-     * @param      src      the source array.
-     * @param      srcPos   starting position in the source array.
-     * @param      dest     the destination array.
-     * @param      destPos  starting position in the destination data.
-     * @param      length   the number of array elements to be copied.
-     * @exception  IndexOutOfBoundsException  if copying would cause
-     *               access of data outside array bounds.
-     * @exception  ArrayStoreException  if an element in the <code>src</code>
-     *               array could not be stored into the <code>dest</code> array
-     *               because of a type mismatch.
-     * @exception  NullPointerException if either <code>src</code> or
-     *               <code>dest</code> is <code>null</code>.
-     */
-    public static native void arraycopy(Object src,  int  srcPos,
-                                        Object dest, int destPos,
-                                        int length);
-
-    /**
-     * Returns the same hash code for the given object as
-     * would be returned by the default method hashCode(),
-     * whether or not the given object's class overrides
-     * hashCode().
-     * The hash code for the null reference is zero.
-     *
-     * @param x object for which the hashCode is to be calculated
-     * @return  the hashCode
-     * @since   JDK1.1
-     */
-    public static int identityHashCode(Object x) {
-        return cli.System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(x);
-    }
-
-    /**
-     * System properties. The following properties are guaranteed to be defined:
-     * <dl>
-     * <dt>java.version         <dd>Java version number
-     * <dt>java.vendor          <dd>Java vendor specific string
-     * <dt>java.vendor.url      <dd>Java vendor URL
-     * <dt>java.home            <dd>Java installation directory
-     * <dt>java.class.version   <dd>Java class version number
-     * <dt>java.class.path      <dd>Java classpath
-     * <dt>os.name              <dd>Operating System Name
-     * <dt>os.arch              <dd>Operating System Architecture
-     * <dt>os.version           <dd>Operating System Version
-     * <dt>file.separator       <dd>File separator ("/" on Unix)
-     * <dt>path.separator       <dd>Path separator (":" on Unix)
-     * <dt>line.separator       <dd>Line separator ("\n" on Unix)
-     * <dt>user.name            <dd>User account name
-     * <dt>user.home            <dd>User home directory
-     * <dt>user.dir             <dd>User's current working directory
-     * </dl>
-     */
-
-    //private static native Properties initProperties(Properties props);
-
-    /**
-     * Determines the current system properties.
-     * <p>
-     * First, if there is a security manager, its
-     * <code>checkPropertiesAccess</code> method is called with no
-     * arguments. This may result in a security exception.
-     * <p>
-     * The current set of system properties for use by the
-     * {@link #getProperty(String)} method is returned as a
-     * <code>Properties</code> object. If there is no current set of
-     * system properties, a set of system properties is first created and
-     * initialized. This set of system properties always includes values
-     * for the following keys:
-     * <table summary="Shows property keys and associated values">
-     * <tr><th>Key</th>
-     *     <th>Description of Associated Value</th></tr>
-     * <tr><td><code>java.version</code></td>
-     *     <td>Java Runtime Environment version</td></tr>
-     * <tr><td><code>java.vendor</code></td>
-     *     <td>Java Runtime Environment vendor</td></tr
-     * <tr><td><code>java.vendor.url</code></td>
-     *     <td>Java vendor URL</td></tr>
-     * <tr><td><code>java.home</code></td>
-     *     <td>Java installation directory</td></tr>
-     * <tr><td><code>java.vm.specification.version</code></td>
-     *     <td>Java Virtual Machine specification version</td></tr>
-     * <tr><td><code>java.vm.specification.vendor</code></td>
-     *     <td>Java Virtual Machine specification vendor</td></tr>
-     * <tr><td><code>java.vm.specification.name</code></td>
-     *     <td>Java Virtual Machine specification name</td></tr>
-     * <tr><td><code>java.vm.version</code></td>
-     *     <td>Java Virtual Machine implementation version</td></tr>
-     * <tr><td><code>java.vm.vendor</code></td>
-     *     <td>Java Virtual Machine implementation vendor</td></tr>
-     * <tr><td><code>java.vm.name</code></td>
-     *     <td>Java Virtual Machine implementation name</td></tr>
-     * <tr><td><code>java.specification.version</code></td>
-     *     <td>Java Runtime Environment specification  version</td></tr>
-     * <tr><td><code>java.specification.vendor</code></td>
-     *     <td>Java Runtime Environment specification  vendor</td></tr>
-     * <tr><td><code>java.specification.name</code></td>
-     *     <td>Java Runtime Environment specification  name</td></tr>
-     * <tr><td><code>java.class.version</code></td>
-     *     <td>Java class format version number</td></tr>
-     * <tr><td><code>java.class.path</code></td>
-     *     <td>Java class path</td></tr>
-     * <tr><td><code>java.library.path</code></td>
-     *     <td>List of paths to search when loading libraries</td></tr>
-     * <tr><td><code>java.io.tmpdir</code></td>
-     *     <td>Default temp file path</td></tr>
-     * <tr><td><code>java.compiler</code></td>
-     *     <td>Name of JIT compiler to use</td></tr>
-     * <tr><td><code>java.ext.dirs</code></td>
-     *     <td>Path of extension directory or directories</td></tr>
-     * <tr><td><code>os.name</code></td>
-     *     <td>Operating system name</td></tr>
-     * <tr><td><code>os.arch</code></td>
-     *     <td>Operating system architecture</td></tr>
-     * <tr><td><code>os.version</code></td>
-     *     <td>Operating system version</td></tr>
-     * <tr><td><code>file.separator</code></td>
-     *     <td>File separator ("/" on UNIX)</td></tr>
-     * <tr><td><code>path.separator</code></td>
-     *     <td>Path separator (":" on UNIX)</td></tr>
-     * <tr><td><code>line.separator</code></td>
-     *     <td>Line separator ("\n" on UNIX)</td></tr>
-     * <tr><td><code>user.name</code></td>
-     *     <td>User's account name</td></tr>
-     * <tr><td><code>user.home</code></td>
-     *     <td>User's home directory</td></tr>
-     * <tr><td><code>user.dir</code></td>
-     *     <td>User's current working directory</td></tr>
-     * </table>
-     * <p>
-     * Multiple paths in a system property value are separated by the path
-     * separator character of the platform.
-     * <p>
-     * Note that even if the security manager does not permit the
-     * <code>getProperties</code> operation, it may choose to permit the
-     * {@link #getProperty(String)} operation.
-     *
-     * @return     the system properties
-     * @exception  SecurityException  if a security manager exists and its
-     *             <code>checkPropertiesAccess</code> method doesn't allow access
-     *              to the system properties.
-     * @see        #setProperties
-     * @see        java.lang.SecurityException
-     * @see        java.lang.SecurityManager#checkPropertiesAccess()
-     * @see        java.util.Properties
-     */
-    public static Properties getProperties() {
-        SecurityManager sm = getSecurityManager();
-        if (sm != null) {
-            sm.checkPropertiesAccess();
-        }
-
-        return Props.props;
-    }
-
-    /**
-     * Returns the system-dependent line separator string.  It always
-     * returns the same value - the initial value of the {@linkplain
-     * #getProperty(String) system property} {@code line.separator}.
-     *
-     * <p>On UNIX systems, it returns {@code "\n"}; on Microsoft
-     * Windows systems it returns {@code "\r\n"}.
-     */
-    public static String lineSeparator() {
-        return Props.lineSeparator;
-    }
-
-    /**
-     * Sets the system properties to the <code>Properties</code>
-     * argument.
-     * <p>
-     * First, if there is a security manager, its
-     * <code>checkPropertiesAccess</code> method is called with no
-     * arguments. This may result in a security exception.
-     * <p>
-     * The argument becomes the current set of system properties for use
-     * by the {@link #getProperty(String)} method. If the argument is
-     * <code>null</code>, then the current set of system properties is
-     * forgotten.
-     *
-     * @param      props   the new system properties.
-     * @exception  SecurityException  if a security manager exists and its
-     *             <code>checkPropertiesAccess</code> method doesn't allow access
-     *              to the system properties.
-     * @see        #getProperties
-     * @see        java.util.Properties
-     * @see        java.lang.SecurityException
-     * @see        java.lang.SecurityManager#checkPropertiesAccess()
-     */
-    public static void setProperties(Properties props) {
-        SecurityManager sm = getSecurityManager();
-        if (sm != null) {
-            sm.checkPropertiesAccess();
-        }
-        if (props == null) {
-            props = new Properties();
-            VMSystemProperties.initProperties(props);
-        }
-        Props.props = props;
-    }
-
-    /**
-     * Gets the system property indicated by the specified key.
-     * <p>
-     * First, if there is a security manager, its
-     * <code>checkPropertyAccess</code> method is called with the key as
-     * its argument. This may result in a SecurityException.
-     * <p>
-     * If there is no current set of system properties, a set of system
-     * properties is first created and initialized in the same manner as
-     * for the <code>getProperties</code> method.
-     *
-     * @param      key   the name of the system property.
-     * @return     the string value of the system property,
-     *             or <code>null</code> if there is no property with that key.
-     *
-     * @exception  SecurityException  if a security manager exists and its
-     *             <code>checkPropertyAccess</code> method doesn't allow
-     *              access to the specified system property.
-     * @exception  NullPointerException if <code>key</code> is
-     *             <code>null</code>.
-     * @exception  IllegalArgumentException if <code>key</code> is empty.
-     * @see        #setProperty
-     * @see        java.lang.SecurityException
-     * @see        java.lang.SecurityManager#checkPropertyAccess(java.lang.String)
-     * @see        java.lang.System#getProperties()
-     */
-    public static String getProperty(String key) {
-        checkKey(key);
-        SecurityManager sm = getSecurityManager();
-        if (sm != null) {
-            sm.checkPropertyAccess(key);
-        }
-
-        return Props.props.getProperty(key);
-    }
-
-    /**
-     * Gets the system property indicated by the specified key.
-     * <p>
-     * First, if there is a security manager, its
-     * <code>checkPropertyAccess</code> method is called with the
-     * <code>key</code> as its argument.
-     * <p>
-     * If there is no current set of system properties, a set of system
-     * properties is first created and initialized in the same manner as
-     * for the <code>getProperties</code> method.
-     *
-     * @param      key   the name of the system property.
-     * @param      def   a default value.
-     * @return     the string value of the system property,
-     *             or the default value if there is no property with that key.
-     *
-     * @exception  SecurityException  if a security manager exists and its
-     *             <code>checkPropertyAccess</code> method doesn't allow
-     *             access to the specified system property.
-     * @exception  NullPointerException if <code>key</code> is
-     *             <code>null</code>.
-     * @exception  IllegalArgumentException if <code>key</code> is empty.
-     * @see        #setProperty
-     * @see        java.lang.SecurityManager#checkPropertyAccess(java.lang.String)
-     * @see        java.lang.System#getProperties()
-     */
-    public static String getProperty(String key, String def) {
-        checkKey(key);
-        SecurityManager sm = getSecurityManager();
-        if (sm != null) {
-            sm.checkPropertyAccess(key);
-        }
-
-        return Props.props.getProperty(key, def);
-    }
-
-    /**
-     * Sets the system property indicated by the specified key.
-     * <p>
-     * First, if a security manager exists, its
-     * <code>SecurityManager.checkPermission</code> method
-     * is called with a <code>PropertyPermission(key, "write")</code>
-     * permission. This may result in a SecurityException being thrown.
-     * If no exception is thrown, the specified property is set to the given
-     * value.
-     * <p>
-     *
-     * @param      key   the name of the system property.
-     * @param      value the value of the system property.
-     * @return     the previous value of the system property,
-     *             or <code>null</code> if it did not have one.
-     *
-     * @exception  SecurityException  if a security manager exists and its
-     *             <code>checkPermission</code> method doesn't allow
-     *             setting of the specified property.
-     * @exception  NullPointerException if <code>key</code> or
-     *             <code>value</code> is <code>null</code>.
-     * @exception  IllegalArgumentException if <code>key</code> is empty.
-     * @see        #getProperty
-     * @see        java.lang.System#getProperty(java.lang.String)
-     * @see        java.lang.System#getProperty(java.lang.String, java.lang.String)
-     * @see        java.util.PropertyPermission
-     * @see        SecurityManager#checkPermission
-     * @since      1.2
-     */
-    public static String setProperty(String key, String value) {
-        checkKey(key);
-        SecurityManager sm = getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(new PropertyPermission(key,
-                SecurityConstants.PROPERTY_WRITE_ACTION));
-        }
-
-        return (String) Props.props.setProperty(key, value);
-    }
-
-    /**
-     * Removes the system property indicated by the specified key.
-     * <p>
-     * First, if a security manager exists, its
-     * <code>SecurityManager.checkPermission</code> method
-     * is called with a <code>PropertyPermission(key, "write")</code>
-     * permission. This may result in a SecurityException being thrown.
-     * If no exception is thrown, the specified property is removed.
-     * <p>
-     *
-     * @param      key   the name of the system property to be removed.
-     * @return     the previous string value of the system property,
-     *             or <code>null</code> if there was no property with that key.
-     *
-     * @exception  SecurityException  if a security manager exists and its
-     *             <code>checkPropertyAccess</code> method doesn't allow
-     *              access to the specified system property.
-     * @exception  NullPointerException if <code>key</code> is
-     *             <code>null</code>.
-     * @exception  IllegalArgumentException if <code>key</code> is empty.
-     * @see        #getProperty
-     * @see        #setProperty
-     * @see        java.util.Properties
-     * @see        java.lang.SecurityException
-     * @see        java.lang.SecurityManager#checkPropertiesAccess()
-     * @since 1.5
-     */
-    public static String clearProperty(String key) {
-        checkKey(key);
-        SecurityManager sm = getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(new PropertyPermission(key, "write"));
-        }
-
-        return (String) Props.props.remove(key);
-    }
-
-    private static void checkKey(String key) {
-        if (key == null) {
-            throw new NullPointerException("key can't be null");
-        }
-        if (key.equals("")) {
-            throw new IllegalArgumentException("key can't be empty");
-        }
-    }
-
-    /**
-     * Gets the value of the specified environment variable. An
-     * environment variable is a system-dependent external named
-     * value.
-     *
-     * <p>If a security manager exists, its
-     * {@link SecurityManager#checkPermission checkPermission}
-     * method is called with a
-     * <code>{@link RuntimePermission}("getenv."+name)</code>
-     * permission.  This may result in a {@link SecurityException}
-     * being thrown.  If no exception is thrown the value of the
-     * variable <code>name</code> is returned.
-     *
-     * <p><a name="EnvironmentVSSystemProperties"><i>System
-     * properties</i> and <i>environment variables</i></a> are both
-     * conceptually mappings between names and values.  Both
-     * mechanisms can be used to pass user-defined information to a
-     * Java process.  Environment variables have a more global effect,
-     * because they are visible to all descendants of the process
-     * which defines them, not just the immediate Java subprocess.
-     * They can have subtly different semantics, such as case
-     * insensitivity, on different operating systems.  For these
-     * reasons, environment variables are more likely to have
-     * unintended side effects.  It is best to use system properties
-     * where possible.  Environment variables should be used when a
-     * global effect is desired, or when an external system interface
-     * requires an environment variable (such as <code>PATH</code>).
-     *
-     * <p>On UNIX systems the alphabetic case of <code>name</code> is
-     * typically significant, while on Microsoft Windows systems it is
-     * typically not.  For example, the expression
-     * <code>System.getenv("FOO").equals(System.getenv("foo"))</code>
-     * is likely to be true on Microsoft Windows.
-     *
-     * @param  name the name of the environment variable
-     * @return the string value of the variable, or <code>null</code>
-     *         if the variable is not defined in the system environment
-     * @throws NullPointerException if <code>name</code> is <code>null</code>
-     * @throws SecurityException
-     *         if a security manager exists and its
-     *         {@link SecurityManager#checkPermission checkPermission}
-     *         method doesn't allow access to the environment variable
-     *         <code>name</code>
-     * @see    #getenv()
-     * @see    ProcessBuilder#environment()
-     */
-    public static String getenv(String name) {
-        SecurityManager sm = getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(new RuntimePermission("getenv."+name));
-        }
-
-        return ProcessEnvironment.getenv(name);
-    }
-
-
-    /**
-     * Returns an unmodifiable string map view of the current system environment.
-     * The environment is a system-dependent mapping from names to
-     * values which is passed from parent to child processes.
-     *
-     * <p>If the system does not support environment variables, an
-     * empty map is returned.
-     *
-     * <p>The returned map will never contain null keys or values.
-     * Attempting to query the presence of a null key or value will
-     * throw a {@link NullPointerException}.  Attempting to query
-     * the presence of a key or value which is not of type
-     * {@link String} will throw a {@link ClassCastException}.
-     *
-     * <p>The returned map and its collection views may not obey the
-     * general contract of the {@link Object#equals} and
-     * {@link Object#hashCode} methods.
-     *
-     * <p>The returned map is typically case-sensitive on all platforms.
-     *
-     * <p>If a security manager exists, its
-     * {@link SecurityManager#checkPermission checkPermission}
-     * method is called with a
-     * <code>{@link RuntimePermission}("getenv.*")</code>
-     * permission.  This may result in a {@link SecurityException} being
-     * thrown.
-     *
-     * <p>When passing information to a Java subprocess,
-     * <a href=#EnvironmentVSSystemProperties>system properties</a>
-     * are generally preferred over environment variables.
-     *
-     * @return the environment as a map of variable names to values
-     * @throws SecurityException
-     *         if a security manager exists and its
-     *         {@link SecurityManager#checkPermission checkPermission}
-     *         method doesn't allow access to the process environment
-     * @see    #getenv(String)
-     * @see    ProcessBuilder#environment()
-     * @since  1.5
-     */
-    public static java.util.Map<String,String> getenv() {
-        SecurityManager sm = getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(new RuntimePermission("getenv.*"));
-        }
-
-        return ProcessEnvironment.getenv();
-    }
-
-    /**
-     * Terminates the currently running Java Virtual Machine. The
-     * argument serves as a status code; by convention, a nonzero status
-     * code indicates abnormal termination.
-     * <p>
-     * This method calls the <code>exit</code> method in class
-     * <code>Runtime</code>. This method never returns normally.
-     * <p>
-     * The call <code>System.exit(n)</code> is effectively equivalent to
-     * the call:
-     * <blockquote><pre>
-     * Runtime.getRuntime().exit(n)
-     * </pre></blockquote>
-     *
-     * @param      status   exit status.
-     * @throws  SecurityException
-     *        if a security manager exists and its <code>checkExit</code>
-     *        method doesn't allow exit with the specified status.
-     * @see        java.lang.Runtime#exit(int)
-     */
-    public static void exit(int status) {
-        Runtime.getRuntime().exit(status);
-    }
-
-    /**
-     * Runs the garbage collector.
-     * <p>
-     * Calling the <code>gc</code> method suggests that the Java Virtual
-     * Machine expend effort toward recycling unused objects in order to
-     * make the memory they currently occupy available for quick reuse.
-     * When control returns from the method call, the Java Virtual
-     * Machine has made a best effort to reclaim space from all discarded
-     * objects.
-     * <p>
-     * The call <code>System.gc()</code> is effectively equivalent to the
-     * call:
-     * <blockquote><pre>
-     * Runtime.getRuntime().gc()
-     * </pre></blockquote>
-     *
-     * @see     java.lang.Runtime#gc()
-     */
-    public static void gc() {
-        Runtime.getRuntime().gc();
-    }
-
-    /**
-     * Runs the finalization methods of any objects pending finalization.
-     * <p>
-     * Calling this method suggests that the Java Virtual Machine expend
-     * effort toward running the <code>finalize</code> methods of objects
-     * that have been found to be discarded but whose <code>finalize</code>
-     * methods have not yet been run. When control returns from the
-     * method call, the Java Virtual Machine has made a best effort to
-     * complete all outstanding finalizations.
-     * <p>
-     * The call <code>System.runFinalization()</code> is effectively
-     * equivalent to the call:
-     * <blockquote><pre>
-     * Runtime.getRuntime().runFinalization()
-     * </pre></blockquote>
-     *
-     * @see     java.lang.Runtime#runFinalization()
-     */
-    public static void runFinalization() {
-        Runtime.getRuntime().runFinalization();
-    }
-
-    /**
-     * Enable or disable finalization on exit; doing so specifies that the
-     * finalizers of all objects that have finalizers that have not yet been
-     * automatically invoked are to be run before the Java runtime exits.
-     * By default, finalization on exit is disabled.
-     *
-     * <p>If there is a security manager,
-     * its <code>checkExit</code> method is first called
-     * with 0 as its argument to ensure the exit is allowed.
-     * This could result in a SecurityException.
-     *
-     * @deprecated  This method is inherently unsafe.  It may result in
-     *      finalizers being called on live objects while other threads are
-     *      concurrently manipulating those objects, resulting in erratic
-     *      behavior or deadlock.
-     * @param value indicating enabling or disabling of finalization
-     * @throws  SecurityException
-     *        if a security manager exists and its <code>checkExit</code>
-     *        method doesn't allow the exit.
-     *
-     * @see     java.lang.Runtime#exit(int)
-     * @see     java.lang.Runtime#gc()
-     * @see     java.lang.SecurityManager#checkExit(int)
-     * @since   JDK1.1
-     */
-    @Deprecated
-    public static void runFinalizersOnExit(boolean value) {
-        Runtime.getRuntime().runFinalizersOnExit(value);
-    }
-
-    /**
-     * Loads a code file with the specified filename from the local file
-     * system as a dynamic library. The filename
-     * argument must be a complete path name.
-     * <p>
-     * The call <code>System.load(name)</code> is effectively equivalent
-     * to the call:
-     * <blockquote><pre>
-     * Runtime.getRuntime().load(name)
-     * </pre></blockquote>
-     *
-     * @param      filename   the file to load.
-     * @exception  SecurityException  if a security manager exists and its
-     *             <code>checkLink</code> method doesn't allow
-     *             loading of the specified dynamic library
-     * @exception  UnsatisfiedLinkError  if the file does not exist.
-     * @exception  NullPointerException if <code>filename</code> is
-     *             <code>null</code>
-     * @see        java.lang.Runtime#load(java.lang.String)
-     * @see        java.lang.SecurityManager#checkLink(java.lang.String)
-     */
-    @CallerSensitive
-    public static void load(String filename) {
-        Runtime.getRuntime().load0(Reflection.getCallerClass(), filename);
-    }
-
-    /**
-     * Loads the system library specified by the <code>libname</code>
-     * argument. The manner in which a library name is mapped to the
-     * actual system library is system dependent.
-     * <p>
-     * The call <code>System.loadLibrary(name)</code> is effectively
-     * equivalent to the call
-     * <blockquote><pre>
-     * Runtime.getRuntime().loadLibrary(name)
-     * </pre></blockquote>
-     *
-     * @param      libname   the name of the library.
-     * @exception  SecurityException  if a security manager exists and its
-     *             <code>checkLink</code> method doesn't allow
-     *             loading of the specified dynamic library
-     * @exception  UnsatisfiedLinkError  if the library does not exist.
-     * @exception  NullPointerException if <code>libname</code> is
-     *             <code>null</code>
-     * @see        java.lang.Runtime#loadLibrary(java.lang.String)
-     * @see        java.lang.SecurityManager#checkLink(java.lang.String)
-     */
-    @CallerSensitive
-    public static void loadLibrary(String libname) {
-        Runtime.getRuntime().loadLibrary0(Reflection.getCallerClass(), libname);
-    }
-
-    /**
-     * Maps a library name into a platform-specific string representing
-     * a native library.
-     *
-     * @param      libname the name of the library.
-     * @return     a platform-dependent native library name.
-     * @exception  NullPointerException if <code>libname</code> is
-     *             <code>null</code>
-     * @see        java.lang.System#loadLibrary(java.lang.String)
-     * @see        java.lang.ClassLoader#findLibrary(java.lang.String)
-     * @since      1.2
-     */
-    public static String mapLibraryName(String libname) {
-        if (libname == null) {
-            throw new NullPointerException();
-        }
-        if (ikvm.internal.Util.WINDOWS) {
-            return libname + ".dll";
-        } else if (ikvm.internal.Util.MACOSX) {
-            return "lib" + libname + ".jnilib";
-        } else {
-            return "lib" + libname + ".so";
-        }
-    }
-    /* returns the class of the caller. */
-    static Class<?> getCallerClass() {
-        // NOTE use of more generic Reflection.getCallerClass()
-        return Reflection.getCallerClass(3);
-    }
-}
diff --git a/openjdk/java/lang/Thread.java b/openjdk/java/lang/Thread.java
deleted file mode 100644
index 0ed60578..00000000
--- a/openjdk/java/lang/Thread.java
+++ /dev/null
@@ -1,2598 +0,0 @@
-/*
- * Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-
-import java.lang.ref.Reference;
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.WeakReference;
-import java.security.AccessController;
-import java.security.AccessControlContext;
-import java.security.PrivilegedAction;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.locks.LockSupport;
-import sun.nio.ch.Interruptible;
-import sun.reflect.CallerSensitive;
-import sun.reflect.Reflection;
-import sun.security.util.SecurityConstants;
-
-
-/**
- * A <i>thread</i> is a thread of execution in a program. The Java
- * Virtual Machine allows an application to have multiple threads of
- * execution running concurrently.
- * <p>
- * Every thread has a priority. Threads with higher priority are
- * executed in preference to threads with lower priority. Each thread
- * may or may not also be marked as a daemon. When code running in
- * some thread creates a new <code>Thread</code> object, the new
- * thread has its priority initially set equal to the priority of the
- * creating thread, and is a daemon thread if and only if the
- * creating thread is a daemon.
- * <p>
- * When a Java Virtual Machine starts up, there is usually a single
- * non-daemon thread (which typically calls the method named
- * <code>main</code> of some designated class). The Java Virtual
- * Machine continues to execute threads until either of the following
- * occurs:
- * <ul>
- * <li>The <code>exit</code> method of class <code>Runtime</code> has been
- *     called and the security manager has permitted the exit operation
- *     to take place.
- * <li>All threads that are not daemon threads have died, either by
- *     returning from the call to the <code>run</code> method or by
- *     throwing an exception that propagates beyond the <code>run</code>
- *     method.
- * </ul>
- * <p>
- * There are two ways to create a new thread of execution. One is to
- * declare a class to be a subclass of <code>Thread</code>. This
- * subclass should override the <code>run</code> method of class
- * <code>Thread</code>. An instance of the subclass can then be
- * allocated and started. For example, a thread that computes primes
- * larger than a stated value could be written as follows:
- * <hr><blockquote><pre>
- *     class PrimeThread extends Thread {
- *         long minPrime;
- *         PrimeThread(long minPrime) {
- *             this.minPrime = minPrime;
- *         }
- *
- *         public void run() {
- *             // compute primes larger than minPrime
- *             &nbsp;.&nbsp;.&nbsp;.
- *         }
- *     }
- * </pre></blockquote><hr>
- * <p>
- * The following code would then create a thread and start it running:
- * <blockquote><pre>
- *     PrimeThread p = new PrimeThread(143);
- *     p.start();
- * </pre></blockquote>
- * <p>
- * The other way to create a thread is to declare a class that
- * implements the <code>Runnable</code> interface. That class then
- * implements the <code>run</code> method. An instance of the class can
- * then be allocated, passed as an argument when creating
- * <code>Thread</code>, and started. The same example in this other
- * style looks like the following:
- * <hr><blockquote><pre>
- *     class PrimeRun implements Runnable {
- *         long minPrime;
- *         PrimeRun(long minPrime) {
- *             this.minPrime = minPrime;
- *         }
- *
- *         public void run() {
- *             // compute primes larger than minPrime
- *             &nbsp;.&nbsp;.&nbsp;.
- *         }
- *     }
- * </pre></blockquote><hr>
- * <p>
- * The following code would then create a thread and start it running:
- * <blockquote><pre>
- *     PrimeRun p = new PrimeRun(143);
- *     new Thread(p).start();
- * </pre></blockquote>
- * <p>
- * Every thread has a name for identification purposes. More than
- * one thread may have the same name. If a name is not specified when
- * a thread is created, a new name is generated for it.
- * <p>
- * Unless otherwise noted, passing a {@code null} argument to a constructor
- * or method in this class will cause a {@link NullPointerException} to be
- * thrown.
- *
- * @author  unascribed
- * @see     Runnable
- * @see     Runtime#exit(int)
- * @see     #run()
- * @see     #stop()
- * @since   JDK1.0
- */
-public
-class Thread implements Runnable {
-    // [IKVM]
-    static {
-        // force the set/getContextClassLoader methods to be JIT compiled, because isCCLOverridden(Thread) depends on it
-        // (we don't want to use RuntimeHelpers.PrepareMethod() because it requires full trust)
-        Thread dummy = new Thread((Void)null);
-        dummy.getContextClassLoader();
-        dummy.setContextClassLoader(ClassLoader.DUMMY);
-    }
-    private Thread(Void _) {
-        // body replaced in map.xml
-    }
-    final class Cleanup {
-        private final Thread thread;
-
-        Cleanup(Thread thread) {
-            this.thread = thread;
-        }
-
-        protected void finalize() {
-            thread.die();
-        }
-    }
-    /* --- start IKVM specific state --- */
-    static final int[] nonDaemonCount = new int[1];
-    @cli.System.ThreadStaticAttribute.Annotation
-    static Thread current;
-    @cli.System.ThreadStaticAttribute.Annotation
-    private static Cleanup cleanup;
-    private final Object lock = new Object();
-    private cli.System.Threading.Thread nativeThread;
-    private Throwable stillborn;
-    private boolean running;    // used only for coordination with stop0(), is never set to false
-    private volatile boolean interruptPending;
-    private volatile boolean nativeInterruptPending;
-    private volatile boolean interruptableWait;
-    private boolean timedWait;
-    volatile Object parkLock;   // used by get/setParkLock in map.xml
-    int parkState;              // used by cmpxchgParkState in map.xml
-    /* --- end IKVM specific state --- */
-
-    private volatile char  name[];
-    private int            priority;
-    private Thread         threadQ;
-    private long           eetop;
-
-    /* Whether or not to single_step this thread. */
-    private boolean     single_step;
-
-    /* Whether or not the thread is a daemon thread. */
-    private boolean     daemon = false;
-
-    /* What will be run. */
-    private Runnable target;
-
-    /* The group of this thread */
-    private ThreadGroup group;
-
-    /* The context ClassLoader for this thread */
-    private volatile ClassLoader contextClassLoader;
-
-    /* The inherited AccessControlContext of this thread */
-    /* [IKVM] this contains either an AccessControlContext or an AccessController.LazyContext */
-    Object inheritedAccessControlContext;
-
-    /* For autonumbering anonymous threads. */
-    private static int threadInitNumber;
-    private static synchronized int nextThreadNum() {
-        return threadInitNumber++;
-    }
-
-    /* ThreadLocal values pertaining to this thread. This map is maintained
-     * by the ThreadLocal class. */
-    ThreadLocal.ThreadLocalMap threadLocals = null;
-
-    /*
-     * InheritableThreadLocal values pertaining to this thread. This map is
-     * maintained by the InheritableThreadLocal class.
-     */
-    ThreadLocal.ThreadLocalMap inheritableThreadLocals = null;
-
-    /*
-     * The requested stack size for this thread, or 0 if the creator did
-     * not specify a stack size.  It is up to the VM to do whatever it
-     * likes with this number; some VMs will ignore it.
-     */
-    private long stackSize;
-
-    /*
-     * JVM-private state that persists after native thread termination.
-     */
-    private long nativeParkEventPointer;
-
-    /*
-     * Thread ID
-     */
-    private long tid;
-
-    /* For generating thread ID */
-    private static long threadSeqNumber;
-
-    /* Java thread status for tools,
-     * initialized to indicate thread 'not yet started'
-     */
-
-    private volatile int threadStatus = 0;
-
-
-    private static synchronized long nextThreadID() {
-        return ++threadSeqNumber;
-    }
-
-    /**
-     * The argument supplied to the current call to
-     * java.util.concurrent.locks.LockSupport.park.
-     * Set by (private) java.util.concurrent.locks.LockSupport.setBlocker
-     * Accessed using java.util.concurrent.locks.LockSupport.getBlocker
-     */
-    @ikvm.lang.Internal // [IKVM] accessed from java.util.concurrent
-    public volatile Object parkBlocker;
-
-    /* The object in which this thread is blocked in an interruptible I/O
-     * operation, if any.  The blocker's interrupt method should be invoked
-     * after setting this thread's interrupt status.
-     */
-    private volatile Interruptible blocker;
-    private final Object blockerLock = new Object();
-
-    /* Set the blocker field; invoked via sun.misc.SharedSecrets from java.nio code
-     */
-    void blockedOn(Interruptible b) {
-        synchronized (blockerLock) {
-            blocker = b;
-        }
-    }
-
-    /**
-     * The minimum priority that a thread can have.
-     */
-    public final static int MIN_PRIORITY = 1;
-
-   /**
-     * The default priority that is assigned to a thread.
-     */
-    public final static int NORM_PRIORITY = 5;
-
-    /**
-     * The maximum priority that a thread can have.
-     */
-    public final static int MAX_PRIORITY = 10;
-
-    /**
-     * Returns a reference to the currently executing thread object.
-     *
-     * @return  the currently executing thread.
-     */
-    public static Thread currentThread() {
-        Thread c = current;
-        if (c == null) {
-            c = new Thread(getMainThreadGroup());
-        }
-        return c;
-    }
-    
-    private static native ThreadGroup getMainThreadGroup();
-
-    /**
-     * A hint to the scheduler that the current thread is willing to yield
-     * its current use of a processor. The scheduler is free to ignore this
-     * hint.
-     *
-     * <p> Yield is a heuristic attempt to improve relative progression
-     * between threads that would otherwise over-utilise a CPU. Its use
-     * should be combined with detailed profiling and benchmarking to
-     * ensure that it actually has the desired effect.
-     *
-     * <p> It is rarely appropriate to use this method. It may be useful
-     * for debugging or testing purposes, where it may help to reproduce
-     * bugs due to race conditions. It may also be useful when designing
-     * concurrency control constructs such as the ones in the
-     * {@link java.util.concurrent.locks} package.
-     */
-    public static void yield() {
-        cli.System.Threading.Thread.Sleep(0);
-    }
-    
-    private void enterInterruptableWait(boolean timedWait) throws InterruptedException {
-        synchronized (lock) {
-            if (interruptPending) {
-                interruptPending = false;
-                throw new InterruptedException();
-            }
-            interruptableWait = true;
-            this.timedWait = timedWait;
-        }
-    }
-    
-    private void leaveInterruptableWait() throws InterruptedException {
-        cli.System.Threading.ThreadInterruptedException dotnetInterrupt = null;
-        interruptableWait = false;
-        for (; ; ) {
-            try {
-                if (false) throw new cli.System.Threading.ThreadInterruptedException();
-                synchronized (lock) {
-                    if (nativeInterruptPending) {
-                        nativeInterruptPending = false;
-                        // HACK if there is a pending Interrupt (on the .NET thread), we need to consume that
-                        // (if there was no contention on "lock (this)" above the interrupted state isn't checked) 
-                        try {
-                            if (false) throw new cli.System.Threading.ThreadInterruptedException();
-                            cli.System.Threading.Thread t = cli.System.Threading.Thread.get_CurrentThread();
-                            // the obvious thing to do would be t.Interrupt() / t.Join(),
-                            // but for some reason that causes a regression in JSR166TestCase (probably a CLR bug)
-                            // so we waste a time slice... sigh.
-                            t.Join(1);
-                        }
-                        catch (cli.System.Threading.ThreadInterruptedException _) {
-                        }
-                    }
-                    if (interruptPending) {
-                        interruptPending = false;
-                        throw new InterruptedException();
-                    }
-                }
-                break;
-            }
-            catch (cli.System.Threading.ThreadInterruptedException x) {
-                dotnetInterrupt = x;
-                nativeInterruptPending = false;
-            }
-        }
-        if (dotnetInterrupt != null) {
-            ikvm.runtime.Util.throwException(dotnetInterrupt);
-        }
-    }
-
-    /**
-     * Causes the currently executing thread to sleep (temporarily cease
-     * execution) for the specified number of milliseconds, subject to
-     * the precision and accuracy of system timers and schedulers. The thread
-     * does not lose ownership of any monitors.
-     *
-     * @param  millis
-     *         the length of time to sleep in milliseconds
-     *
-     * @throws  IllegalArgumentException
-     *          if the value of {@code millis} is negative
-     *
-     * @throws  InterruptedException
-     *          if any thread has interrupted the current thread. The
-     *          <i>interrupted status</i> of the current thread is
-     *          cleared when this exception is thrown.
-     */
-    public static void sleep(long millis) throws InterruptedException {
-        if (millis < 0) {
-            throw new IllegalArgumentException("timeout value is negative");
-        }
-        Thread c = currentThread();
-        c.enterInterruptableWait(true);
-        try {
-            if (false) throw new cli.System.Threading.ThreadInterruptedException();
-            for (long iter = millis / Integer.MAX_VALUE; iter != 0; iter--)
-            {
-                cli.System.Threading.Thread.Sleep(Integer.MAX_VALUE);
-            }
-            cli.System.Threading.Thread.Sleep((int)(millis % Integer.MAX_VALUE));
-        }
-        catch (cli.System.Threading.ThreadInterruptedException _) {
-        }
-        finally {
-            c.leaveInterruptableWait();
-        }
-    }
-
-    /**
-     * Causes the currently executing thread to sleep (temporarily cease
-     * execution) for the specified number of milliseconds plus the specified
-     * number of nanoseconds, subject to the precision and accuracy of system
-     * timers and schedulers. The thread does not lose ownership of any
-     * monitors.
-     *
-     * @param  millis
-     *         the length of time to sleep in milliseconds
-     *
-     * @param  nanos
-     *         {@code 0-999999} additional nanoseconds to sleep
-     *
-     * @throws  IllegalArgumentException
-     *          if the value of {@code millis} is negative, or the value of
-     *          {@code nanos} is not in the range {@code 0-999999}
-     *
-     * @throws  InterruptedException
-     *          if any thread has interrupted the current thread. The
-     *          <i>interrupted status</i> of the current thread is
-     *          cleared when this exception is thrown.
-     */
-    public static void sleep(long millis, int nanos)
-    throws InterruptedException {
-        if (millis < 0) {
-            throw new IllegalArgumentException("timeout value is negative");
-        }
-
-        if (nanos < 0 || nanos > 999999) {
-            throw new IllegalArgumentException(
-                                "nanosecond timeout value out of range");
-        }
-
-        if (nanos >= 500000 || (nanos != 0 && millis == 0)) {
-            millis++;
-        }
-
-        sleep(millis);
-    }
-
-    /**
-     * Initializes a Thread with the current AccessControlContext.
-     * @see #init(ThreadGroup,Runnable,String,long,AccessControlContext)
-     */
-    private void init(ThreadGroup g, Runnable target, String name,
-                      long stackSize) {
-        init(g, target, name, stackSize, null);
-    }
-
-    /**
-     * Initializes a Thread.
-     *
-     * @param g the Thread group
-     * @param target the object whose run() method gets called
-     * @param name the name of the new Thread
-     * @param stackSize the desired stack size for the new thread, or
-     *        zero to indicate that this parameter is to be ignored.
-     * @param acc the AccessControlContext to inherit, or
-     *            AccessController.getContext() if null
-     */
-    private void init(ThreadGroup g, Runnable target, String name,
-                      long stackSize, AccessControlContext acc) {
-        if (name == null) {
-            throw new NullPointerException("name cannot be null");
-        }
-
-        this.name = name.toCharArray();
-
-        Thread parent = currentThread();
-        SecurityManager security = System.getSecurityManager();
-        if (g == null) {
-            /* Determine if it's an applet or not */
-
-            /* If there is a security manager, ask the security manager
-               what to do. */
-            if (security != null) {
-                g = security.getThreadGroup();
-            }
-
-            /* If the security doesn't have a strong opinion of the matter
-               use the parent thread group. */
-            if (g == null) {
-                g = parent.getThreadGroup();
-            }
-        }
-
-        /* checkAccess regardless of whether or not threadgroup is
-           explicitly passed in. */
-        g.checkAccess();
-
-        /*
-         * Do we have the required permissions?
-         */
-        if (security != null) {
-            if (isCCLOverridden(this)) {
-                security.checkPermission(SUBCLASS_IMPLEMENTATION_PERMISSION);
-            }
-        }
-
-        g.addUnstarted();
-
-        this.group = g;
-        this.daemon = parent.isDaemon();
-        this.priority = parent.getPriority();
-        if (isCCLOverridden(parent))
-            this.contextClassLoader = parent.getContextClassLoader();
-        else
-            this.contextClassLoader = parent.contextClassLoader;
-        this.inheritedAccessControlContext =
-                acc != null ? acc : AccessController.getLazyContext(parent.inheritedAccessControlContext);
-        this.target = target;
-        setPriority(priority);
-        if (parent.inheritableThreadLocals != null)
-            this.inheritableThreadLocals =
-                ThreadLocal.createInheritedMap(parent.inheritableThreadLocals);
-        /* Stash the specified stack size in case the VM cares */
-        this.stackSize = stackSize;
-
-        /* Set thread ID */
-        tid = nextThreadID();
-    }
-    
-    // [IKVM] constructor for attaching to a .NET thread
-    Thread(ThreadGroup g) {
-        this.running = true;
-        cli.System.Threading.Thread thread = cli.System.Threading.Thread.get_CurrentThread();
-        nativeThread = thread;
-        String name = thread.get_Name();
-        if (name == null) {
-            name = "Thread-" + nextThreadNum();
-        }
-
-        this.group = g;
-        this.daemon = thread.get_IsBackground();
-        this.priority = mapClrPriorityToJava(thread.get_Priority().Value);
-        this.name = name.toCharArray();
-        this.contextClassLoader = ClassLoader.DUMMY;
-        this.threadStatus = 0x0005; /* JVMTI_THREAD_STATE_ALIVE + JVMTI_THREAD_STATE_RUNNABLE */
-
-        /* Set thread ID */
-        tid = nextThreadID();
-
-        synchronized (g) {
-            g.addUnstarted();
-            g.add(this);
-        }
-
-        current = this;
-        cleanup = new Cleanup(this);
-
-        if (!daemon) {
-            cli.System.Threading.Interlocked.Increment(nonDaemonCount);
-        }
-    }
-    
-    private static int mapClrPriorityToJava(int priority) {
-        // TODO consider supporting -XX:JavaPriorityX_To_OSPriority settings
-        switch (priority) {
-        case cli.System.Threading.ThreadPriority.Lowest:
-            return MIN_PRIORITY;
-        case cli.System.Threading.ThreadPriority.BelowNormal:
-            return 3;
-        default:
-        case cli.System.Threading.ThreadPriority.Normal:
-            return NORM_PRIORITY;
-        case cli.System.Threading.ThreadPriority.AboveNormal:
-            return 7;
-        case cli.System.Threading.ThreadPriority.Highest:
-            return MAX_PRIORITY;
-        }
-    }
-    
-    private static int mapJavaPriorityToClr(int priority) {
-        // TODO consider supporting -XX:JavaPriorityX_To_OSPriority settings
-        if (priority == MIN_PRIORITY) {
-            return cli.System.Threading.ThreadPriority.Lowest;
-        }
-        else if (priority > Thread.MIN_PRIORITY && priority < Thread.NORM_PRIORITY) {
-            return cli.System.Threading.ThreadPriority.BelowNormal;
-        }
-        else if (priority == Thread.NORM_PRIORITY) {
-            return cli.System.Threading.ThreadPriority.Normal;
-        }
-        else if (priority > Thread.NORM_PRIORITY && priority < Thread.MAX_PRIORITY) {
-            return cli.System.Threading.ThreadPriority.AboveNormal;
-        }
-        else if (priority == Thread.MAX_PRIORITY) {
-            return cli.System.Threading.ThreadPriority.Highest;
-        }
-        else {
-            // can't happen
-            return cli.System.Threading.ThreadPriority.Normal;
-        }
-    }
-
-    /**
-     * Throws CloneNotSupportedException as a Thread can not be meaningfully
-     * cloned. Construct a new Thread instead.
-     *
-     * @throws  CloneNotSupportedException
-     *          always
-     */
-    @Override
-    protected Object clone() throws CloneNotSupportedException {
-        throw new CloneNotSupportedException();
-    }
-
-    /**
-     * Allocates a new {@code Thread} object. This constructor has the same
-     * effect as {@linkplain #Thread(ThreadGroup,Runnable,String) Thread}
-     * {@code (null, null, gname)}, where {@code gname} is a newly generated
-     * name. Automatically generated names are of the form
-     * {@code "Thread-"+}<i>n</i>, where <i>n</i> is an integer.
-     */
-    public Thread() {
-        init(null, null, "Thread-" + nextThreadNum(), 0);
-    }
-
-    /**
-     * Allocates a new {@code Thread} object. This constructor has the same
-     * effect as {@linkplain #Thread(ThreadGroup,Runnable,String) Thread}
-     * {@code (null, target, gname)}, where {@code gname} is a newly generated
-     * name. Automatically generated names are of the form
-     * {@code "Thread-"+}<i>n</i>, where <i>n</i> is an integer.
-     *
-     * @param  target
-     *         the object whose {@code run} method is invoked when this thread
-     *         is started. If {@code null}, this classes {@code run} method does
-     *         nothing.
-     */
-    public Thread(Runnable target) {
-        init(null, target, "Thread-" + nextThreadNum(), 0);
-    }
-
-    /**
-     * Creates a new Thread that inherits the given AccessControlContext.
-     * This is not a public constructor.
-     */
-    Thread(Runnable target, AccessControlContext acc) {
-        init(null, target, "Thread-" + nextThreadNum(), 0, acc);
-    }
-
-    /**
-     * Allocates a new {@code Thread} object. This constructor has the same
-     * effect as {@linkplain #Thread(ThreadGroup,Runnable,String) Thread}
-     * {@code (group, target, gname)} ,where {@code gname} is a newly generated
-     * name. Automatically generated names are of the form
-     * {@code "Thread-"+}<i>n</i>, where <i>n</i> is an integer.
-     *
-     * @param  group
-     *         the thread group. If {@code null} and there is a security
-     *         manager, the group is determined by {@linkplain
-     *         SecurityManager#getThreadGroup SecurityManager.getThreadGroup()}.
-     *         If there is not a security manager or {@code
-     *         SecurityManager.getThreadGroup()} returns {@code null}, the group
-     *         is set to the current thread's thread group.
-     *
-     * @param  target
-     *         the object whose {@code run} method is invoked when this thread
-     *         is started. If {@code null}, this thread's run method is invoked.
-     *
-     * @throws  SecurityException
-     *          if the current thread cannot create a thread in the specified
-     *          thread group
-     */
-    public Thread(ThreadGroup group, Runnable target) {
-        init(group, target, "Thread-" + nextThreadNum(), 0);
-    }
-
-    /**
-     * Allocates a new {@code Thread} object. This constructor has the same
-     * effect as {@linkplain #Thread(ThreadGroup,Runnable,String) Thread}
-     * {@code (null, null, name)}.
-     *
-     * @param   name
-     *          the name of the new thread
-     */
-    public Thread(String name) {
-        init(null, null, name, 0);
-    }
-
-    /**
-     * Allocates a new {@code Thread} object. This constructor has the same
-     * effect as {@linkplain #Thread(ThreadGroup,Runnable,String) Thread}
-     * {@code (group, null, name)}.
-     *
-     * @param  group
-     *         the thread group. If {@code null} and there is a security
-     *         manager, the group is determined by {@linkplain
-     *         SecurityManager#getThreadGroup SecurityManager.getThreadGroup()}.
-     *         If there is not a security manager or {@code
-     *         SecurityManager.getThreadGroup()} returns {@code null}, the group
-     *         is set to the current thread's thread group.
-     *
-     * @param  name
-     *         the name of the new thread
-     *
-     * @throws  SecurityException
-     *          if the current thread cannot create a thread in the specified
-     *          thread group
-     */
-    public Thread(ThreadGroup group, String name) {
-        init(group, null, name, 0);
-    }
-
-    /**
-     * Allocates a new {@code Thread} object. This constructor has the same
-     * effect as {@linkplain #Thread(ThreadGroup,Runnable,String) Thread}
-     * {@code (null, target, name)}.
-     *
-     * @param  target
-     *         the object whose {@code run} method is invoked when this thread
-     *         is started. If {@code null}, this thread's run method is invoked.
-     *
-     * @param  name
-     *         the name of the new thread
-     */
-    public Thread(Runnable target, String name) {
-        init(null, target, name, 0);
-    }
-
-    /**
-     * Allocates a new {@code Thread} object so that it has {@code target}
-     * as its run object, has the specified {@code name} as its name,
-     * and belongs to the thread group referred to by {@code group}.
-     *
-     * <p>If there is a security manager, its
-     * {@link SecurityManager#checkAccess(ThreadGroup) checkAccess}
-     * method is invoked with the ThreadGroup as its argument.
-     *
-     * <p>In addition, its {@code checkPermission} method is invoked with
-     * the {@code RuntimePermission("enableContextClassLoaderOverride")}
-     * permission when invoked directly or indirectly by the constructor
-     * of a subclass which overrides the {@code getContextClassLoader}
-     * or {@code setContextClassLoader} methods.
-     *
-     * <p>The priority of the newly created thread is set equal to the
-     * priority of the thread creating it, that is, the currently running
-     * thread. The method {@linkplain #setPriority setPriority} may be
-     * used to change the priority to a new value.
-     *
-     * <p>The newly created thread is initially marked as being a daemon
-     * thread if and only if the thread creating it is currently marked
-     * as a daemon thread. The method {@linkplain #setDaemon setDaemon}
-     * may be used to change whether or not a thread is a daemon.
-     *
-     * @param  group
-     *         the thread group. If {@code null} and there is a security
-     *         manager, the group is determined by {@linkplain
-     *         SecurityManager#getThreadGroup SecurityManager.getThreadGroup()}.
-     *         If there is not a security manager or {@code
-     *         SecurityManager.getThreadGroup()} returns {@code null}, the group
-     *         is set to the current thread's thread group.
-     *
-     * @param  target
-     *         the object whose {@code run} method is invoked when this thread
-     *         is started. If {@code null}, this thread's run method is invoked.
-     *
-     * @param  name
-     *         the name of the new thread
-     *
-     * @throws  SecurityException
-     *          if the current thread cannot create a thread in the specified
-     *          thread group or cannot override the context class loader methods.
-     */
-    public Thread(ThreadGroup group, Runnable target, String name) {
-        init(group, target, name, 0);
-    }
-
-    /**
-     * Allocates a new {@code Thread} object so that it has {@code target}
-     * as its run object, has the specified {@code name} as its name,
-     * and belongs to the thread group referred to by {@code group}, and has
-     * the specified <i>stack size</i>.
-     *
-     * <p>This constructor is identical to {@link
-     * #Thread(ThreadGroup,Runnable,String)} with the exception of the fact
-     * that it allows the thread stack size to be specified.  The stack size
-     * is the approximate number of bytes of address space that the virtual
-     * machine is to allocate for this thread's stack.  <b>The effect of the
-     * {@code stackSize} parameter, if any, is highly platform dependent.</b>
-     *
-     * <p>On some platforms, specifying a higher value for the
-     * {@code stackSize} parameter may allow a thread to achieve greater
-     * recursion depth before throwing a {@link StackOverflowError}.
-     * Similarly, specifying a lower value may allow a greater number of
-     * threads to exist concurrently without throwing an {@link
-     * OutOfMemoryError} (or other internal error).  The details of
-     * the relationship between the value of the <tt>stackSize</tt> parameter
-     * and the maximum recursion depth and concurrency level are
-     * platform-dependent.  <b>On some platforms, the value of the
-     * {@code stackSize} parameter may have no effect whatsoever.</b>
-     *
-     * <p>The virtual machine is free to treat the {@code stackSize}
-     * parameter as a suggestion.  If the specified value is unreasonably low
-     * for the platform, the virtual machine may instead use some
-     * platform-specific minimum value; if the specified value is unreasonably
-     * high, the virtual machine may instead use some platform-specific
-     * maximum.  Likewise, the virtual machine is free to round the specified
-     * value up or down as it sees fit (or to ignore it completely).
-     *
-     * <p>Specifying a value of zero for the {@code stackSize} parameter will
-     * cause this constructor to behave exactly like the
-     * {@code Thread(ThreadGroup, Runnable, String)} constructor.
-     *
-     * <p><i>Due to the platform-dependent nature of the behavior of this
-     * constructor, extreme care should be exercised in its use.
-     * The thread stack size necessary to perform a given computation will
-     * likely vary from one JRE implementation to another.  In light of this
-     * variation, careful tuning of the stack size parameter may be required,
-     * and the tuning may need to be repeated for each JRE implementation on
-     * which an application is to run.</i>
-     *
-     * <p>Implementation note: Java platform implementers are encouraged to
-     * document their implementation's behavior with respect to the
-     * {@code stackSize} parameter.
-     *
-     *
-     * @param  group
-     *         the thread group. If {@code null} and there is a security
-     *         manager, the group is determined by {@linkplain
-     *         SecurityManager#getThreadGroup SecurityManager.getThreadGroup()}.
-     *         If there is not a security manager or {@code
-     *         SecurityManager.getThreadGroup()} returns {@code null}, the group
-     *         is set to the current thread's thread group.
-     *
-     * @param  target
-     *         the object whose {@code run} method is invoked when this thread
-     *         is started. If {@code null}, this thread's run method is invoked.
-     *
-     * @param  name
-     *         the name of the new thread
-     *
-     * @param  stackSize
-     *         the desired stack size for the new thread, or zero to indicate
-     *         that this parameter is to be ignored.
-     *
-     * @throws  SecurityException
-     *          if the current thread cannot create a thread in the specified
-     *          thread group
-     *
-     * @since 1.4
-     */
-    public Thread(ThreadGroup group, Runnable target, String name,
-                  long stackSize) {
-        init(group, target, name, stackSize);
-    }
-
-    /**
-     * Causes this thread to begin execution; the Java Virtual Machine
-     * calls the <code>run</code> method of this thread.
-     * <p>
-     * The result is that two threads are running concurrently: the
-     * current thread (which returns from the call to the
-     * <code>start</code> method) and the other thread (which executes its
-     * <code>run</code> method).
-     * <p>
-     * It is never legal to start a thread more than once.
-     * In particular, a thread may not be restarted once it has completed
-     * execution.
-     *
-     * @exception  IllegalThreadStateException  if the thread was already
-     *               started.
-     * @see        #run()
-     * @see        #stop()
-     */
-    public synchronized void start() {
-        /**
-         * This method is not invoked for the main method thread or "system"
-         * group threads created/set up by the VM. Any new functionality added
-         * to this method in the future may have to also be added to the VM.
-         *
-         * A zero status value corresponds to state "NEW".
-         */
-        if (threadStatus != 0)
-            throw new IllegalThreadStateException();
-
-        /* Notify the group that this thread is about to be started
-         * so that it can be added to the group's list of threads
-         * and the group's unstarted count can be decremented. */
-        group.add(this);
-
-        boolean started = false;
-        try {
-            start0();
-            started = true;
-        } finally {
-            try {
-                if (!started) {
-                    group.threadStartFailed(this);
-                }
-            } catch (Throwable ignore) {
-                /* do nothing. If start0 threw a Throwable then
-                  it will be passed up the call stack */
-            }
-        }
-    }
-
-    private void start0() {
-        cli.System.Threading.ThreadStart threadStart = new cli.System.Threading.ThreadStart(new cli.System.Threading.ThreadStart.Method() {
-            @cli.IKVM.Attributes.HideFromJavaAttribute.Annotation
-            public void Invoke() {
-                threadProc();
-            }
-        });
-        if (stackSize <= 0) {
-            nativeThread = new cli.System.Threading.Thread(threadStart);
-        }
-        else {
-            int maxStackSize = (int)Math.min(Math.max(128 * 1024, stackSize), Integer.MAX_VALUE);
-            nativeThread = new cli.System.Threading.Thread(threadStart, maxStackSize);
-        }
-        nativeThread.set_Name(getName());
-        nativeThread.set_IsBackground(daemon);
-        nativeThread.set_Priority(cli.System.Threading.ThreadPriority.wrap(mapJavaPriorityToClr(priority)));
-        String apartment = Props.props.getProperty("ikvm.apartmentstate", "").toLowerCase();
-        if ("mta".equals(apartment)) {
-            nativeThread.SetApartmentState(cli.System.Threading.ApartmentState.wrap(cli.System.Threading.ApartmentState.MTA));
-        }
-        else if ("sta".equals(apartment)) {
-            nativeThread.SetApartmentState(cli.System.Threading.ApartmentState.wrap(cli.System.Threading.ApartmentState.STA));
-        }
-        threadStatus = 0x0005; // JVMTI_THREAD_STATE_ALIVE + JVMTI_THREAD_STATE_RUNNABLE
-        nativeThread.Start();
-        if (!daemon) {
-            cli.System.Threading.Interlocked.Increment(nonDaemonCount);
-        }
-    }
-
-    /**
-     * If this thread was constructed using a separate
-     * <code>Runnable</code> run object, then that
-     * <code>Runnable</code> object's <code>run</code> method is called;
-     * otherwise, this method does nothing and returns.
-     * <p>
-     * Subclasses of <code>Thread</code> should override this method.
-     *
-     * @see     #start()
-     * @see     #stop()
-     * @see     #Thread(ThreadGroup, Runnable, String)
-     */
-    @Override
-    public void run() {
-        if (target != null) {
-            target.run();
-        }
-    }
-    
-    // [IKVM] for threads started from Java, this method is called on the thread itself,
-    // but for .NET threads it will be called by the finalizer of the Cleanup object.
-    // NOTE there might be a race condition here (when the thread's Cleanup object
-    // is finalized during AppDomain shutdown while the thread is also exiting on its own),
-    // but that doesn't matter because Thread.exit() is safe to call multiple times.
-    void die() {
-        exit();
-        synchronized (lock) {
-            nativeThread = null;
-            threadStatus = 0x0002; // JVMTI_THREAD_STATE_TERMINATED
-        }
-        wakeupJoinedThreads();
-        if (!daemon) {
-            // TODO there is a race condition in the non-daemon counting
-            // (setDaemon() isn't synchronized so it may clear/set the daemon flag without the count being affected)
-            cli.System.Threading.Interlocked.Decrement(nonDaemonCount);
-        }
-        if (current == this) {
-            current = null;
-            // check if we have a cleanup object, this happens if we attach and subsequently detach from JNI code
-            if (cleanup != null) {
-                cli.System.GC.SuppressFinalize(cleanup);
-                cleanup = null;
-            }
-        }
-    }
-
-    private void wakeupJoinedThreads() {
-        // HACK locking this here isn't ideal, because we might be invoked from
-        // the Cleanup object's finalizer and some user code might own the lock and hence
-        // block the finalizer thread.
-        // A second scenario is that another thread is currently blocking inside stop()
-        // (the Thread.Abort() call will block while we are running the finally block)
-        // and that thread will own the lock on our thread object.
-        boolean locked = false;
-        try {
-            locked = cli.System.Threading.Monitor.TryEnter(this);
-            if (locked) {
-                notifyAll();
-            } else {
-                // HACK schedule an asynchronous notification
-                cli.System.Threading.ThreadPool.QueueUserWorkItem(
-                    new cli.System.Threading.WaitCallback(
-                        new cli.System.Threading.WaitCallback.Method() {
-                            public void Invoke(Object thread) {
-                                synchronized (thread) {
-                                    thread.notifyAll();
-                                }
-                            }
-                        }), this);
-            }
-        }
-        finally {
-            if (locked)
-                cli.System.Threading.Monitor.Exit(this);
-        }
-    }
-
-    /**
-     * This method is called by the system to give a Thread
-     * a chance to clean up before it actually exits.
-     */
-    private void exit() {
-        if (group != null) {
-            group.threadTerminated(this);
-            group = null;
-        }
-        /* Aggressively null out all reference fields: see bug 4006245 */
-        target = null;
-        /* Speed the release of some of these resources */
-        threadLocals = null;
-        inheritableThreadLocals = null;
-        inheritedAccessControlContext = null;
-        blocker = null;
-        uncaughtExceptionHandler = null;
-    }
-
-    /**
-     * Forces the thread to stop executing.
-     * <p>
-     * If there is a security manager installed, its <code>checkAccess</code>
-     * method is called with <code>this</code>
-     * as its argument. This may result in a
-     * <code>SecurityException</code> being raised (in the current thread).
-     * <p>
-     * If this thread is different from the current thread (that is, the current
-     * thread is trying to stop a thread other than itself), the
-     * security manager's <code>checkPermission</code> method (with a
-     * <code>RuntimePermission("stopThread")</code> argument) is called in
-     * addition.
-     * Again, this may result in throwing a
-     * <code>SecurityException</code> (in the current thread).
-     * <p>
-     * The thread represented by this thread is forced to stop whatever
-     * it is doing abnormally and to throw a newly created
-     * <code>ThreadDeath</code> object as an exception.
-     * <p>
-     * It is permitted to stop a thread that has not yet been started.
-     * If the thread is eventually started, it immediately terminates.
-     * <p>
-     * An application should not normally try to catch
-     * <code>ThreadDeath</code> unless it must do some extraordinary
-     * cleanup operation (note that the throwing of
-     * <code>ThreadDeath</code> causes <code>finally</code> clauses of
-     * <code>try</code> statements to be executed before the thread
-     * officially dies).  If a <code>catch</code> clause catches a
-     * <code>ThreadDeath</code> object, it is important to rethrow the
-     * object so that the thread actually dies.
-     * <p>
-     * The top-level error handler that reacts to otherwise uncaught
-     * exceptions does not print out a message or otherwise notify the
-     * application if the uncaught exception is an instance of
-     * <code>ThreadDeath</code>.
-     *
-     * @exception  SecurityException  if the current thread cannot
-     *               modify this thread.
-     * @see        #interrupt()
-     * @see        #checkAccess()
-     * @see        #run()
-     * @see        #start()
-     * @see        ThreadDeath
-     * @see        ThreadGroup#uncaughtException(Thread,Throwable)
-     * @see        SecurityManager#checkAccess(Thread)
-     * @see        SecurityManager#checkPermission
-     * @deprecated This method is inherently unsafe.  Stopping a thread with
-     *       Thread.stop causes it to unlock all of the monitors that it
-     *       has locked (as a natural consequence of the unchecked
-     *       <code>ThreadDeath</code> exception propagating up the stack).  If
-     *       any of the objects previously protected by these monitors were in
-     *       an inconsistent state, the damaged objects become visible to
-     *       other threads, potentially resulting in arbitrary behavior.  Many
-     *       uses of <code>stop</code> should be replaced by code that simply
-     *       modifies some variable to indicate that the target thread should
-     *       stop running.  The target thread should check this variable
-     *       regularly, and return from its run method in an orderly fashion
-     *       if the variable indicates that it is to stop running.  If the
-     *       target thread waits for long periods (on a condition variable,
-     *       for example), the <code>interrupt</code> method should be used to
-     *       interrupt the wait.
-     *       For more information, see
-     *       <a href="{@docRoot}/../technotes/guides/concurrency/threadPrimitiveDeprecation.html">Why
-     *       are Thread.stop, Thread.suspend and Thread.resume Deprecated?</a>.
-     */
-    @Deprecated
-    public final void stop() {
-        SecurityManager security = System.getSecurityManager();
-        if (security != null) {
-            checkAccess();
-            if (this != Thread.currentThread()) {
-                security.checkPermission(SecurityConstants.STOP_THREAD_PERMISSION);
-            }
-        }
-        // A zero status value corresponds to "NEW", it can't change to
-        // not-NEW because we hold the lock.
-        if (threadStatus != 0) {
-            resume(); // Wake up thread if it was suspended; no-op otherwise
-        }
-
-        // The VM can handle all thread states
-        stop0(new ThreadDeath());
-    }
-
-    /**
-     * Throws {@code UnsupportedOperationException}.
-     *
-     * @param obj ignored
-     *
-     * @deprecated This method was originally designed to force a thread to stop
-     *        and throw a given {@code Throwable} as an exception. It was
-     *        inherently unsafe (see {@link #stop()} for details), and furthermore
-     *        could be used to generate exceptions that the target thread was
-     *        not prepared to handle.
-     *        For more information, see
-     *        <a href="{@docRoot}/../technotes/guides/concurrency/threadPrimitiveDeprecation.html">Why
-     *        are Thread.stop, Thread.suspend and Thread.resume Deprecated?</a>.
-     */
-    @Deprecated
-    public final synchronized void stop(Throwable obj) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Interrupts this thread.
-     *
-     * <p> Unless the current thread is interrupting itself, which is
-     * always permitted, the {@link #checkAccess() checkAccess} method
-     * of this thread is invoked, which may cause a {@link
-     * SecurityException} to be thrown.
-     *
-     * <p> If this thread is blocked in an invocation of the {@link
-     * Object#wait() wait()}, {@link Object#wait(long) wait(long)}, or {@link
-     * Object#wait(long, int) wait(long, int)} methods of the {@link Object}
-     * class, or of the {@link #join()}, {@link #join(long)}, {@link
-     * #join(long, int)}, {@link #sleep(long)}, or {@link #sleep(long, int)},
-     * methods of this class, then its interrupt status will be cleared and it
-     * will receive an {@link InterruptedException}.
-     *
-     * <p> If this thread is blocked in an I/O operation upon an {@link
-     * java.nio.channels.InterruptibleChannel InterruptibleChannel}
-     * then the channel will be closed, the thread's interrupt
-     * status will be set, and the thread will receive a {@link
-     * java.nio.channels.ClosedByInterruptException}.
-     *
-     * <p> If this thread is blocked in a {@link java.nio.channels.Selector}
-     * then the thread's interrupt status will be set and it will return
-     * immediately from the selection operation, possibly with a non-zero
-     * value, just as if the selector's {@link
-     * java.nio.channels.Selector#wakeup wakeup} method were invoked.
-     *
-     * <p> If none of the previous conditions hold then this thread's interrupt
-     * status will be set. </p>
-     *
-     * <p> Interrupting a thread that is not alive need not have any effect.
-     *
-     * @throws  SecurityException
-     *          if the current thread cannot modify this thread
-     *
-     * @revised 6.0
-     * @spec JSR-51
-     */
-    public void interrupt() {
-        if (this != Thread.currentThread())
-            checkAccess();
-
-        synchronized (blockerLock) {
-            Interruptible b = blocker;
-            if (b != null) {
-                interrupt0();           // Just to set the interrupt flag
-                b.interrupt(this);
-                return;
-            }
-        }
-        interrupt0();
-    }
-
-    /**
-     * Tests whether the current thread has been interrupted.  The
-     * <i>interrupted status</i> of the thread is cleared by this method.  In
-     * other words, if this method were to be called twice in succession, the
-     * second call would return false (unless the current thread were
-     * interrupted again, after the first call had cleared its interrupted
-     * status and before the second call had examined it).
-     *
-     * <p>A thread interruption ignored because a thread was not alive
-     * at the time of the interrupt will be reflected by this method
-     * returning false.
-     *
-     * @return  <code>true</code> if the current thread has been interrupted;
-     *          <code>false</code> otherwise.
-     * @see #isInterrupted()
-     * @revised 6.0
-     */
-    public static boolean interrupted() {
-        Thread current = currentThread();
-        if (!current.interruptPending) {
-            return false;
-        }
-        current.interruptPending = false;
-        return true;
-    }
-
-    /**
-     * Tests whether this thread has been interrupted.  The <i>interrupted
-     * status</i> of the thread is unaffected by this method.
-     *
-     * <p>A thread interruption ignored because a thread was not alive
-     * at the time of the interrupt will be reflected by this method
-     * returning false.
-     *
-     * @return  <code>true</code> if this thread has been interrupted;
-     *          <code>false</code> otherwise.
-     * @see     #interrupted()
-     * @revised 6.0
-     */
-    public boolean isInterrupted() {
-        return interruptPending;
-    }
-
-    /**
-     * Throws {@link NoSuchMethodError}.
-     *
-     * @deprecated This method was originally designed to destroy this
-     *     thread without any cleanup. Any monitors it held would have
-     *     remained locked. However, the method was never implemented.
-     *     If if were to be implemented, it would be deadlock-prone in
-     *     much the manner of {@link #suspend}. If the target thread held
-     *     a lock protecting a critical system resource when it was
-     *     destroyed, no thread could ever access this resource again.
-     *     If another thread ever attempted to lock this resource, deadlock
-     *     would result. Such deadlocks typically manifest themselves as
-     *     "frozen" processes. For more information, see
-     *     <a href="{@docRoot}/../technotes/guides/concurrency/threadPrimitiveDeprecation.html">
-     *     Why are Thread.stop, Thread.suspend and Thread.resume Deprecated?</a>.
-     * @throws NoSuchMethodError always
-     */
-    @Deprecated
-    public void destroy() {
-        throw new NoSuchMethodError();
-    }
-
-    /**
-     * Tests if this thread is alive. A thread is alive if it has
-     * been started and has not yet died.
-     *
-     * @return  <code>true</code> if this thread is alive;
-     *          <code>false</code> otherwise.
-     */
-    public final boolean isAlive() {
-        return (threadStatus & 0x0001) != 0;
-    }
-
-    /**
-     * Suspends this thread.
-     * <p>
-     * First, the <code>checkAccess</code> method of this thread is called
-     * with no arguments. This may result in throwing a
-     * <code>SecurityException </code>(in the current thread).
-     * <p>
-     * If the thread is alive, it is suspended and makes no further
-     * progress unless and until it is resumed.
-     *
-     * @exception  SecurityException  if the current thread cannot modify
-     *               this thread.
-     * @see #checkAccess
-     * @deprecated   This method has been deprecated, as it is
-     *   inherently deadlock-prone.  If the target thread holds a lock on the
-     *   monitor protecting a critical system resource when it is suspended, no
-     *   thread can access this resource until the target thread is resumed. If
-     *   the thread that would resume the target thread attempts to lock this
-     *   monitor prior to calling <code>resume</code>, deadlock results.  Such
-     *   deadlocks typically manifest themselves as "frozen" processes.
-     *   For more information, see
-     *   <a href="{@docRoot}/../technotes/guides/concurrency/threadPrimitiveDeprecation.html">Why
-     *   are Thread.stop, Thread.suspend and Thread.resume Deprecated?</a>.
-     */
-    @Deprecated
-    public final void suspend() {
-        checkAccess();
-        suspend0();
-    }
-
-    /**
-     * Resumes a suspended thread.
-     * <p>
-     * First, the <code>checkAccess</code> method of this thread is called
-     * with no arguments. This may result in throwing a
-     * <code>SecurityException</code> (in the current thread).
-     * <p>
-     * If the thread is alive but suspended, it is resumed and is
-     * permitted to make progress in its execution.
-     *
-     * @exception  SecurityException  if the current thread cannot modify this
-     *               thread.
-     * @see        #checkAccess
-     * @see        #suspend()
-     * @deprecated This method exists solely for use with {@link #suspend},
-     *     which has been deprecated because it is deadlock-prone.
-     *     For more information, see
-     *     <a href="{@docRoot}/../technotes/guides/concurrency/threadPrimitiveDeprecation.html">Why
-     *     are Thread.stop, Thread.suspend and Thread.resume Deprecated?</a>.
-     */
-    @Deprecated
-    public final void resume() {
-        checkAccess();
-        resume0();
-    }
-
-    /**
-     * Changes the priority of this thread.
-     * <p>
-     * First the <code>checkAccess</code> method of this thread is called
-     * with no arguments. This may result in throwing a
-     * <code>SecurityException</code>.
-     * <p>
-     * Otherwise, the priority of this thread is set to the smaller of
-     * the specified <code>newPriority</code> and the maximum permitted
-     * priority of the thread's thread group.
-     *
-     * @param newPriority priority to set this thread to
-     * @exception  IllegalArgumentException  If the priority is not in the
-     *               range <code>MIN_PRIORITY</code> to
-     *               <code>MAX_PRIORITY</code>.
-     * @exception  SecurityException  if the current thread cannot modify
-     *               this thread.
-     * @see        #getPriority
-     * @see        #checkAccess()
-     * @see        #getThreadGroup()
-     * @see        #MAX_PRIORITY
-     * @see        #MIN_PRIORITY
-     * @see        ThreadGroup#getMaxPriority()
-     */
-    public final void setPriority(int newPriority) {
-        ThreadGroup g;
-        checkAccess();
-        if (newPriority > MAX_PRIORITY || newPriority < MIN_PRIORITY) {
-            throw new IllegalArgumentException();
-        }
-        if((g = getThreadGroup()) != null) {
-            if (newPriority > g.getMaxPriority()) {
-                newPriority = g.getMaxPriority();
-            }
-            setPriority0(priority = newPriority);
-        }
-    }
-
-    /**
-     * Returns this thread's priority.
-     *
-     * @return  this thread's priority.
-     * @see     #setPriority
-     */
-    public final int getPriority() {
-        return priority;
-    }
-
-    /**
-     * Changes the name of this thread to be equal to the argument
-     * <code>name</code>.
-     * <p>
-     * First the <code>checkAccess</code> method of this thread is called
-     * with no arguments. This may result in throwing a
-     * <code>SecurityException</code>.
-     *
-     * @param      name   the new name for this thread.
-     * @exception  SecurityException  if the current thread cannot modify this
-     *               thread.
-     * @see        #getName
-     * @see        #checkAccess()
-     */
-    public final synchronized void setName(String name) {
-        checkAccess();
-        this.name = name.toCharArray();
-        if (threadStatus != 0) {
-            setNativeName(name);
-        }
-    }
-
-    /**
-     * Returns this thread's name.
-     *
-     * @return  this thread's name.
-     * @see     #setName(String)
-     */
-    public final String getName() {
-        return String.valueOf(name);
-    }
-
-    /**
-     * Returns the thread group to which this thread belongs.
-     * This method returns null if this thread has died
-     * (been stopped).
-     *
-     * @return  this thread's thread group.
-     */
-    public final ThreadGroup getThreadGroup() {
-        return group;
-    }
-
-    /**
-     * Returns an estimate of the number of active threads in the current
-     * thread's {@linkplain java.lang.ThreadGroup thread group} and its
-     * subgroups. Recursively iterates over all subgroups in the current
-     * thread's thread group.
-     *
-     * <p> The value returned is only an estimate because the number of
-     * threads may change dynamically while this method traverses internal
-     * data structures, and might be affected by the presence of certain
-     * system threads. This method is intended primarily for debugging
-     * and monitoring purposes.
-     *
-     * @return  an estimate of the number of active threads in the current
-     *          thread's thread group and in any other thread group that
-     *          has the current thread's thread group as an ancestor
-     */
-    public static int activeCount() {
-        return currentThread().getThreadGroup().activeCount();
-    }
-
-    /**
-     * Copies into the specified array every active thread in the current
-     * thread's thread group and its subgroups. This method simply
-     * invokes the {@link java.lang.ThreadGroup#enumerate(Thread[])}
-     * method of the current thread's thread group.
-     *
-     * <p> An application might use the {@linkplain #activeCount activeCount}
-     * method to get an estimate of how big the array should be, however
-     * <i>if the array is too short to hold all the threads, the extra threads
-     * are silently ignored.</i>  If it is critical to obtain every active
-     * thread in the current thread's thread group and its subgroups, the
-     * invoker should verify that the returned int value is strictly less
-     * than the length of {@code tarray}.
-     *
-     * <p> Due to the inherent race condition in this method, it is recommended
-     * that the method only be used for debugging and monitoring purposes.
-     *
-     * @param  tarray
-     *         an array into which to put the list of threads
-     *
-     * @return  the number of threads put into the array
-     *
-     * @throws  SecurityException
-     *          if {@link java.lang.ThreadGroup#checkAccess} determines that
-     *          the current thread cannot access its thread group
-     */
-    public static int enumerate(Thread tarray[]) {
-        return currentThread().getThreadGroup().enumerate(tarray);
-    }
-
-    /**
-     * Counts the number of stack frames in this thread. The thread must
-     * be suspended.
-     *
-     * @return     the number of stack frames in this thread.
-     * @exception  IllegalThreadStateException  if this thread is not
-     *             suspended.
-     * @deprecated The definition of this call depends on {@link #suspend},
-     *             which is deprecated.  Further, the results of this call
-     *             were never well-defined.
-     */
-    @Deprecated
-    public int countStackFrames() {
-        return 0;
-    }
-
-    /**
-     * Waits at most {@code millis} milliseconds for this thread to
-     * die. A timeout of {@code 0} means to wait forever.
-     *
-     * <p> This implementation uses a loop of {@code this.wait} calls
-     * conditioned on {@code this.isAlive}. As a thread terminates the
-     * {@code this.notifyAll} method is invoked. It is recommended that
-     * applications not use {@code wait}, {@code notify}, or
-     * {@code notifyAll} on {@code Thread} instances.
-     *
-     * @param  millis
-     *         the time to wait in milliseconds
-     *
-     * @throws  IllegalArgumentException
-     *          if the value of {@code millis} is negative
-     *
-     * @throws  InterruptedException
-     *          if any thread has interrupted the current thread. The
-     *          <i>interrupted status</i> of the current thread is
-     *          cleared when this exception is thrown.
-     */
-    public final synchronized void join(long millis)
-    throws InterruptedException {
-        long base = System.currentTimeMillis();
-        long now = 0;
-
-        if (millis < 0) {
-            throw new IllegalArgumentException("timeout value is negative");
-        }
-
-        if (millis == 0) {
-            while (isAlive()) {
-                wait(0);
-            }
-        } else {
-            while (isAlive()) {
-                long delay = millis - now;
-                if (delay <= 0) {
-                    break;
-                }
-                wait(delay);
-                now = System.currentTimeMillis() - base;
-            }
-        }
-    }
-
-    /**
-     * Waits at most {@code millis} milliseconds plus
-     * {@code nanos} nanoseconds for this thread to die.
-     *
-     * <p> This implementation uses a loop of {@code this.wait} calls
-     * conditioned on {@code this.isAlive}. As a thread terminates the
-     * {@code this.notifyAll} method is invoked. It is recommended that
-     * applications not use {@code wait}, {@code notify}, or
-     * {@code notifyAll} on {@code Thread} instances.
-     *
-     * @param  millis
-     *         the time to wait in milliseconds
-     *
-     * @param  nanos
-     *         {@code 0-999999} additional nanoseconds to wait
-     *
-     * @throws  IllegalArgumentException
-     *          if the value of {@code millis} is negative, or the value
-     *          of {@code nanos} is not in the range {@code 0-999999}
-     *
-     * @throws  InterruptedException
-     *          if any thread has interrupted the current thread. The
-     *          <i>interrupted status</i> of the current thread is
-     *          cleared when this exception is thrown.
-     */
-    public final synchronized void join(long millis, int nanos)
-    throws InterruptedException {
-
-        if (millis < 0) {
-            throw new IllegalArgumentException("timeout value is negative");
-        }
-
-        if (nanos < 0 || nanos > 999999) {
-            throw new IllegalArgumentException(
-                                "nanosecond timeout value out of range");
-        }
-
-        if (nanos >= 500000 || (nanos != 0 && millis == 0)) {
-            millis++;
-        }
-
-        join(millis);
-    }
-
-    /**
-     * Waits for this thread to die.
-     *
-     * <p> An invocation of this method behaves in exactly the same
-     * way as the invocation
-     *
-     * <blockquote>
-     * {@linkplain #join(long) join}{@code (0)}
-     * </blockquote>
-     *
-     * @throws  InterruptedException
-     *          if any thread has interrupted the current thread. The
-     *          <i>interrupted status</i> of the current thread is
-     *          cleared when this exception is thrown.
-     */
-    public final void join() throws InterruptedException {
-        join(0);
-    }
-
-    /**
-     * Prints a stack trace of the current thread to the standard error stream.
-     * This method is used only for debugging.
-     *
-     * @see     Throwable#printStackTrace()
-     */
-    public static void dumpStack() {
-        new Exception("Stack trace").printStackTrace();
-    }
-
-    /**
-     * Marks this thread as either a {@linkplain #isDaemon daemon} thread
-     * or a user thread. The Java Virtual Machine exits when the only
-     * threads running are all daemon threads.
-     *
-     * <p> This method must be invoked before the thread is started.
-     *
-     * @param  on
-     *         if {@code true}, marks this thread as a daemon thread
-     *
-     * @throws  IllegalThreadStateException
-     *          if this thread is {@linkplain #isAlive alive}
-     *
-     * @throws  SecurityException
-     *          if {@link #checkAccess} determines that the current
-     *          thread cannot modify this thread
-     */
-    public final void setDaemon(boolean on) {
-        checkAccess();
-        if (isAlive()) {
-            throw new IllegalThreadStateException();
-        }
-        daemon = on;
-    }
-
-    /**
-     * Tests if this thread is a daemon thread.
-     *
-     * @return  <code>true</code> if this thread is a daemon thread;
-     *          <code>false</code> otherwise.
-     * @see     #setDaemon(boolean)
-     */
-    public final boolean isDaemon() {
-        return daemon;
-    }
-
-    /**
-     * Determines if the currently running thread has permission to
-     * modify this thread.
-     * <p>
-     * If there is a security manager, its <code>checkAccess</code> method
-     * is called with this thread as its argument. This may result in
-     * throwing a <code>SecurityException</code>.
-     *
-     * @exception  SecurityException  if the current thread is not allowed to
-     *               access this thread.
-     * @see        SecurityManager#checkAccess(Thread)
-     */
-    public final void checkAccess() {
-        SecurityManager security = System.getSecurityManager();
-        if (security != null) {
-            security.checkAccess(this);
-        }
-    }
-
-    /**
-     * Returns a string representation of this thread, including the
-     * thread's name, priority, and thread group.
-     *
-     * @return  a string representation of this thread.
-     */
-    public String toString() {
-        ThreadGroup group = getThreadGroup();
-        if (group != null) {
-            return "Thread[" + getName() + "," + getPriority() + "," +
-                           group.getName() + "]";
-        } else {
-            return "Thread[" + getName() + "," + getPriority() + "," +
-                            "" + "]";
-        }
-    }
-
-    /**
-     * Returns the context ClassLoader for this Thread. The context
-     * ClassLoader is provided by the creator of the thread for use
-     * by code running in this thread when loading classes and resources.
-     * If not {@linkplain #setContextClassLoader set}, the default is the
-     * ClassLoader context of the parent Thread. The context ClassLoader of the
-     * primordial thread is typically set to the class loader used to load the
-     * application.
-     *
-     * <p>If a security manager is present, and the invoker's class loader is not
-     * {@code null} and is not the same as or an ancestor of the context class
-     * loader, then this method invokes the security manager's {@link
-     * SecurityManager#checkPermission(java.security.Permission) checkPermission}
-     * method with a {@link RuntimePermission RuntimePermission}{@code
-     * ("getClassLoader")} permission to verify that retrieval of the context
-     * class loader is permitted.
-     *
-     * @return  the context ClassLoader for this Thread, or {@code null}
-     *          indicating the system class loader (or, failing that, the
-     *          bootstrap class loader)
-     *
-     * @throws  SecurityException
-     *          if the current thread cannot get the context ClassLoader
-     *
-     * @since 1.2
-     */
-    @CallerSensitive
-    public ClassLoader getContextClassLoader() {
-        if (contextClassLoader == ClassLoader.DUMMY) {
-            contextClassLoader = ClassLoader.getSystemClassLoader();
-        }
-        if (contextClassLoader == null)
-            return null;
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            ClassLoader.checkClassLoaderPermission(contextClassLoader,
-                                                   Reflection.getCallerClass());
-        }
-        return contextClassLoader;
-    }
-
-    /**
-     * Sets the context ClassLoader for this Thread. The context
-     * ClassLoader can be set when a thread is created, and allows
-     * the creator of the thread to provide the appropriate class loader,
-     * through {@code getContextClassLoader}, to code running in the thread
-     * when loading classes and resources.
-     *
-     * <p>If a security manager is present, its {@link
-     * SecurityManager#checkPermission(java.security.Permission) checkPermission}
-     * method is invoked with a {@link RuntimePermission RuntimePermission}{@code
-     * ("setContextClassLoader")} permission to see if setting the context
-     * ClassLoader is permitted.
-     *
-     * @param  cl
-     *         the context ClassLoader for this Thread, or null  indicating the
-     *         system class loader (or, failing that, the bootstrap class loader)
-     *
-     * @throws  SecurityException
-     *          if the current thread cannot set the context ClassLoader
-     *
-     * @since 1.2
-     */
-    public void setContextClassLoader(ClassLoader cl) {
-        if (cl == ClassLoader.DUMMY) {
-            // we're being called by Thread.<clinit> to force this method to be JIT compiled
-            return;
-        }
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(new RuntimePermission("setContextClassLoader"));
-        }
-        contextClassLoader = cl;
-    }
-
-    // [IKVM] called by sun.misc.Launcher (via map.xml patch) to initialize the context class loader
-    final void initContextClassLoader(ClassLoader cl) {
-        // we only set contextClassLoader if it hasn't been set (by user code) previously
-        java.util.concurrent.atomic.AtomicReferenceFieldUpdater
-            .newUpdater(Thread.class, ClassLoader.class, "contextClassLoader")
-            .compareAndSet(this, ClassLoader.DUMMY, cl);
-    }
-
-    /**
-     * Returns <tt>true</tt> if and only if the current thread holds the
-     * monitor lock on the specified object.
-     *
-     * <p>This method is designed to allow a program to assert that
-     * the current thread already holds a specified lock:
-     * <pre>
-     *     assert Thread.holdsLock(obj);
-     * </pre>
-     *
-     * @param  obj the object on which to test lock ownership
-     * @throws NullPointerException if obj is <tt>null</tt>
-     * @return <tt>true</tt> if the current thread holds the monitor lock on
-     *         the specified object.
-     * @since 1.4
-     */
-    public static boolean holdsLock(Object obj) {
-        if (obj == null) {
-            throw new NullPointerException();
-        }
-        try {
-            if (false) throw new cli.System.Threading.SynchronizationLockException();
-            // The 1.5 memory model (JSR133) explicitly allows spurious wake-ups from Object.wait,
-            // so we abuse Pulse to check if we own the monitor.
-            cli.System.Threading.Monitor.Pulse(obj);
-            return true;
-        }
-        catch (cli.System.Threading.SynchronizationLockException _) {
-            return false;
-        }
-    }
-
-    private static final StackTraceElement[] EMPTY_STACK_TRACE
-        = new StackTraceElement[0];
-
-    /**
-     * Returns an array of stack trace elements representing the stack dump
-     * of this thread.  This method will return a zero-length array if
-     * this thread has not started, has started but has not yet been
-     * scheduled to run by the system, or has terminated.
-     * If the returned array is of non-zero length then the first element of
-     * the array represents the top of the stack, which is the most recent
-     * method invocation in the sequence.  The last element of the array
-     * represents the bottom of the stack, which is the least recent method
-     * invocation in the sequence.
-     *
-     * <p>If there is a security manager, and this thread is not
-     * the current thread, then the security manager's
-     * <tt>checkPermission</tt> method is called with a
-     * <tt>RuntimePermission("getStackTrace")</tt> permission
-     * to see if it's ok to get the stack trace.
-     *
-     * <p>Some virtual machines may, under some circumstances, omit one
-     * or more stack frames from the stack trace.  In the extreme case,
-     * a virtual machine that has no stack trace information concerning
-     * this thread is permitted to return a zero-length array from this
-     * method.
-     *
-     * @return an array of <tt>StackTraceElement</tt>,
-     * each represents one stack frame.
-     *
-     * @throws SecurityException
-     *        if a security manager exists and its
-     *        <tt>checkPermission</tt> method doesn't allow
-     *        getting the stack trace of thread.
-     * @see SecurityManager#checkPermission
-     * @see RuntimePermission
-     * @see Throwable#getStackTrace
-     *
-     * @since 1.5
-     */
-    public StackTraceElement[] getStackTrace() {
-        if (this != Thread.currentThread()) {
-            // check for getStackTrace permission
-            SecurityManager security = System.getSecurityManager();
-            if (security != null) {
-                security.checkPermission(
-                    SecurityConstants.GET_STACK_TRACE_PERMISSION);
-            }
-            // optimization so we do not call into the vm for threads that
-            // have not yet started or have terminated
-            if (!isAlive()) {
-                return EMPTY_STACK_TRACE;
-            }
-            StackTraceElement[][] stackTraceArray = dumpThreads(new Thread[] {this});
-            StackTraceElement[] stackTrace = stackTraceArray[0];
-            // a thread that was alive during the previous isAlive call may have
-            // since terminated, therefore not having a stacktrace.
-            if (stackTrace == null) {
-                stackTrace = EMPTY_STACK_TRACE;
-            }
-            return stackTrace;
-        } else {
-            // Don't need JVM help for current thread
-            return (new Exception()).getStackTrace();
-        }
-    }
-
-    /**
-     * Returns a map of stack traces for all live threads.
-     * The map keys are threads and each map value is an array of
-     * <tt>StackTraceElement</tt> that represents the stack dump
-     * of the corresponding <tt>Thread</tt>.
-     * The returned stack traces are in the format specified for
-     * the {@link #getStackTrace getStackTrace} method.
-     *
-     * <p>The threads may be executing while this method is called.
-     * The stack trace of each thread only represents a snapshot and
-     * each stack trace may be obtained at different time.  A zero-length
-     * array will be returned in the map value if the virtual machine has
-     * no stack trace information about a thread.
-     *
-     * <p>If there is a security manager, then the security manager's
-     * <tt>checkPermission</tt> method is called with a
-     * <tt>RuntimePermission("getStackTrace")</tt> permission as well as
-     * <tt>RuntimePermission("modifyThreadGroup")</tt> permission
-     * to see if it is ok to get the stack trace of all threads.
-     *
-     * @return a <tt>Map</tt> from <tt>Thread</tt> to an array of
-     * <tt>StackTraceElement</tt> that represents the stack trace of
-     * the corresponding thread.
-     *
-     * @throws SecurityException
-     *        if a security manager exists and its
-     *        <tt>checkPermission</tt> method doesn't allow
-     *        getting the stack trace of thread.
-     * @see #getStackTrace
-     * @see SecurityManager#checkPermission
-     * @see RuntimePermission
-     * @see Throwable#getStackTrace
-     *
-     * @since 1.5
-     */
-    public static Map<Thread, StackTraceElement[]> getAllStackTraces() {
-        // check for getStackTrace permission
-        SecurityManager security = System.getSecurityManager();
-        if (security != null) {
-            security.checkPermission(
-                SecurityConstants.GET_STACK_TRACE_PERMISSION);
-            security.checkPermission(
-                SecurityConstants.MODIFY_THREADGROUP_PERMISSION);
-        }
-
-        // Get a snapshot of the list of all threads
-        Thread[] threads = getThreads();
-        StackTraceElement[][] traces = dumpThreads(threads);
-        Map<Thread, StackTraceElement[]> m = new HashMap<>(threads.length);
-        for (int i = 0; i < threads.length; i++) {
-            StackTraceElement[] stackTrace = traces[i];
-            if (stackTrace != null) {
-                m.put(threads[i], stackTrace);
-            }
-            // else terminated so we don't put it in the map
-        }
-        return m;
-    }
-
-
-    private static final RuntimePermission SUBCLASS_IMPLEMENTATION_PERMISSION =
-                    new RuntimePermission("enableContextClassLoaderOverride");
-
-    /** cache of subclass security audit results */
-    /* Replace with ConcurrentReferenceHashMap when/if it appears in a future
-     * release */
-    private static class Caches {
-        /** cache of subclass security audit results */
-        static final ConcurrentMap<WeakClassKey,Boolean> subclassAudits =
-            new ConcurrentHashMap<>();
-
-        /** queue for WeakReferences to audited subclasses */
-        static final ReferenceQueue<Class<?>> subclassAuditsQueue =
-            new ReferenceQueue<>();
-    }
-
-    /**
-     * Verifies that this (possibly subclass) instance can be constructed
-     * without violating security constraints: the subclass must not override
-     * security-sensitive non-final methods, or else the
-     * "enableContextClassLoaderOverride" RuntimePermission is checked.
-     */
-    @cli.System.Runtime.CompilerServices.MethodImplAttribute.Annotation(value = cli.System.Runtime.CompilerServices.MethodImplOptions.__Enum.NoInlining)
-    private static native boolean isCCLOverridden(Thread thread); // [IKVM] implemented in map.xml
-
-    private static boolean isCCLOverridden(Class<?> cl) {
-        if (cl == Thread.class)
-            return false;
-
-        processQueue(Caches.subclassAuditsQueue, Caches.subclassAudits);
-        WeakClassKey key = new WeakClassKey(cl, Caches.subclassAuditsQueue);
-        Boolean result = Caches.subclassAudits.get(key);
-        if (result == null) {
-            result = Boolean.valueOf(auditSubclass(cl));
-            Caches.subclassAudits.putIfAbsent(key, result);
-        }
-
-        return result.booleanValue();
-    }
-
-    /**
-     * Performs reflective checks on given subclass to verify that it doesn't
-     * override security-sensitive non-final methods.  Returns true if the
-     * subclass overrides any of the methods, false otherwise.
-     */
-    private static boolean auditSubclass(final Class<?> subcl) {
-        Boolean result = AccessController.doPrivileged(
-            new PrivilegedAction<Boolean>() {
-                public Boolean run() {
-                    for (Class<?> cl = subcl;
-                         cl != Thread.class;
-                         cl = cl.getSuperclass())
-                    {
-                        try {
-                            cl.getDeclaredMethod("getContextClassLoader", new Class<?>[0]);
-                            return Boolean.TRUE;
-                        } catch (NoSuchMethodException ex) {
-                        }
-                        try {
-                            Class<?>[] params = {ClassLoader.class};
-                            cl.getDeclaredMethod("setContextClassLoader", params);
-                            return Boolean.TRUE;
-                        } catch (NoSuchMethodException ex) {
-                        }
-                    }
-                    return Boolean.FALSE;
-                }
-            }
-        );
-        return result.booleanValue();
-    }
-
-    private static StackTraceElement[][] dumpThreads(Thread[] threads) {
-        StackTraceElement[][] stacks = new StackTraceElement[threads.length][];
-        for (int i = 0; i < threads.length; i++) {
-            cli.System.Threading.Thread nativeThread = threads[i].nativeThread;
-            if (nativeThread == null) {
-                stacks[i] = new StackTraceElement[0];
-            } else {
-                try {
-                    if (false) throw new cli.System.Threading.ThreadStateException();
-                    boolean suspended = false;
-                    if ((nativeThread.get_ThreadState().Value & cli.System.Threading.ThreadState.Suspended) == 0 && nativeThread != cli.System.Threading.Thread.get_CurrentThread()) {
-                        suspended = true;
-                        nativeThread.Suspend();
-                    }
-                    cli.System.Diagnostics.StackTrace stack;
-                    try {
-                        stack = new cli.System.Diagnostics.StackTrace(nativeThread, true);
-                    }
-                    finally {
-                        if (suspended) {
-                            nativeThread.Resume();
-                        }
-                    }
-                    stacks[i] = getStackTrace(stack);
-                }
-                catch (cli.System.Threading.ThreadStateException _) {
-                    stacks[i] = new StackTraceElement[0];
-                }
-            }
-        }
-        return stacks;
-    }
-    
-    private static native StackTraceElement[] getStackTrace(cli.System.Diagnostics.StackTrace stack);
-
-    private static native Thread[] getThreads();
-
-    /**
-     * Returns the identifier of this Thread.  The thread ID is a positive
-     * <tt>long</tt> number generated when this thread was created.
-     * The thread ID is unique and remains unchanged during its lifetime.
-     * When a thread is terminated, this thread ID may be reused.
-     *
-     * @return this thread's ID.
-     * @since 1.5
-     */
-    public long getId() {
-        return tid;
-    }
-
-    /**
-     * A thread state.  A thread can be in one of the following states:
-     * <ul>
-     * <li>{@link #NEW}<br>
-     *     A thread that has not yet started is in this state.
-     *     </li>
-     * <li>{@link #RUNNABLE}<br>
-     *     A thread executing in the Java virtual machine is in this state.
-     *     </li>
-     * <li>{@link #BLOCKED}<br>
-     *     A thread that is blocked waiting for a monitor lock
-     *     is in this state.
-     *     </li>
-     * <li>{@link #WAITING}<br>
-     *     A thread that is waiting indefinitely for another thread to
-     *     perform a particular action is in this state.
-     *     </li>
-     * <li>{@link #TIMED_WAITING}<br>
-     *     A thread that is waiting for another thread to perform an action
-     *     for up to a specified waiting time is in this state.
-     *     </li>
-     * <li>{@link #TERMINATED}<br>
-     *     A thread that has exited is in this state.
-     *     </li>
-     * </ul>
-     *
-     * <p>
-     * A thread can be in only one state at a given point in time.
-     * These states are virtual machine states which do not reflect
-     * any operating system thread states.
-     *
-     * @since   1.5
-     * @see #getState
-     */
-    public enum State {
-        /**
-         * Thread state for a thread which has not yet started.
-         */
-        NEW,
-
-        /**
-         * Thread state for a runnable thread.  A thread in the runnable
-         * state is executing in the Java virtual machine but it may
-         * be waiting for other resources from the operating system
-         * such as processor.
-         */
-        RUNNABLE,
-
-        /**
-         * Thread state for a thread blocked waiting for a monitor lock.
-         * A thread in the blocked state is waiting for a monitor lock
-         * to enter a synchronized block/method or
-         * reenter a synchronized block/method after calling
-         * {@link Object#wait() Object.wait}.
-         */
-        BLOCKED,
-
-        /**
-         * Thread state for a waiting thread.
-         * A thread is in the waiting state due to calling one of the
-         * following methods:
-         * <ul>
-         *   <li>{@link Object#wait() Object.wait} with no timeout</li>
-         *   <li>{@link #join() Thread.join} with no timeout</li>
-         *   <li>{@link LockSupport#park() LockSupport.park}</li>
-         * </ul>
-         *
-         * <p>A thread in the waiting state is waiting for another thread to
-         * perform a particular action.
-         *
-         * For example, a thread that has called <tt>Object.wait()</tt>
-         * on an object is waiting for another thread to call
-         * <tt>Object.notify()</tt> or <tt>Object.notifyAll()</tt> on
-         * that object. A thread that has called <tt>Thread.join()</tt>
-         * is waiting for a specified thread to terminate.
-         */
-        WAITING,
-
-        /**
-         * Thread state for a waiting thread with a specified waiting time.
-         * A thread is in the timed waiting state due to calling one of
-         * the following methods with a specified positive waiting time:
-         * <ul>
-         *   <li>{@link #sleep Thread.sleep}</li>
-         *   <li>{@link Object#wait(long) Object.wait} with timeout</li>
-         *   <li>{@link #join(long) Thread.join} with timeout</li>
-         *   <li>{@link LockSupport#parkNanos LockSupport.parkNanos}</li>
-         *   <li>{@link LockSupport#parkUntil LockSupport.parkUntil}</li>
-         * </ul>
-         */
-        TIMED_WAITING,
-
-        /**
-         * Thread state for a terminated thread.
-         * The thread has completed execution.
-         */
-        TERMINATED;
-    }
-
-    /**
-     * Returns the state of this thread.
-     * This method is designed for use in monitoring of the system state,
-     * not for synchronization control.
-     *
-     * @return this thread's state.
-     * @since 1.5
-     */
-    public State getState() {
-        // get current thread state
-        switch (threadStatus) {
-            case 0:
-                return State.NEW;
-            case 0x0002:
-                return State.TERMINATED;
-        }
-        synchronized (lock) {
-            if (interruptableWait) {
-                // NOTE if objectWait has satisfied the wait condition (or has been interrupted or has timed-out),
-                // it can be blocking on the re-acquire of the monitor, but we have no way of detecting that.
-                return timedWait ? State.TIMED_WAITING : State.WAITING;
-            }
-        }
-        cli.System.Threading.Thread nativeThread = this.nativeThread;
-        if (nativeThread == null) {
-            return State.TERMINATED;
-        }
-        if ((nativeThread.get_ThreadState().Value & cli.System.Threading.ThreadState.WaitSleepJoin) != 0) {
-            return State.BLOCKED;
-        }
-        return State.RUNNABLE;
-    }
-
-    // Added in JSR-166
-
-    /**
-     * Interface for handlers invoked when a <tt>Thread</tt> abruptly
-     * terminates due to an uncaught exception.
-     * <p>When a thread is about to terminate due to an uncaught exception
-     * the Java Virtual Machine will query the thread for its
-     * <tt>UncaughtExceptionHandler</tt> using
-     * {@link #getUncaughtExceptionHandler} and will invoke the handler's
-     * <tt>uncaughtException</tt> method, passing the thread and the
-     * exception as arguments.
-     * If a thread has not had its <tt>UncaughtExceptionHandler</tt>
-     * explicitly set, then its <tt>ThreadGroup</tt> object acts as its
-     * <tt>UncaughtExceptionHandler</tt>. If the <tt>ThreadGroup</tt> object
-     * has no
-     * special requirements for dealing with the exception, it can forward
-     * the invocation to the {@linkplain #getDefaultUncaughtExceptionHandler
-     * default uncaught exception handler}.
-     *
-     * @see #setDefaultUncaughtExceptionHandler
-     * @see #setUncaughtExceptionHandler
-     * @see ThreadGroup#uncaughtException
-     * @since 1.5
-     */
-    @FunctionalInterface
-    public interface UncaughtExceptionHandler {
-        /**
-         * Method invoked when the given thread terminates due to the
-         * given uncaught exception.
-         * <p>Any exception thrown by this method will be ignored by the
-         * Java Virtual Machine.
-         * @param t the thread
-         * @param e the exception
-         */
-        void uncaughtException(Thread t, Throwable e);
-    }
-
-    // null unless explicitly set
-    private volatile UncaughtExceptionHandler uncaughtExceptionHandler;
-
-    // null unless explicitly set
-    private static volatile UncaughtExceptionHandler defaultUncaughtExceptionHandler;
-
-    /**
-     * Set the default handler invoked when a thread abruptly terminates
-     * due to an uncaught exception, and no other handler has been defined
-     * for that thread.
-     *
-     * <p>Uncaught exception handling is controlled first by the thread, then
-     * by the thread's {@link ThreadGroup} object and finally by the default
-     * uncaught exception handler. If the thread does not have an explicit
-     * uncaught exception handler set, and the thread's thread group
-     * (including parent thread groups)  does not specialize its
-     * <tt>uncaughtException</tt> method, then the default handler's
-     * <tt>uncaughtException</tt> method will be invoked.
-     * <p>By setting the default uncaught exception handler, an application
-     * can change the way in which uncaught exceptions are handled (such as
-     * logging to a specific device, or file) for those threads that would
-     * already accept whatever &quot;default&quot; behavior the system
-     * provided.
-     *
-     * <p>Note that the default uncaught exception handler should not usually
-     * defer to the thread's <tt>ThreadGroup</tt> object, as that could cause
-     * infinite recursion.
-     *
-     * @param eh the object to use as the default uncaught exception handler.
-     * If <tt>null</tt> then there is no default handler.
-     *
-     * @throws SecurityException if a security manager is present and it
-     *         denies <tt>{@link RuntimePermission}
-     *         (&quot;setDefaultUncaughtExceptionHandler&quot;)</tt>
-     *
-     * @see #setUncaughtExceptionHandler
-     * @see #getUncaughtExceptionHandler
-     * @see ThreadGroup#uncaughtException
-     * @since 1.5
-     */
-    public static void setDefaultUncaughtExceptionHandler(UncaughtExceptionHandler eh) {
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(
-                new RuntimePermission("setDefaultUncaughtExceptionHandler")
-                    );
-        }
-
-         defaultUncaughtExceptionHandler = eh;
-     }
-
-    /**
-     * Returns the default handler invoked when a thread abruptly terminates
-     * due to an uncaught exception. If the returned value is <tt>null</tt>,
-     * there is no default.
-     * @since 1.5
-     * @see #setDefaultUncaughtExceptionHandler
-     * @return the default uncaught exception handler for all threads
-     */
-    public static UncaughtExceptionHandler getDefaultUncaughtExceptionHandler(){
-        return defaultUncaughtExceptionHandler;
-    }
-
-    /**
-     * Returns the handler invoked when this thread abruptly terminates
-     * due to an uncaught exception. If this thread has not had an
-     * uncaught exception handler explicitly set then this thread's
-     * <tt>ThreadGroup</tt> object is returned, unless this thread
-     * has terminated, in which case <tt>null</tt> is returned.
-     * @since 1.5
-     * @return the uncaught exception handler for this thread
-     */
-    public UncaughtExceptionHandler getUncaughtExceptionHandler() {
-        return uncaughtExceptionHandler != null ?
-            uncaughtExceptionHandler : group;
-    }
-
-    /**
-     * Set the handler invoked when this thread abruptly terminates
-     * due to an uncaught exception.
-     * <p>A thread can take full control of how it responds to uncaught
-     * exceptions by having its uncaught exception handler explicitly set.
-     * If no such handler is set then the thread's <tt>ThreadGroup</tt>
-     * object acts as its handler.
-     * @param eh the object to use as this thread's uncaught exception
-     * handler. If <tt>null</tt> then this thread has no explicit handler.
-     * @throws  SecurityException  if the current thread is not allowed to
-     *          modify this thread.
-     * @see #setDefaultUncaughtExceptionHandler
-     * @see ThreadGroup#uncaughtException
-     * @since 1.5
-     */
-    public void setUncaughtExceptionHandler(UncaughtExceptionHandler eh) {
-        checkAccess();
-        uncaughtExceptionHandler = eh;
-    }
-
-    /**
-     * Dispatch an uncaught exception to the handler. This method is
-     * intended to be called only by the JVM.
-     */
-    private void dispatchUncaughtException(Throwable e) {
-        getUncaughtExceptionHandler().uncaughtException(this, e);
-    }
-
-    /**
-     * Removes from the specified map any keys that have been enqueued
-     * on the specified reference queue.
-     */
-    static void processQueue(ReferenceQueue<Class<?>> queue,
-                             ConcurrentMap<? extends
-                             WeakReference<Class<?>>, ?> map)
-    {
-        Reference<? extends Class<?>> ref;
-        while((ref = queue.poll()) != null) {
-            map.remove(ref);
-        }
-    }
-
-    /**
-     *  Weak key for Class objects.
-     **/
-    static class WeakClassKey extends WeakReference<Class<?>> {
-        /**
-         * saved value of the referent's identity hash code, to maintain
-         * a consistent hash code after the referent has been cleared
-         */
-        private final int hash;
-
-        /**
-         * Create a new WeakClassKey to the given object, registered
-         * with a queue.
-         */
-        WeakClassKey(Class<?> cl, ReferenceQueue<Class<?>> refQueue) {
-            super(cl, refQueue);
-            hash = System.identityHashCode(cl);
-        }
-
-        /**
-         * Returns the identity hash code of the original referent.
-         */
-        @Override
-        public int hashCode() {
-            return hash;
-        }
-
-        /**
-         * Returns true if the given object is this identical
-         * WeakClassKey instance, or, if this object's referent has not
-         * been cleared, if the given object is another WeakClassKey
-         * instance with the identical non-null referent as this one.
-         */
-        @Override
-        public boolean equals(Object obj) {
-            if (obj == this)
-                return true;
-
-            if (obj instanceof WeakClassKey) {
-                Object referent = get();
-                return (referent != null) &&
-                       (referent == ((WeakClassKey) obj).get());
-            } else {
-                return false;
-            }
-        }
-    }
-
-
-    // The following three initially uninitialized fields are exclusively
-    // managed by class java.util.concurrent.ThreadLocalRandom. These
-    // fields are used to build the high-performance PRNGs in the
-    // concurrent code, and we can not risk accidental false sharing.
-    // Hence, the fields are isolated with @Contended.
-
-    /** The current seed for a ThreadLocalRandom */
-    @sun.misc.Contended("tlr")
-    long threadLocalRandomSeed;
-
-    /** Probe hash value; nonzero if threadLocalRandomSeed initialized */
-    @sun.misc.Contended("tlr")
-    @ikvm.lang.Internal // [IKVM] accessed from java.util.concurrent.atomic.Striped64
-    public int threadLocalRandomProbe;
-
-    /** Secondary seed isolated from public ThreadLocalRandom sequence */
-    @sun.misc.Contended("tlr")
-    @ikvm.lang.Internal // [IKVM] accessed from java.util.concurrent.locks.LockSupport
-    public int threadLocalRandomSecondarySeed;
-
-    /* Some private helper methods */
-    private synchronized void setPriority0(int newPriority) {
-        cli.System.Threading.Thread nativeThread = this.nativeThread;
-        if (nativeThread != null) {
-            try {
-                if (false) throw new cli.System.Threading.ThreadStateException();
-                nativeThread.set_Priority(cli.System.Threading.ThreadPriority.wrap(mapJavaPriorityToClr(newPriority)));
-            }
-            catch (cli.System.Threading.ThreadStateException _) {
-            }
-        }
-    }
-
-    private void stop0(Throwable x) {
-        synchronized (lock) {
-            if (!running) {
-                stillborn = x;
-                x = null;
-            }
-        }
-        if (x != null) {
-            // NOTE we allow ThreadDeath (and its subclasses) to be thrown on every thread, but any
-            // other exception is ignored, except if we're throwing it on the current Thread. This
-            // is done to allow exception handlers to be type specific, otherwise every exception
-            // handler would have to catch ThreadAbortException and look inside it to see if it
-            // contains the real exception that we wish to handle.
-            // I hope we can get away with this behavior, because Thread.stop() is deprecated
-            // anyway. Note that we do allow arbitrary exceptions to be thrown on the current
-            // thread, since this is harmless (because they aren't wrapped) and also because it
-            // provides some real value, because it is one of the ways you can throw arbitrary checked
-            // exceptions from Java.
-            if (this == current) {
-                sun.misc.Unsafe.getUnsafe().throwException(x);
-            }
-            else if (x instanceof ThreadDeath) {
-                cli.System.Threading.Thread nativeThread = this.nativeThread;
-                if (nativeThread == null) {
-                    return;
-                }
-                try {
-                    if (false) throw new cli.System.Threading.ThreadStateException();
-                    nativeThread.Abort(x);
-                }
-                catch (cli.System.Threading.ThreadStateException _) {
-                    // .NET 2.0 throws a ThreadStateException if the target thread is currently suspended
-                    // (but it does record the Abort request)
-                }
-                try {
-                    if (false) throw new cli.System.Threading.ThreadStateException();
-                    int suspend = cli.System.Threading.ThreadState.Suspended | cli.System.Threading.ThreadState.SuspendRequested;
-                    while ((nativeThread.get_ThreadState().Value & suspend) != 0) {
-                        nativeThread.Resume();
-                    }
-                }
-                catch (cli.System.Threading.ThreadStateException _) {
-                }
-            }
-        }
-    }
-
-    private void suspend0() {
-        try {
-            if (false) throw new cli.System.Threading.ThreadStateException();
-            cli.System.Threading.Thread nativeThread = this.nativeThread;
-            if (nativeThread != null) {
-                nativeThread.Suspend();
-            }
-        }
-        catch (cli.System.Threading.ThreadStateException _) {
-        }
-    }
-
-    private void resume0() {
-        try {
-            if (false) throw new cli.System.Threading.ThreadStateException();
-            cli.System.Threading.Thread nativeThread = this.nativeThread;
-            if (nativeThread != null) {
-                nativeThread.Resume();
-            }
-        }
-        catch (cli.System.Threading.ThreadStateException _) {
-        }
-    }
-
-    private void interrupt0() {
-        synchronized (lock) {
-            // if the thread hasn't been started yet or has been terminated, the interrupt is ignored
-            // (like on the reference implementation)
-            if (nativeThread == null) {
-                return;
-            }
-            if (!interruptPending) {
-                interruptPending = true;
-                if (interruptableWait) {
-                    nativeInterruptPending = true;
-                    nativeThread.Interrupt();
-                }
-            }
-        }
-    }
-    
-    private void setRunningAndCheckStillborn() throws Throwable {
-        Throwable x;
-        synchronized (lock) {
-            running = true;
-            x = stillborn;
-            stillborn = null;
-        }
-        if (x != null) {
-            throw x;
-        }
-    }
-
-    // [IKVM] this the entry point of thread started from Java
-    @cli.IKVM.Attributes.HideFromJavaAttribute.Annotation
-    void threadProc() {
-        current = this;
-        try {
-            // the body of the try block is in another method to allow the (limited) try/finally optimizer
-            // to properly recognize the try/finally block, because we want to make sure that die()
-            // runs in a finally block to prevent it from being asynchronously aborted.
-            threadProc2();
-        }
-        finally {
-            die();
-        }
-    }
-    
-    @cli.IKVM.Attributes.HideFromJavaAttribute.Annotation
-    private void threadProc2() {
-        try {
-            setRunningAndCheckStillborn();
-            run();
-        }
-        catch (Throwable x) {
-            try {
-                getUncaughtExceptionHandler().uncaughtException(this, x);
-            }
-            catch (Throwable _) {
-            }
-        }
-    }
-
-    // [IKVM] this the implementation of Object.wait(long timeout, int nanos). It is hooked up in map.xml.
-    static void objectWait(Object o, long timeout, int nanos) throws InterruptedException {
-        if (o == null) {
-            throw new NullPointerException();
-        }
-        if (timeout < 0) {
-            throw new IllegalArgumentException("timeout value is negative");
-        }
-        if (nanos < 0 || nanos > 999999) {
-            throw new IllegalArgumentException("nanosecond timeout value out of range");
-        }
-        if (nanos >= 500000 || (nanos != 0 && timeout == 0)) {
-            timeout++;
-        }
-        objectWait(o, timeout);
-    }
-
-    // [IKVM] this the implementation of Object.wait(long timeout). It is hooked up in map.xml.
-    static void objectWait(Object o, long timeout) throws InterruptedException {
-        if (o == null) {
-            throw new NullPointerException();
-        }
-        if (timeout < 0) {
-            throw new IllegalArgumentException("timeout value is negative");
-        }
-        Thread t = currentThread();
-        t.enterInterruptableWait(timeout != 0);
-        try {
-            if (false) throw new cli.System.Threading.ThreadInterruptedException();
-            if (timeout == 0 || timeout > 922337203685476L) {
-                cli.System.Threading.Monitor.Wait(o);
-            }
-            else {
-                // We wait a maximum of Integer.MAX_VALUE milliseconds, because that is the maximum that Monitor.Wait will wait.
-                // Note that the Object.wait() specification allows for spurious wakeups, so this isn't a problem. Trying to
-                // emulate a longer wait with multiple Monitor.Wait() calls is not allowed, because that would mean that
-                // we acquire and release the synchronization lock multiple times during the wait.
-                cli.System.Threading.Monitor.Wait(o, (int)Math.min(timeout, Integer.MAX_VALUE));
-            }
-        }
-        catch (cli.System.Threading.ThreadInterruptedException _) {
-        }
-        finally {
-            t.leaveInterruptableWait();
-        }
-    }
-
-    private void setNativeName(String name) {
-        cli.System.Threading.Thread thread = nativeThread;
-        if (thread != null) {
-            try {
-                if (false) throw new cli.System.InvalidOperationException();
-                thread.set_Name(name);
-            } catch (cli.System.InvalidOperationException _) {
-            }
-        }
-    }
-}
diff --git a/openjdk/java/lang/ThrowableHelper.java b/openjdk/java/lang/ThrowableHelper.java
deleted file mode 100644
index 8a08a8fe..00000000
--- a/openjdk/java/lang/ThrowableHelper.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang;
-import  java.io.*;
-import  java.util.*;
-
-final class ThrowableHelper {
-    /**
-     * Holder class to defer initializing sentinel objects only used
-     * for serialization.
-     */
-    private static class SentinelHolder {
-        /**
-         * {@linkplain #setStackTrace(StackTraceElement[]) Setting the
-         * stack trace} to a one-element array containing this sentinel
-         * value indicates future attempts to set the stack trace will be
-         * ignored.  The sentinal is equal to the result of calling:<br>
-         * {@code new StackTraceElement("", "", null, Integer.MIN_VALUE)}
-         */
-        public static final StackTraceElement STACK_TRACE_ELEMENT_SENTINEL =
-            new StackTraceElement("", "", null, Integer.MIN_VALUE);
-
-        /**
-         * Sentinel value used in the serial form to indicate an immutable
-         * stack trace.
-         */
-        public static final StackTraceElement[] STACK_TRACE_SENTINEL =
-            new StackTraceElement[] {STACK_TRACE_ELEMENT_SENTINEL};
-    }
-
-    /** Caption  for labeling causative exception stack traces */
-    private static final String CAUSE_CAPTION = "Caused by: ";
-
-    /** Caption for labeling suppressed exception stack traces */
-    private static final String SUPPRESSED_CAPTION = "Suppressed: ";
-
-    /**
-     * Prints this throwable and its backtrace to the
-     * standard error stream. This method prints a stack trace for this
-     * {@code Throwable} object on the error output stream that is
-     * the value of the field {@code System.err}. The first line of
-     * output contains the result of the {@link #toString()} method for
-     * this object.  Remaining lines represent data previously recorded by
-     * the method {@link #fillInStackTrace()}. The format of this
-     * information depends on the implementation, but the following
-     * example may be regarded as typical:
-     * <blockquote><pre>
-     * java.lang.NullPointerException
-     *         at MyClass.mash(MyClass.java:9)
-     *         at MyClass.crunch(MyClass.java:6)
-     *         at MyClass.main(MyClass.java:3)
-     * </pre></blockquote>
-     * This example was produced by running the program:
-     * <pre>
-     * class MyClass {
-     *     public static void main(String[] args) {
-     *         crunch(null);
-     *     }
-     *     static void crunch(int[] a) {
-     *         mash(a);
-     *     }
-     *     static void mash(int[] b) {
-     *         System.out.println(b[0]);
-     *     }
-     * }
-     * </pre>
-     * The backtrace for a throwable with an initialized, non-null cause
-     * should generally include the backtrace for the cause.  The format
-     * of this information depends on the implementation, but the following
-     * example may be regarded as typical:
-     * <pre>
-     * HighLevelException: MidLevelException: LowLevelException
-     *         at Junk.a(Junk.java:13)
-     *         at Junk.main(Junk.java:4)
-     * Caused by: MidLevelException: LowLevelException
-     *         at Junk.c(Junk.java:23)
-     *         at Junk.b(Junk.java:17)
-     *         at Junk.a(Junk.java:11)
-     *         ... 1 more
-     * Caused by: LowLevelException
-     *         at Junk.e(Junk.java:30)
-     *         at Junk.d(Junk.java:27)
-     *         at Junk.c(Junk.java:21)
-     *         ... 3 more
-     * </pre>
-     * Note the presence of lines containing the characters {@code "..."}.
-     * These lines indicate that the remainder of the stack trace for this
-     * exception matches the indicated number of frames from the bottom of the
-     * stack trace of the exception that was caused by this exception (the
-     * "enclosing" exception).  This shorthand can greatly reduce the length
-     * of the output in the common case where a wrapped exception is thrown
-     * from same method as the "causative exception" is caught.  The above
-     * example was produced by running the program:
-     * <pre>
-     * public class Junk {
-     *     public static void main(String args[]) {
-     *         try {
-     *             a();
-     *         } catch(HighLevelException e) {
-     *             e.printStackTrace();
-     *         }
-     *     }
-     *     static void a() throws HighLevelException {
-     *         try {
-     *             b();
-     *         } catch(MidLevelException e) {
-     *             throw new HighLevelException(e);
-     *         }
-     *     }
-     *     static void b() throws MidLevelException {
-     *         c();
-     *     }
-     *     static void c() throws MidLevelException {
-     *         try {
-     *             d();
-     *         } catch(LowLevelException e) {
-     *             throw new MidLevelException(e);
-     *         }
-     *     }
-     *     static void d() throws LowLevelException {
-     *        e();
-     *     }
-     *     static void e() throws LowLevelException {
-     *         throw new LowLevelException();
-     *     }
-     * }
-     *
-     * class HighLevelException extends Exception {
-     *     HighLevelException(Throwable cause) { super(cause); }
-     * }
-     *
-     * class MidLevelException extends Exception {
-     *     MidLevelException(Throwable cause)  { super(cause); }
-     * }
-     *
-     * class LowLevelException extends Exception {
-     * }
-     * </pre>
-     * As of release 7, the platform supports the notion of
-     * <i>suppressed exceptions</i> (in conjunction with the {@code
-     * try}-with-resources statement). Any exceptions that were
-     * suppressed in order to deliver an exception are printed out
-     * beneath the stack trace.  The format of this information
-     * depends on the implementation, but the following example may be
-     * regarded as typical:
-     *
-     * <pre>
-     * Exception in thread "main" java.lang.Exception: Something happened
-     *  at Foo.bar(Foo.java:10)
-     *  at Foo.main(Foo.java:5)
-     *  Suppressed: Resource$CloseFailException: Resource ID = 0
-     *          at Resource.close(Resource.java:26)
-     *          at Foo.bar(Foo.java:9)
-     *          ... 1 more
-     * </pre>
-     * Note that the "... n more" notation is used on suppressed exceptions
-     * just at it is used on causes. Unlike causes, suppressed exceptions are
-     * indented beyond their "containing exceptions."
-     *
-     * <p>An exception can have both a cause and one or more suppressed
-     * exceptions:
-     * <pre>
-     * Exception in thread "main" java.lang.Exception: Main block
-     *  at Foo3.main(Foo3.java:7)
-     *  Suppressed: Resource$CloseFailException: Resource ID = 2
-     *          at Resource.close(Resource.java:26)
-     *          at Foo3.main(Foo3.java:5)
-     *  Suppressed: Resource$CloseFailException: Resource ID = 1
-     *          at Resource.close(Resource.java:26)
-     *          at Foo3.main(Foo3.java:5)
-     * Caused by: java.lang.Exception: I did it
-     *  at Foo3.main(Foo3.java:8)
-     * </pre>
-     * Likewise, a suppressed exception can have a cause:
-     * <pre>
-     * Exception in thread "main" java.lang.Exception: Main block
-     *  at Foo4.main(Foo4.java:6)
-     *  Suppressed: Resource2$CloseFailException: Resource ID = 1
-     *          at Resource2.close(Resource2.java:20)
-     *          at Foo4.main(Foo4.java:5)
-     *  Caused by: java.lang.Exception: Rats, you caught me
-     *          at Resource2$CloseFailException.<init>(Resource2.java:45)
-     *          ... 2 more
-     * </pre>
-     */
-    public static void printStackTrace(Throwable _this) {
-        _this.printStackTrace(System.err);
-    }
-
-    /**
-     * Prints this throwable and its backtrace to the specified print stream.
-     *
-     * @param s {@code PrintStream} to use for output
-     */
-    public static void printStackTrace(Throwable _this, PrintStream s) {
-        printStackTrace(_this, new WrappedPrintStream(s));
-    }
-
-    private static void printStackTrace(Throwable _this, PrintStreamOrWriter s) {
-        // Guard against malicious overrides of Throwable.equals by
-        // using a Set with identity equality semantics.
-        Set<Throwable> dejaVu =
-            Collections.newSetFromMap(new IdentityHashMap<Throwable, Boolean>());
-        dejaVu.add(_this);
-
-        synchronized (s.lock()) {
-            // Print our stack trace
-            s.println(_this);
-            StackTraceElement[] trace = getOurStackTrace(_this);
-            for (StackTraceElement traceElement : trace)
-                s.println("\tat " + traceElement);
-
-            // Print suppressed exceptions, if any
-            for (Throwable se : _this.getSuppressed())
-                printEnclosedStackTrace(se, s, trace, SUPPRESSED_CAPTION, "\t", dejaVu);
-
-            // Print cause, if any
-            Throwable ourCause = _this.getCause();
-            if (ourCause != null)
-                printEnclosedStackTrace(ourCause, s, trace, CAUSE_CAPTION, "", dejaVu);
-        }
-    }
-
-    /**
-     * Print our stack trace as an enclosed exception for the specified
-     * stack trace.
-     */
-    private static void printEnclosedStackTrace(Throwable _this, PrintStreamOrWriter s,
-                                         StackTraceElement[] enclosingTrace,
-                                         String caption,
-                                         String prefix,
-                                         Set<Throwable> dejaVu) {
-        assert Thread.holdsLock(s.lock());
-        if (dejaVu.contains(_this)) {
-            s.println("\t[CIRCULAR REFERENCE:" + _this + "]");
-        } else {
-            dejaVu.add(_this);
-            // Compute number of frames in common between this and enclosing trace
-            StackTraceElement[] trace = getOurStackTrace(_this);
-            int m = trace.length - 1;
-            int n = enclosingTrace.length - 1;
-            while (m >= 0 && n >=0 && trace[m].equals(enclosingTrace[n])) {
-                m--; n--;
-            }
-            int framesInCommon = trace.length - 1 - m;
-
-            // Print our stack trace
-            s.println(prefix + caption + _this);
-            for (int i = 0; i <= m; i++)
-                s.println(prefix + "\tat " + trace[i]);
-            if (framesInCommon != 0)
-                s.println(prefix + "\t... " + framesInCommon + " more");
-
-            // Print suppressed exceptions, if any
-            for (Throwable se : _this.getSuppressed())
-                printEnclosedStackTrace(se, s, trace, SUPPRESSED_CAPTION,
-                                           prefix +"\t", dejaVu);
-
-            // Print cause, if any
-            Throwable ourCause = _this.getCause();
-            if (ourCause != null)
-                printEnclosedStackTrace(ourCause, s, trace, CAUSE_CAPTION, prefix, dejaVu);
-        }
-    }
-
-    private static native StackTraceElement[] getOurStackTrace(Throwable _this);
-
-    /**
-     * Prints this throwable and its backtrace to the specified
-     * print writer.
-     *
-     * @param s {@code PrintWriter} to use for output
-     * @since   JDK1.1
-     */
-    public static void printStackTrace(Throwable _this, PrintWriter s) {
-        printStackTrace(_this, new WrappedPrintWriter(s));
-    }
-
-    /**
-     * Wrapper class for PrintStream and PrintWriter to enable a single
-     * implementation of printStackTrace.
-     */
-    private abstract static class PrintStreamOrWriter {
-        /** Returns the object to be locked when using this StreamOrWriter */
-        abstract Object lock();
-
-        /** Prints the specified string as a line on this StreamOrWriter */
-        abstract void println(Object o);
-    }
-
-    private static class WrappedPrintStream extends PrintStreamOrWriter {
-        private final PrintStream printStream;
-
-        WrappedPrintStream(PrintStream printStream) {
-            this.printStream = printStream;
-        }
-
-        Object lock() {
-            return printStream;
-        }
-
-        void println(Object o) {
-            printStream.println(o);
-        }
-    }
-
-    private static class WrappedPrintWriter extends PrintStreamOrWriter {
-        private final PrintWriter printWriter;
-
-        WrappedPrintWriter(PrintWriter printWriter) {
-            this.printWriter = printWriter;
-        }
-
-        Object lock() {
-            return printWriter;
-        }
-
-        void println(Object o) {
-            printWriter.println(o);
-        }
-    }
-}
diff --git a/openjdk/java/lang/VMSystemProperties.java b/openjdk/java/lang/VMSystemProperties.java
deleted file mode 100644
index c982e2dd..00000000
--- a/openjdk/java/lang/VMSystemProperties.java
+++ /dev/null
@@ -1,421 +0,0 @@
-/*
-  Copyright (C) 2004-2011 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-package java.lang;
-
-import java.util.Properties;
-import static ikvm.internal.Util.SafeGetEnvironmentVariable;
-
-final class VMSystemProperties
-{
-    private VMSystemProperties() { }
-
-    public static final String SPEC_TITLE = "Java Platform API Specification";
-    public static final String SPEC_VERSION = "1.7";
-    public static final String SPEC_VENDOR = "Oracle Corporation";
-
-    private static String getLibraryPath()
-    {
-        String libraryPath;
-        if(ikvm.internal.Util.WINDOWS)
-        {
-	    // see /hotspot/src/os/windows/vm/os_windows.cpp for the comment that describes how we build the path
-	    String windir = SafeGetEnvironmentVariable("SystemRoot");
-	    if(windir != null)
-	    {
-		libraryPath = cli.System.IO.Path.PathSeparator + windir + "\\Sun\\Java\\bin";
-	    }
-	    else
-	    {
-	        libraryPath = null;
-	    }
-            try
-            {
-                if(false) throw new cli.System.Security.SecurityException();
-                if (libraryPath == null)
-                {
-                    libraryPath = cli.System.Environment.get_SystemDirectory();
-                }
-                else
-                {
-                    libraryPath += cli.System.IO.Path.PathSeparator + cli.System.Environment.get_SystemDirectory();
-                }
-            }
-            catch(cli.System.Security.SecurityException _)
-            {
-            }
-            if(windir != null)
-            {
-		libraryPath += cli.System.IO.Path.PathSeparator + windir;
-            }
-            String path = SafeGetEnvironmentVariable("PATH");
-            if(path != null)
-            {
-                libraryPath += cli.System.IO.Path.PathSeparator + path;
-            }
-        }
-        else if(ikvm.internal.Util.MACOSX)
-        {
-            libraryPath = ".";
-        }
-        else /* assume Linux, since that's the only other platform we support */
-        {
-	    // on Linux we have some hardcoded paths (from /hotspot/src/os/linux/vm/os_linux.cpp)
-	    // and we can only guess the cpu arch based on bitness (that means only x86 and x64)
-	    String cpu_arch = cli.System.IntPtr.get_Size() == 4 ? "i386" : "amd64";
-	    libraryPath = "/usr/java/packages/lib/" + cpu_arch + ":/lib:/usr/lib";
-            String ld_library_path = SafeGetEnvironmentVariable("LD_LIBRARY_PATH");
-            if(ld_library_path != null)
-            {
-		libraryPath = ld_library_path + ":" + libraryPath;
-            }
-        }
-        try
-        {
-            cli.System.Reflection.Assembly entryAsm = cli.System.Reflection.Assembly.GetEntryAssembly();
-            // If the CLR was started by a native app (e.g. via COM interop) there is no entry assembly
-            if (entryAsm != null)
-            {
-		// the application (or launcher) directory is prepended to the library path
-		// (similar to how the JDK prepends its directory to the path)
-                libraryPath = new cli.System.IO.FileInfo(entryAsm.get_Location()).get_DirectoryName() + cli.System.IO.Path.PathSeparator + libraryPath;
-            }
-        }
-        catch(Throwable _)
-        {
-            // ignore
-        }
-        if(ikvm.internal.Util.WINDOWS)
-        {
-            libraryPath += cli.System.IO.Path.PathSeparator + ".";
-        }
-        return libraryPath;
-    }
-
-    private static void initCommonProperties(Properties p)
-    {
-        p.setProperty("java.version", "1.7.0");
-        p.setProperty("java.vendor", "Jeroen Frijters");
-        p.setProperty("java.vendor.url", "http://ikvm.net/");
-        p.setProperty("java.vendor.url.bug", "http://www.ikvm.net/bugs");
-        p.setProperty("java.vm.specification.version", "1.7");
-        p.setProperty("java.vm.specification.vendor", "Oracle Corporation");
-        p.setProperty("java.vm.specification.name", "Java Virtual Machine Specification");
-        p.setProperty("java.vm.version", PropertyConstants.java_vm_version);
-        p.setProperty("java.vm.vendor", "Jeroen Frijters");
-        p.setProperty("java.vm.name", "IKVM.NET");
-        p.setProperty("java.runtime.name", "IKVM.NET");
-        p.setProperty("java.runtime.version", PropertyConstants.java_runtime_version);
-        p.setProperty("java.specification.version", SPEC_VERSION);
-        p.setProperty("java.specification.vendor", SPEC_VENDOR);
-        p.setProperty("java.specification.name", SPEC_TITLE);
-        p.setProperty("java.class.version", "51.0");
-        p.setProperty("java.class.path", "");
-        p.setProperty("java.library.path", getLibraryPath());
-        try
-        {
-            if(false) throw new cli.System.Security.SecurityException();
-            p.setProperty("java.io.tmpdir", cli.System.IO.Path.GetTempPath());
-        }
-        catch(cli.System.Security.SecurityException _)
-        {
-            // TODO should we set another value?
-            p.setProperty("java.io.tmpdir", ".");
-        }
-        p.setProperty("java.ext.dirs", "");
-        // NOTE os.name *must* contain "Windows" when running on Windows, because Classpath tests on that
-        String osname = null;
-        String osver = null;
-        cli.System.OperatingSystem os = cli.System.Environment.get_OSVersion();
-        int major = os.get_Version().get_Major();
-        int minor = os.get_Version().get_Minor();
-        switch(os.get_Platform().Value)
-        {
-            case cli.System.PlatformID.Win32NT:
-                osname = "Windows NT (unknown)";
-                switch(major)
-                {
-                    case 3:
-                    case 4:
-                        osver = major + "." + minor;
-                        osname = "Windows NT";
-                        break;
-                    case 5:
-                        switch(minor)
-                        {
-                            case 0:
-                                osver = "5.0";
-                                osname = "Windows 2000";
-                                break;
-                            case 1:
-                                osver = "5.1";
-                                osname = "Windows XP";
-                                break;
-                            case 2:
-                                osver = "5.2";
-                                osname = "Windows 2003";
-                                break;
-                        }
-                        break;
-                    case 6:
-                        // since there appears to be no managed way to differentiate between Client/Server, we report client names
-                        switch(minor)
-                        {
-                            case 0:
-                                osver = "6.0";
-                                osname = "Windows Vista";
-                                break;
-                            case 1:
-                                osver = "6.1";
-                                osname = "Windows 7";
-                                break;
-                        }
-                        break;
-                }
-                break;
-            case cli.System.PlatformID.Win32Windows:
-                if(major == 4)
-                {
-                    switch(minor)
-                    {
-                        case 0:
-                            osver = "4.0";
-                            osname = "Windows 95";
-                            break;
-                        case 10:
-                            osver = "4.10";
-                            osname = "Windows 98";
-                            break;
-                        case 90:
-                            osver = "4.90";
-                            osname = "Windows Me";
-                            break;
-                    }
-                }
-                break;
-            case cli.System.PlatformID.Unix:
-		if(ikvm.internal.Util.MACOSX)
-		{
-		    // for back compat Mono will return PlatformID.Unix when running on the Mac,
-		    // so we handle that explicitly here
-		    osname = "Mac OS X";
-		    // HACK this tries to map the Darwin version to the OS X version
-		    // (based on http://en.wikipedia.org/wiki/Darwin_(operating_system)#Releases)
-		    cli.System.Version ver = cli.System.Environment.get_OSVersion().get_Version();
-		    osver = "10." + (ver.get_Major() - 4) + "." + ver.get_Minor();
-		}
-		break;
-        }
-        if(osname == null)
-        {
-            osname = cli.System.Environment.get_OSVersion().ToString();
-        }
-        if(osver == null)
-        {
-            osver = major + "." + minor;
-        }
-        p.setProperty("os.name", osname);
-        p.setProperty("os.version", osver);
-        String arch = SafeGetEnvironmentVariable("PROCESSOR_ARCHITECTURE");
-        if(arch == null)
-        {
-	    // we don't know, so we make a guess
-	    if(cli.System.IntPtr.get_Size() == 4)
-	    {
-		arch = ikvm.internal.Util.WINDOWS ? "x86" : "i386";
-	    }
-	    else
-	    {
-		arch = "amd64";
-	    }
-        }
-        if(arch.equals("AMD64"))
-        {
-            arch = "amd64";
-        }
-        p.setProperty("os.arch", arch);
-        p.setProperty("sun.arch.data.model", "" + (cli.System.IntPtr.get_Size() * 8));
-        p.setProperty("file.separator", "" + cli.System.IO.Path.DirectorySeparatorChar);
-        p.setProperty("file.encoding", cli.System.Text.Encoding.get_Default().get_WebName());
-        p.setProperty("path.separator", "" + cli.System.IO.Path.PathSeparator);
-        p.setProperty("line.separator", cli.System.Environment.get_NewLine());
-        try
-        {
-            if(false) throw new cli.System.Security.SecurityException();
-            p.setProperty("user.name", cli.System.Environment.get_UserName());
-        }
-        catch(cli.System.Security.SecurityException _)
-        {
-            p.setProperty("user.name", "(unknown)");
-        }
-        String home = SafeGetEnvironmentVariable("USERPROFILE");
-        if(home == null)
-        {
-            // maybe we're on *nix
-            home = SafeGetEnvironmentVariable("HOME");
-            if(home == null)
-            {
-                // TODO maybe there is a better way
-                // NOTE on MS .NET this doesn't return the correct path
-                // (it returns "C:\\Documents and Settings\\username\\My Documents", but we really need
-                // "C:\\Documents and Settings\\username" to be compatible with Sun, that's why we use %USERPROFILE% if it exists)
-                try
-                {
-                    if(false) throw new cli.System.Security.SecurityException();
-                    home = cli.System.Environment.GetFolderPath(cli.System.Environment.SpecialFolder.wrap(cli.System.Environment.SpecialFolder.Personal));
-                }
-                catch(cli.System.Security.SecurityException _)
-                {
-                    home = ".";
-                }
-            }
-        }
-        p.setProperty("user.home", home);
-        try
-        {
-            if(false) throw new cli.System.Security.SecurityException();
-            p.setProperty("user.dir", cli.System.Environment.get_CurrentDirectory());
-        }
-        catch(cli.System.Security.SecurityException _)
-        {
-            p.setProperty("user.dir", ".");
-        }
-        p.setProperty("awt.toolkit", PropertyConstants.awt_toolkit);
-    }
-
-    public static void initProperties(Properties p)
-    {
-        p.setProperty("openjdk.version", PropertyConstants.openjdk_version);
-        String vfsroot = getVirtualFileSystemRoot();
-        p.setProperty("java.home", vfsroot.substring(0, vfsroot.length() - 1));
-        // the %home%\lib\endorsed directory does not exist, but neither does it on JDK 1.7
-        p.setProperty("java.endorsed.dirs", vfsroot + "lib" + cli.System.IO.Path.DirectorySeparatorChar + "endorsed");
-        p.setProperty("sun.boot.library.path", vfsroot + "bin");
-        p.setProperty("sun.boot.class.path", getBootClassPath());
-	initCommonProperties(p);
-	setupI18N(p);
-	p.setProperty("sun.cpu.endian", cli.System.BitConverter.IsLittleEndian ? "little" : "big");
-	p.setProperty("file.encoding.pkg", "sun.io");
-	p.setProperty("user.timezone", "");
-	p.setProperty("sun.os.patch.level", cli.System.Environment.get_OSVersion().get_ServicePack());
-	p.setProperty("java.vm.info", "compiled mode");
-	p.setProperty("sun.nio.MaxDirectMemorySize", "-1");
-	p.setProperty("java.awt.graphicsenv", PropertyConstants.java_awt_graphicsenv);
-        p.setProperty("java.awt.printerjob", "sun.awt.windows.WPrinterJob");
-        
-	// TODO
-	// sun.cpu.isalist:=pentium_pro+mmx pentium_pro pentium+mmx pentium i486 i386 i86
-	// sun.desktop:=windows
-	// sun.io.unicode.encoding:=UnicodeLittle
-	// sun.jnu.encoding:=Cp1252
-	// sun.management.compiler:=HotSpot Client Compiler
-        try
-        {
-            // read properties from app.config
-            if(false) throw new cli.System.Configuration.ConfigurationException();
-            cli.System.Collections.Specialized.NameValueCollection appSettings = cli.System.Configuration.ConfigurationSettings.get_AppSettings();
-            cli.System.Collections.IEnumerator keys = appSettings.GetEnumerator();
-            while(keys.MoveNext())
-            {
-                String key = (String)keys.get_Current();
-                if(key.startsWith("ikvm:"))
-                {
-                    p.setProperty(key.substring(5), appSettings.get_Item(key));
-                }
-            }
-        }
-        catch(cli.System.Configuration.ConfigurationException _)
-        {
-            // app.config is invalid, ignore
-        }
-        // set the properties that were specified with ikvm.runtime.Startup.setProperties()
-        cli.System.Collections.IDictionary props = ikvm.runtime.Startup.props;
-        if(props != null)
-        {
-            cli.System.Collections.IDictionaryEnumerator entries = props.GetEnumerator();
-            while(entries.MoveNext())
-            {
-                p.setProperty((String)entries.get_Key(), (String)entries.get_Value());
-            }
-        }
-    }
-
-    private static void setupI18N(Properties p)
-    {
-        String[] culture = ((cli.System.String)(Object)cli.System.Globalization.CultureInfo.get_CurrentCulture().get_Name()).Split(new char[] { '-' });
-        String language;
-        String script;
-        String region;
-        String variant;
-        if (culture.length == 2)
-        {
-            language = culture[0];
-            if (culture[1].length() == 4)
-            {
-                script = culture[1];
-                region = "";
-            }
-            else
-            {
-                script = "";
-                region = culture[1];
-            }
-        }
-        else if (culture.length == 3)
-        {
-            language = culture[0];
-            script = culture[1];
-            region = culture[2];
-        }
-        else
-        {
-            language = "en";
-            script = "";
-            region = "US";
-        }
-        // Norwegian
-        if (language.equals("nb"))
-        {
-            language = "no";
-            region = "NO";
-            variant = "";
-        }
-        else if (language.equals("nn"))
-        {
-            language = "no";
-            region = "NO";
-            variant = "NY";
-        }
-        else
-        {
-            variant = "";
-        }
-        p.setProperty("user.language", language);
-        p.setProperty("user.country", region);
-        p.setProperty("user.variant", variant);
-        p.setProperty("user.script", script);
-    }
-
-    private static native String getVirtualFileSystemRoot();
-    private static native String getBootClassPath();
-}
diff --git a/openjdk/java/lang/invoke/AdapterMethodHandle.java b/openjdk/java/lang/invoke/AdapterMethodHandle.java
deleted file mode 100644
index b5686afa..00000000
--- a/openjdk/java/lang/invoke/AdapterMethodHandle.java
+++ /dev/null
@@ -1,477 +0,0 @@
-/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * Extensively modified for IKVM.NET by Jeroen Frijters
- * Copyright (C) 2011 Jeroen Frijters
- */
-
-package java.lang.invoke;
-
-import sun.invoke.util.VerifyType;
-import sun.invoke.util.Wrapper;
-import sun.invoke.util.ValueConversions;
-import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.Collections;
-import static java.lang.invoke.MethodHandleStatics.*;
-import ikvm.internal.NotYetImplementedError;
-
-/**
- * This method handle performs simple conversion or checking of a single argument.
- * @author jrose
- */
-class AdapterMethodHandle extends BoundMethodHandle {
-
-    AdapterMethodHandle(MethodType type) {
-        super(type, null, -1);
-    }
-    AdapterMethodHandle(MethodType type, Object vmtarget) {
-        super(type, null, -1);
-        this.vmtarget = vmtarget;
-    }
-
-    /** Can a JVM-level adapter directly implement the proposed
-     *  argument conversion, as if by fixed-arity MethodHandle.asType?
-     */
-    static boolean canConvertArgument(Class<?> src, Class<?> dst, int level) {
-        return true;
-    }
-
-    /**
-     * Create a JVM-level adapter method handle to conform the given method
-     * handle to the similar newType, using only pairwise argument conversions.
-     * For each argument, convert incoming argument to the exact type needed.
-     * The argument conversions allowed are casting, boxing and unboxing,
-     * integral widening or narrowing, and floating point widening or narrowing.
-     * @param newType required call type
-     * @param target original method handle
-     * @param level which strength of conversion is allowed
-     * @return an adapter to the original handle with the desired new type,
-     *          or the original target if the types are already identical
-     *          or null if the adaptation cannot be made
-     */
-    static native MethodHandle makePairwiseConvert(MethodType newType, MethodHandle target, int level);
-
-    /* Return one plus the position of the first non-trivial difference
-     * between the given types.  This is not a symmetric operation;
-     * we are considering adapting the targetType to adapterType.
-     * Trivial differences are those which could be ignored by the JVM
-     * without subverting the verifier.  Otherwise, adaptable differences
-     * are ones for which we could create an adapter to make the type change.
-     * Return zero if there are no differences (other than trivial ones).
-     * Return 1+N if N is the only adaptable argument difference.
-     * Return the -2-N where N is the first of several adaptable
-     * argument differences.
-     * Return -1 if there there are differences which are not adaptable.
-     */
-    private static int diffTypes(MethodType adapterType,
-                                 MethodType targetType,
-                                 boolean raw) {
-        int diff;
-        diff = diffReturnTypes(adapterType, targetType, raw);
-        if (diff != 0)  return diff;
-        int nargs = adapterType.parameterCount();
-        if (nargs != targetType.parameterCount())
-            return -1;
-        diff = diffParamTypes(adapterType, 0, targetType, 0, nargs, raw);
-        //System.out.println("diff "+adapterType);
-        //System.out.println("  "+diff+" "+targetType);
-        return diff;
-    }
-    private static int diffReturnTypes(MethodType adapterType,
-                                       MethodType targetType,
-                                       boolean raw) {
-        Class<?> src = targetType.returnType();
-        Class<?> dst = adapterType.returnType();
-        if ((!raw
-             ? VerifyType.canPassUnchecked(src, dst)
-             : VerifyType.canPassRaw(src, dst)
-             ) > 0)
-            return 0;  // no significant difference
-        if (raw && !src.isPrimitive() && !dst.isPrimitive())
-            return 0;  // can force a reference return (very carefully!)
-        //if (false)  return 1;  // never adaptable!
-        return -1;  // some significant difference
-    }
-    private static int diffParamTypes(MethodType adapterType, int astart,
-                                      MethodType targetType, int tstart,
-                                      int nargs, boolean raw) {
-        assert(nargs >= 0);
-        int res = 0;
-        for (int i = 0; i < nargs; i++) {
-            Class<?> src  = adapterType.parameterType(astart+i);
-            Class<?> dest = targetType.parameterType(tstart+i);
-            if ((!raw
-                 ? VerifyType.canPassUnchecked(src, dest)
-                 : VerifyType.canPassRaw(src, dest)
-                ) <= 0) {
-                // found a difference; is it the only one so far?
-                if (res != 0)
-                    return -1-res; // return -2-i for prev. i
-                res = 1+i;
-            }
-        }
-        return res;
-    }
-
-    /** Can a retyping adapter (alone) validly convert the target to newType? */
-    static boolean canRetypeOnly(MethodType newType, MethodType targetType) {
-        return canRetype(newType, targetType, false);
-    }
-    /** Can a retyping adapter (alone) convert the target to newType?
-     *  It is allowed to widen subword types and void to int, to make bitwise
-     *  conversions between float/int and double/long, and to perform unchecked
-     *  reference conversions on return.  This last feature requires that the
-     *  caller be trusted, and perform explicit cast conversions on return values.
-     */
-    static boolean canRetypeRaw(MethodType newType, MethodType targetType) {
-        return canRetype(newType, targetType, true);
-    }
-    static boolean canRetype(MethodType newType, MethodType targetType, boolean raw) {
-        int diff = diffTypes(newType, targetType, raw);
-        // %%% This assert is too strong.  Factor diff into VerifyType and reconcile.
-        assert(raw || (diff == 0) == VerifyType.isNullConversion(newType, targetType));
-        return diff == 0;
-    }
-
-    /** Factory method:  Performs no conversions; simply retypes the adapter.
-     *  Allows unchecked argument conversions pairwise, if they are safe.
-     *  Returns null if not possible.
-     */
-    static MethodHandle makeRetypeOnly(MethodType newType, MethodHandle target) {
-        return makeRetype(newType, target, false);
-    }
-    static MethodHandle makeRetypeRaw(MethodType newType, MethodHandle target) {
-        return makeRetype(newType, target, true);
-    }
-    static native MethodHandle makeRetype(MethodType newType, MethodHandle target, boolean raw);
-
-    static MethodHandle makeVarargsCollector(MethodHandle target, Class<?> arrayType) {
-        MethodType type = target.type();
-        int last = type.parameterCount() - 1;
-        if (type.parameterType(last) != arrayType)
-            target = target.asType(type.changeParameterType(last, arrayType));
-        target = target.asFixedArity();  // make sure this attribute is turned off
-        return new AsVarargsCollector(target, arrayType);
-    }
-
-    static class AsVarargsCollector extends AdapterMethodHandle {
-        final MethodHandle target;
-        final Class<?> arrayType;
-        MethodHandle cache;
-
-        AsVarargsCollector(MethodHandle target, Class<?> arrayType) {
-            super(target.type());
-            this.vmtarget = target.vmtarget;
-            this.target = target;
-            this.arrayType = arrayType;
-            this.cache = target.asCollector(arrayType, 0);
-        }
-
-        @Override
-        public boolean isVarargsCollector() {
-            return true;
-        }
-
-        @Override
-        public MethodHandle asFixedArity() {
-            return target;
-        }
-
-        @Override
-        public MethodHandle asType(MethodType newType) {
-            MethodType type = this.type();
-            int collectArg = type.parameterCount() - 1;
-            int newArity = newType.parameterCount();
-            if (newArity == collectArg+1 &&
-                type.parameterType(collectArg).isAssignableFrom(newType.parameterType(collectArg))) {
-                // if arity and trailing parameter are compatible, do normal thing
-                return super.asType(newType);
-            }
-            // check cache
-            if (cache.type().parameterCount() == newArity)
-                return cache.asType(newType);
-            // build and cache a collector
-            int arrayLength = newArity - collectArg;
-            MethodHandle collector;
-            try {
-                collector = target.asCollector(arrayType, arrayLength);
-            } catch (IllegalArgumentException ex) {
-                throw new WrongMethodTypeException("cannot build collector");
-            }
-            cache = collector;
-            return collector.asType(newType);
-        }
-    }
-
-    /** Can a checkcast adapter validly convert the target to newType?
-     *  The JVM supports all kind of reference casts, even silly ones.
-     */
-    static boolean canCheckCast(MethodType newType, MethodType targetType,
-                int arg, Class<?> castType) {
-        Class<?> src = newType.parameterType(arg);
-        Class<?> dst = targetType.parameterType(arg);
-        if (!canCheckCast(src, castType)
-                || !VerifyType.isNullConversion(castType, dst))
-            return false;
-        int diff = diffTypes(newType, targetType, false);
-        return (diff == arg+1) || (diff == 0);  // arg is sole non-trivial diff
-    }
-    /** Can an primitive conversion adapter validly convert src to dst? */
-    static boolean canCheckCast(Class<?> src, Class<?> dst) {
-        return (!src.isPrimitive() && !dst.isPrimitive());
-    }
-
-    /** Factory method:  Forces a cast at the given argument.
-     *  The castType is the target of the cast, and can be any type
-     *  with a null conversion to the corresponding target parameter.
-     *  Return null if this cannot be done.
-     */
-    static MethodHandle makeCheckCast(MethodType newType, MethodHandle target,
-                int arg, Class<?> castType) {
-        if (!canCheckCast(newType, target.type(), arg, castType))
-            return null;
-        throw new NotYetImplementedError();
-    }
-
-    /** Can an adapter simply drop arguments to convert the target to newType? */
-    static boolean canDropArguments(MethodType newType, MethodType targetType,
-                int dropArgPos, int dropArgCount) {
-        if (dropArgCount == 0)
-            return canRetypeOnly(newType, targetType);
-        if (diffReturnTypes(newType, targetType, false) != 0)
-            return false;
-        int nptypes = newType.parameterCount();
-        // parameter types must be the same up to the drop point
-        if (dropArgPos != 0 && diffParamTypes(newType, 0, targetType, 0, dropArgPos, false) != 0)
-            return false;
-        int afterPos = dropArgPos + dropArgCount;
-        int afterCount = nptypes - afterPos;
-        if (dropArgPos < 0 || dropArgPos >= nptypes ||
-            dropArgCount < 1 || afterPos > nptypes ||
-            targetType.parameterCount() != nptypes - dropArgCount)
-            return false;
-        // parameter types after the drop point must also be the same
-        if (afterCount != 0 && diffParamTypes(newType, afterPos, targetType, dropArgPos, afterCount, false) != 0)
-            return false;
-        return true;
-    }
-
-    /** Factory method:  Drop selected arguments.
-     *  Allow unchecked retyping of remaining arguments, pairwise.
-     *  Return null if this is not possible.
-     */
-    static MethodHandle makeDropArguments(MethodType newType, MethodHandle target,
-                int dropArgPos, int dropArgCount) {
-        if (dropArgCount == 0)
-            return makeRetypeOnly(newType, target);
-        if (!canDropArguments(newType, target.type(), dropArgPos, dropArgCount))
-            return null;
-        int[] permute = new int[target.type().parameterCount()];
-        for (int i = 0, arg = 0; i < permute.length; i++) {
-            if (arg == dropArgPos)
-                arg += dropArgCount;
-            permute[i] = arg++;
-        }
-        return MethodHandleImpl.permuteArguments(target, newType, target.type(), permute);
-    }
-
-    /** Can an adapter duplicate an argument to convert the target to newType? */
-    static boolean canDupArguments(MethodType newType, MethodType targetType,
-                int dupArgPos, int dupArgCount) {
-        if (diffReturnTypes(newType, targetType, false) != 0)
-            return false;
-        int nptypes = newType.parameterCount();
-        if (dupArgCount < 0 || dupArgPos + dupArgCount > nptypes)
-            return false;
-        if (targetType.parameterCount() != nptypes + dupArgCount)
-            return false;
-        // parameter types must be the same up to the duplicated arguments
-        if (diffParamTypes(newType, 0, targetType, 0, nptypes, false) != 0)
-            return false;
-        // duplicated types must be, well, duplicates
-        if (diffParamTypes(newType, dupArgPos, targetType, nptypes, dupArgCount, false) != 0)
-            return false;
-        return true;
-    }
-
-    /** Factory method:  Duplicate the selected argument.
-     *  Return null if this is not possible.
-     */
-    static MethodHandle makeDupArguments(MethodType newType, MethodHandle target,
-                int dupArgPos, int dupArgCount) {
-        if (!canDupArguments(newType, target.type(), dupArgPos, dupArgCount))
-            return null;
-        if (dupArgCount == 0)
-            return target;
-        // in  arglist: [0: ...keep1 | dpos: dup... | dpos+dcount: keep2... ]
-        // out arglist: [0: ...keep1 | dpos: dup... | dpos+dcount: keep2... | dup... ]
-        throw new NotYetImplementedError();
-    }
-
-    /** Can an adapter swap two arguments to convert the target to newType? */
-    static boolean canSwapArguments(MethodType newType, MethodType targetType,
-                int swapArg1, int swapArg2) {
-        if (diffReturnTypes(newType, targetType, false) != 0)
-            return false;
-        if (swapArg1 >= swapArg2)  return false;  // caller resp
-        int nptypes = newType.parameterCount();
-        if (targetType.parameterCount() != nptypes)
-            return false;
-        if (swapArg1 < 0 || swapArg2 >= nptypes)
-            return false;
-        if (diffParamTypes(newType, 0, targetType, 0, swapArg1, false) != 0)
-            return false;
-        if (diffParamTypes(newType, swapArg1, targetType, swapArg2, 1, false) != 0)
-            return false;
-        if (diffParamTypes(newType, swapArg1+1, targetType, swapArg1+1, swapArg2-swapArg1-1, false) != 0)
-            return false;
-        if (diffParamTypes(newType, swapArg2, targetType, swapArg1, 1, false) != 0)
-            return false;
-        if (diffParamTypes(newType, swapArg2+1, targetType, swapArg2+1, nptypes-swapArg2-1, false) != 0)
-            return false;
-        return true;
-    }
-
-    /** Factory method:  Swap the selected arguments.
-     *  Return null if this is not possible.
-     */
-    static MethodHandle makeSwapArguments(MethodType newType, MethodHandle target,
-                int swapArg1, int swapArg2) {
-        if (swapArg1 == swapArg2)
-            return target;
-        if (swapArg1 > swapArg2) { int t = swapArg1; swapArg1 = swapArg2; swapArg2 = t; }
-        if (!canSwapArguments(newType, target.type(), swapArg1, swapArg2))
-            return null;
-        // in  arglist: [0: ...keep1 | pos1: a1 | pos1+1: keep2... | pos2: a2 | pos2+1: keep3... ]
-        // out arglist: [0: ...keep1 | pos1: a2 | pos1+1: keep2... | pos2: a1 | pos2+1: keep3... ]
-        throw new NotYetImplementedError();
-    }
-
-    static int positiveRotation(int argCount, int rotateBy) {
-        assert(argCount > 0);
-        if (rotateBy >= 0) {
-            if (rotateBy < argCount)
-                return rotateBy;
-            return rotateBy % argCount;
-        } else if (rotateBy >= -argCount) {
-            return rotateBy + argCount;
-        } else {
-            return (-1-((-1-rotateBy) % argCount)) + argCount;
-        }
-    }
-
-    final static int MAX_ARG_ROTATION = 1;
-
-    /** Can an adapter rotate arguments to convert the target to newType? */
-    static boolean canRotateArguments(MethodType newType, MethodType targetType,
-                int firstArg, int argCount, int rotateBy) {
-        rotateBy = positiveRotation(argCount, rotateBy);
-        if (rotateBy == 0)  return false;  // no rotation
-        if (rotateBy > MAX_ARG_ROTATION && rotateBy < argCount - MAX_ARG_ROTATION)
-            return false;  // too many argument positions
-        // Rotate incoming args right N to the out args, N in 1..(argCouunt-1).
-        if (diffReturnTypes(newType, targetType, false) != 0)
-            return false;
-        int nptypes = newType.parameterCount();
-        if (targetType.parameterCount() != nptypes)
-            return false;
-        if (firstArg < 0 || firstArg >= nptypes)  return false;
-        int argLimit = firstArg + argCount;
-        if (argLimit > nptypes)  return false;
-        if (diffParamTypes(newType, 0, targetType, 0, firstArg, false) != 0)
-            return false;
-        int newChunk1 = argCount - rotateBy, newChunk2 = rotateBy;
-        // swap new chunk1 with target chunk2
-        if (diffParamTypes(newType, firstArg, targetType, argLimit-newChunk1, newChunk1, false) != 0)
-            return false;
-        // swap new chunk2 with target chunk1
-        if (diffParamTypes(newType, firstArg+newChunk1, targetType, firstArg, newChunk2, false) != 0)
-            return false;
-        return true;
-    }
-
-    /** Factory method:  Rotate the selected argument range.
-     *  Return null if this is not possible.
-     */
-    static MethodHandle makeRotateArguments(MethodType newType, MethodHandle target,
-                int firstArg, int argCount, int rotateBy) {
-        rotateBy = positiveRotation(argCount, rotateBy);
-        if (!canRotateArguments(newType, target.type(), firstArg, argCount, rotateBy))
-            return null;
-        throw new NotYetImplementedError();
-    }
-
-    /** Can an adapter spread an argument to convert the target to newType? */
-    static boolean canSpreadArguments(MethodType newType, MethodType targetType,
-                Class<?> spreadArgType, int spreadArgPos, int spreadArgCount) {
-        if (diffReturnTypes(newType, targetType, false) != 0)
-            return false;
-        int nptypes = newType.parameterCount();
-        // parameter types must be the same up to the spread point
-        if (spreadArgPos != 0 && diffParamTypes(newType, 0, targetType, 0, spreadArgPos, false) != 0)
-            return false;
-        int afterPos = spreadArgPos + spreadArgCount;
-        int afterCount = nptypes - (spreadArgPos + 1);
-        if (spreadArgPos < 0 || spreadArgPos >= nptypes ||
-            spreadArgCount < 0 ||
-            targetType.parameterCount() != afterPos + afterCount)
-            return false;
-        // parameter types after the spread point must also be the same
-        if (afterCount != 0 && diffParamTypes(newType, spreadArgPos+1, targetType, afterPos, afterCount, false) != 0)
-            return false;
-        // match the array element type to the spread arg types
-        Class<?> rawSpreadArgType = newType.parameterType(spreadArgPos);
-        if (rawSpreadArgType != spreadArgType && !canCheckCast(rawSpreadArgType, spreadArgType))
-            return false;
-        for (int i = 0; i < spreadArgCount; i++) {
-            Class<?> src = VerifyType.spreadArgElementType(spreadArgType, i);
-            Class<?> dst = targetType.parameterType(spreadArgPos + i);
-            if (src == null || !canConvertArgument(src, dst, 1))
-                return false;
-        }
-        return true;
-    }
-
-
-    /** Factory method:  Spread selected argument. */
-    static native MethodHandle makeSpreadArguments(MethodType newType, MethodHandle target, Class<?> spreadArgType, int spreadArgPos, int spreadArgCount);
-
-    /** Can an adapter collect a series of arguments, replacing them by zero or one results? */
-    static boolean canCollectArguments(MethodType targetType,
-                MethodType collectorType, int collectArgPos, boolean retainOriginalArgs) {
-        int collectArgCount = collectorType.parameterCount();
-        Class<?> rtype = collectorType.returnType();
-        assert(rtype == void.class || targetType.parameterType(collectArgPos) == rtype)
-                // [(Object)Object[], (Object[])Object[], 0, 1]
-                : Arrays.asList(targetType, collectorType, collectArgPos, collectArgCount)
-                ;
-        return true;
-    }
-
-    /** Factory method:  Collect or filter selected argument(s). */
-    static native MethodHandle makeCollectArguments(MethodHandle target, MethodHandle collector, int collectArgPos, boolean retainOriginalArgs);
-}
diff --git a/openjdk/java/lang/invoke/BoundMethodHandle.java b/openjdk/java/lang/invoke/BoundMethodHandle.java
deleted file mode 100644
index 6098ca3f..00000000
--- a/openjdk/java/lang/invoke/BoundMethodHandle.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * Extensively modified for IKVM.NET by Jeroen Frijters
- * Copyright (C) 2011 Jeroen Frijters
- */
-
-package java.lang.invoke;
-
-import sun.invoke.util.VerifyType;
-import sun.invoke.util.Wrapper;
-import static java.lang.invoke.MethodHandleStatics.*;
-
-/**
- * The flavor of method handle which emulates an invoke instruction
- * on a predetermined argument.  The JVM dispatches to the correct method
- * when the handle is created, not when it is invoked.
- * @author jrose
- */
-class BoundMethodHandle extends MethodHandle {
-    //MethodHandle vmtarget;           // next BMH or final DMH or methodOop
-    private final Object argument;     // argument to insert
-    private final int    vmargslot;    // position at which it is inserted
-
-    // Constructors in this class *must* be package scoped or private.
-
-    /** Bind a direct MH to its receiver (or first ref. argument).
-     *  The JVM will pre-dispatch the MH if it is not already static.
-     */
-    /*non-public*/ BoundMethodHandle(DirectMethodHandle mh, Object argument) {
-        super(mh.type().dropParameterTypes(0, 1));
-        // check the type now, once for all:
-        this.argument = checkReferenceArgument(argument, mh, 0);
-        this.vmargslot = this.type().parameterSlotCount();
-        initTarget(mh, 0);
-    }
-
-    /** Insert an argument into an arbitrary method handle.
-     *  If argnum is zero, inserts the first argument, etc.
-     *  The argument type must be a reference.
-     */
-    /*non-public*/ BoundMethodHandle(MethodHandle mh, Object argument, int argnum) {
-        this(mh.type().dropParameterTypes(argnum, argnum+1),
-             mh, argument, argnum);
-    }
-
-    /** Insert an argument into an arbitrary method handle.
-     *  If argnum is zero, inserts the first argument, etc.
-     */
-    /*non-public*/ BoundMethodHandle(MethodType type, MethodHandle mh, Object argument, int argnum) {
-        super(type);
-        if (mh.type().parameterType(argnum).isPrimitive())
-            this.argument = bindPrimitiveArgument(argument, mh, argnum);
-        else {
-            this.argument = checkReferenceArgument(argument, mh, argnum);
-        }
-        this.vmargslot = type.parameterSlotDepth(argnum);
-        initTarget(mh, argnum);
-    }
-
-    private void initTarget(MethodHandle mh, int argnum) {
-        vmtarget = createDelegate(type(), mh, argnum, argument);
-    }
-
-    private static native Object createDelegate(MethodType newType, MethodHandle mh, int argnum, Object argument);
-
-    /** For the AdapterMethodHandle subclass.
-     */
-    /*non-public*/ BoundMethodHandle(MethodType type, Object argument, int vmargslot) {
-        super(type);
-        this.argument = argument;
-        this.vmargslot = vmargslot;
-        assert(this instanceof AdapterMethodHandle);
-    }
-
-    /** Initialize the current object as a self-bound method handle, binding it
-     *  as the first argument of the method handle {@code entryPoint}.
-     *  The invocation type of the resulting method handle will be the
-     *  same as {@code entryPoint},  except that the first argument
-     *  type will be dropped.
-     */
-    /*non-public*/ BoundMethodHandle(MethodHandle entryPoint) {
-        super(entryPoint.type().dropParameterTypes(0, 1));
-        this.argument = this; // kludge; get rid of
-        this.vmargslot = this.type().parameterSlotDepth(0);
-        initTarget(entryPoint, 0);
-    }
-
-    /** Make sure the given {@code argument} can be used as {@code argnum}-th
-     *  parameter of the given method handle {@code mh}, which must be a reference.
-     *  <p>
-     *  If this fails, throw a suitable {@code WrongMethodTypeException},
-     *  which will prevent the creation of an illegally typed bound
-     *  method handle.
-     */
-    final static Object checkReferenceArgument(Object argument, MethodHandle mh, int argnum) {
-        Class<?> ptype = mh.type().parameterType(argnum);
-        if (ptype.isPrimitive()) {
-            // fail
-        } else if (argument == null) {
-            return null;
-        } else if (VerifyType.isNullReferenceConversion(argument.getClass(), ptype)) {
-            return argument;
-        }
-        throw badBoundArgumentException(argument, mh, argnum);
-    }
-
-    /** Make sure the given {@code argument} can be used as {@code argnum}-th
-     *  parameter of the given method handle {@code mh}, which must be a primitive.
-     *  <p>
-     *  If this fails, throw a suitable {@code WrongMethodTypeException},
-     *  which will prevent the creation of an illegally typed bound
-     *  method handle.
-     */
-    final static Object bindPrimitiveArgument(Object argument, MethodHandle mh, int argnum) {
-        Class<?> ptype = mh.type().parameterType(argnum);
-        Wrapper  wrap = Wrapper.forPrimitiveType(ptype);
-        Object   zero  = wrap.zero();
-        if (zero == null) {
-            // fail
-        } else if (argument == null) {
-            if (ptype != int.class && wrap.isSubwordOrInt())
-                return Integer.valueOf(0);
-            else
-                return zero;
-        } else if (VerifyType.isNullReferenceConversion(argument.getClass(), zero.getClass())) {
-            if (ptype != int.class && wrap.isSubwordOrInt())
-                return Wrapper.INT.wrap(argument);
-            else
-                return argument;
-        }
-        throw badBoundArgumentException(argument, mh, argnum);
-    }
-
-    final static RuntimeException badBoundArgumentException(Object argument, MethodHandle mh, int argnum) {
-        String atype = (argument == null) ? "null" : argument.getClass().toString();
-        return new ClassCastException("cannot bind "+atype+" argument to parameter #"+argnum+" of "+mh.type());
-    }
-}
diff --git a/openjdk/java/lang/invoke/CallSite.java b/openjdk/java/lang/invoke/CallSite.java
deleted file mode 100644
index 9b07446a..00000000
--- a/openjdk/java/lang/invoke/CallSite.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * Extensively modified for IKVM.NET by Jeroen Frijters
- * Copyright (C) 2011 Jeroen Frijters
- */
-
-package java.lang.invoke;
-
-import sun.invoke.empty.Empty;
-import sun.misc.Unsafe;
-import static java.lang.invoke.MethodHandleStatics.*;
-import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
-
-/**
- * A {@code CallSite} is a holder for a variable {@link MethodHandle},
- * which is called its {@code target}.
- * An {@code invokedynamic} instruction linked to a {@code CallSite} delegates
- * all calls to the site's current target.
- * A {@code CallSite} may be associated with several {@code invokedynamic}
- * instructions, or it may be "free floating", associated with none.
- * In any case, it may be invoked through an associated method handle
- * called its {@linkplain #dynamicInvoker dynamic invoker}.
- * <p>
- * {@code CallSite} is an abstract class which does not allow
- * direct subclassing by users.  It has three immediate,
- * concrete subclasses that may be either instantiated or subclassed.
- * <ul>
- * <li>If a mutable target is not required, an {@code invokedynamic} instruction
- * may be permanently bound by means of a {@linkplain ConstantCallSite constant call site}.
- * <li>If a mutable target is required which has volatile variable semantics,
- * because updates to the target must be immediately and reliably witnessed by other threads,
- * a {@linkplain VolatileCallSite volatile call site} may be used.
- * <li>Otherwise, if a mutable target is required,
- * a {@linkplain MutableCallSite mutable call site} may be used.
- * </ul>
- * <p>
- * A non-constant call site may be <em>relinked</em> by changing its target.
- * The new target must have the same {@linkplain MethodHandle#type() type}
- * as the previous target.
- * Thus, though a call site can be relinked to a series of
- * successive targets, it cannot change its type.
- * <p>
- * Here is a sample use of call sites and bootstrap methods which links every
- * dynamic call site to print its arguments:
-<blockquote><pre><!-- see indy-demo/src/PrintArgsDemo.java -->
-static void test() throws Throwable {
-    // THE FOLLOWING LINE IS PSEUDOCODE FOR A JVM INSTRUCTION
-    InvokeDynamic[#bootstrapDynamic].baz("baz arg", 2, 3.14);
-}
-private static void printArgs(Object... args) {
-  System.out.println(java.util.Arrays.deepToString(args));
-}
-private static final MethodHandle printArgs;
-static {
-  MethodHandles.Lookup lookup = MethodHandles.lookup();
-  Class thisClass = lookup.lookupClass();  // (who am I?)
-  printArgs = lookup.findStatic(thisClass,
-      "printArgs", MethodType.methodType(void.class, Object[].class));
-}
-private static CallSite bootstrapDynamic(MethodHandles.Lookup caller, String name, MethodType type) {
-  // ignore caller and name, but match the type:
-  return new ConstantCallSite(printArgs.asType(type));
-}
-</pre></blockquote>
- * @author John Rose, JSR 292 EG
- */
-abstract
-public class CallSite {
-
-    interface IndyCallSite {
-        void setTarget(Object target);
-    }
-
-    // The actual payload of this call site:
-    /*package-private*/
-    volatile MethodHandle target;
-    final IndyCallSite ics;
-
-    /**
-     * Make a blank call site object with the given method type.
-     * An initial target method is supplied which will throw
-     * an {@link IllegalStateException} if called.
-     * <p>
-     * Before this {@code CallSite} object is returned from a bootstrap method,
-     * it is usually provided with a more useful target method,
-     * via a call to {@link CallSite#setTarget(MethodHandle) setTarget}.
-     * @throws NullPointerException if the proposed type is null
-     */
-    /*package-private*/
-    CallSite(MethodType type) {
-        this(type.invokers().uninitializedCallSite());
-    }
-
-    /**
-     * Make a call site object equipped with an initial target method handle.
-     * @param target the method handle which will be the initial target of the call site
-     * @throws NullPointerException if the proposed target is null
-     */
-    /*package-private*/
-    CallSite(MethodHandle target) {
-        target.getClass();  // null check
-        ics = createIndyCallSite(target.vmtarget);
-        setTargetNormal(target);
-    }
-
-    private static native IndyCallSite createIndyCallSite(Object target);
-
-    final void setTargetNormal(MethodHandle target) {
-        this.target = target;
-        ics.setTarget(target.vmtarget);
-    }
-
-    final void setTargetVolatile(MethodHandle target) {
-        synchronized(ics) {
-            setTargetNormal(target);
-        }
-    }
-
-    final MethodHandle getTargetVolatile() {
-        synchronized(ics) {
-            return target;
-        }
-    }
-
-    /**
-     * Make a call site object equipped with an initial target method handle.
-     * @param targetType the desired type of the call site
-     * @param createTargetHook a hook which will bind the call site to the target method handle
-     * @throws WrongMethodTypeException if the hook cannot be invoked on the required arguments,
-     *         or if the target returned by the hook is not of the given {@code targetType}
-     * @throws NullPointerException if the hook returns a null value
-     * @throws ClassCastException if the hook returns something other than a {@code MethodHandle}
-     * @throws Throwable anything else thrown by the the hook function
-     */
-    /*package-private*/
-    CallSite(MethodType targetType, MethodHandle createTargetHook) throws Throwable {
-        this(targetType);
-        ConstantCallSite selfCCS = (ConstantCallSite) this;
-        MethodHandle boundTarget = (MethodHandle) createTargetHook.invokeWithArguments(selfCCS);
-        checkTargetChange(this.target, boundTarget);
-        setTargetNormal(boundTarget);
-    }
-
-    /**
-     * Returns the type of this call site's target.
-     * Although targets may change, any call site's type is permanent, and can never change to an unequal type.
-     * The {@code setTarget} method enforces this invariant by refusing any new target that does
-     * not have the previous target's type.
-     * @return the type of the current target, which is also the type of any future target
-     */
-    public MethodType type() {
-        // warning:  do not call getTarget here, because CCS.getTarget can throw IllegalStateException
-        return target.type();
-    }
-
-    /**
-     * Returns the target method of the call site, according to the
-     * behavior defined by this call site's specific class.
-     * The immediate subclasses of {@code CallSite} document the
-     * class-specific behaviors of this method.
-     *
-     * @return the current linkage state of the call site, its target method handle
-     * @see ConstantCallSite
-     * @see VolatileCallSite
-     * @see #setTarget
-     * @see ConstantCallSite#getTarget
-     * @see MutableCallSite#getTarget
-     * @see VolatileCallSite#getTarget
-     */
-    public abstract MethodHandle getTarget();
-
-    /**
-     * Updates the target method of this call site, according to the
-     * behavior defined by this call site's specific class.
-     * The immediate subclasses of {@code CallSite} document the
-     * class-specific behaviors of this method.
-     * <p>
-     * The type of the new target must be {@linkplain MethodType#equals equal to}
-     * the type of the old target.
-     *
-     * @param newTarget the new target
-     * @throws NullPointerException if the proposed new target is null
-     * @throws WrongMethodTypeException if the proposed new target
-     *         has a method type that differs from the previous target
-     * @see CallSite#getTarget
-     * @see ConstantCallSite#setTarget
-     * @see MutableCallSite#setTarget
-     * @see VolatileCallSite#setTarget
-     */
-    public abstract void setTarget(MethodHandle newTarget);
-
-    void checkTargetChange(MethodHandle oldTarget, MethodHandle newTarget) {
-        MethodType oldType = oldTarget.type();
-        MethodType newType = newTarget.type();  // null check!
-        if (!newType.equals(oldType))
-            throw wrongTargetType(newTarget, oldType);
-    }
-
-    private static WrongMethodTypeException wrongTargetType(MethodHandle target, MethodType type) {
-        return new WrongMethodTypeException(String.valueOf(target)+" should be of type "+type);
-    }
-
-    /**
-     * Produces a method handle equivalent to an invokedynamic instruction
-     * which has been linked to this call site.
-     * <p>
-     * This method is equivalent to the following code:
-     * <blockquote><pre>
-     * MethodHandle getTarget, invoker, result;
-     * getTarget = MethodHandles.publicLookup().bind(this, "getTarget", MethodType.methodType(MethodHandle.class));
-     * invoker = MethodHandles.exactInvoker(this.type());
-     * result = MethodHandles.foldArguments(invoker, getTarget)
-     * </pre></blockquote>
-     *
-     * @return a method handle which always invokes this call site's current target
-     */
-    public abstract MethodHandle dynamicInvoker();
-
-    /*non-public*/ MethodHandle makeDynamicInvoker() {
-        MethodHandle getTarget = MethodHandleImpl.bindReceiver(GET_TARGET, this);
-        MethodHandle invoker = MethodHandles.exactInvoker(this.type());
-        return MethodHandles.foldArguments(invoker, getTarget);
-    }
-
-    private static final MethodHandle GET_TARGET;
-    static {
-        try {
-            GET_TARGET = IMPL_LOOKUP.
-                findVirtual(CallSite.class, "getTarget", MethodType.methodType(MethodHandle.class));
-        } catch (ReflectiveOperationException ignore) {
-            throw new InternalError();
-        }
-    }
-
-    /** This guy is rolled into the default target if a MethodType is supplied to the constructor. */
-    /*package-private*/
-    static Empty uninitializedCallSite() {
-        throw new IllegalStateException("uninitialized call site");
-    }
-}
diff --git a/openjdk/java/lang/invoke/ConstantCallSite.java b/openjdk/java/lang/invoke/ConstantCallSite.java
deleted file mode 100644
index 2d9fedec..00000000
--- a/openjdk/java/lang/invoke/ConstantCallSite.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.invoke;
-
-/**
- * A {@code ConstantCallSite} is a {@link CallSite} whose target is permanent, and can never be changed.
- * An {@code invokedynamic} instruction linked to a {@code ConstantCallSite} is permanently
- * bound to the call site's target.
- * @author John Rose, JSR 292 EG
- */
-public class ConstantCallSite extends CallSite {
-    private final boolean isFrozen;
-
-    /**
-     * Creates a call site with a permanent target.
-     * @param target the target to be permanently associated with this call site
-     * @throws NullPointerException if the proposed target is null
-     */
-    public ConstantCallSite(MethodHandle target) {
-        super(target);
-        isFrozen = true;
-    }
-
-    /**
-     * Creates a call site with a permanent target, possibly bound to the call site itself.
-     * <p>
-     * During construction of the call site, the {@code createTargetHook} is invoked to
-     * produce the actual target, as if by a call of the form
-     * {@code (MethodHandle) createTargetHook.invoke(this)}.
-     * <p>
-     * Note that user code cannot perform such an action directly in a subclass constructor,
-     * since the target must be fixed before the {@code ConstantCallSite} constructor returns.
-     * <p>
-     * The hook is said to bind the call site to a target method handle,
-     * and a typical action would be {@code someTarget.bindTo(this)}.
-     * However, the hook is free to take any action whatever,
-     * including ignoring the call site and returning a constant target.
-     * <p>
-     * The result returned by the hook must be a method handle of exactly
-     * the same type as the call site.
-     * <p>
-     * While the hook is being called, the new {@code ConstantCallSite}
-     * object is in a partially constructed state.
-     * In this state,
-     * a call to {@code getTarget}, or any other attempt to use the target,
-     * will result in an {@code IllegalStateException}.
-     * It is legal at all times to obtain the call site's type using the {@code type} method.
-     *
-     * @param targetType the type of the method handle to be permanently associated with this call site
-     * @param createTargetHook a method handle to invoke (on the call site) to produce the call site's target
-     * @throws WrongMethodTypeException if the hook cannot be invoked on the required arguments,
-     *         or if the target returned by the hook is not of the given {@code targetType}
-     * @throws NullPointerException if the hook returns a null value
-     * @throws ClassCastException if the hook returns something other than a {@code MethodHandle}
-     * @throws Throwable anything else thrown by the the hook function
-     */
-    protected ConstantCallSite(MethodType targetType, MethodHandle createTargetHook) throws Throwable {
-        super(targetType, createTargetHook);
-        isFrozen = true;
-    }
-
-    /**
-     * Returns the target method of the call site, which behaves
-     * like a {@code final} field of the {@code ConstantCallSite}.
-     * That is, the the target is always the original value passed
-     * to the constructor call which created this instance.
-     *
-     * @return the immutable linkage state of this call site, a constant method handle
-     * @throws IllegalStateException if the {@code ConstantCallSite} constructor has not completed
-     */
-    @Override public final MethodHandle getTarget() {
-        if (!isFrozen)  throw new IllegalStateException();
-        return target;
-    }
-
-    /**
-     * Always throws an {@link UnsupportedOperationException}.
-     * This kind of call site cannot change its target.
-     * @param ignore a new target proposed for the call site, which is ignored
-     * @throws UnsupportedOperationException because this kind of call site cannot change its target
-     */
-    @Override public final void setTarget(MethodHandle ignore) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns this call site's permanent target.
-     * Since that target will never change, this is a correct implementation
-     * of {@link CallSite#dynamicInvoker CallSite.dynamicInvoker}.
-     * @return the immutable linkage state of this call site, a constant method handle
-     * @throws IllegalStateException if the {@code ConstantCallSite} constructor has not completed
-     */
-    @Override
-    public final MethodHandle dynamicInvoker() {
-        return getTarget();
-    }
-}
diff --git a/openjdk/java/lang/invoke/DirectMethodHandle.java b/openjdk/java/lang/invoke/DirectMethodHandle.java
deleted file mode 100644
index 23a55dce..00000000
--- a/openjdk/java/lang/invoke/DirectMethodHandle.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.invoke;
-
-/**
- * The flavor of method handle which emulates invokespecial or invokestatic.
- * @author jrose
- */
-class DirectMethodHandle extends MethodHandle {
-    //inherited oop    vmtarget;    // methodOop or virtual class/interface oop
-
-    // Constructors in this class *must* be package scoped or private.
-    DirectMethodHandle(MethodType mtype, MemberName m, boolean doDispatch, Class<?> lookupClass) {
-        super(mtype);
-
-        assert(m.isMethod() || !doDispatch && m.isConstructor());
-        if (!m.isResolved())
-            throw new InternalError();
-
-        vmtarget = createDelegate(mtype, m, doDispatch, lookupClass);
-    }
-
-    private static native Object createDelegate(MethodType type, MemberName m, boolean doDispatch, Class<?> lookupClass);
-
-    boolean isValid() {
-        return vmtarget != null;
-    }
-}
diff --git a/openjdk/java/lang/invoke/MethodHandleImpl.java b/openjdk/java/lang/invoke/MethodHandleImpl.java
deleted file mode 100644
index 76c41aa0..00000000
--- a/openjdk/java/lang/invoke/MethodHandleImpl.java
+++ /dev/null
@@ -1,740 +0,0 @@
-/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * Extensively modified for IKVM.NET by Jeroen Frijters
- * Copyright (C) 2011 Jeroen Frijters
- */
-
-package java.lang.invoke;
-
-import sun.invoke.util.VerifyType;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import sun.invoke.empty.Empty;
-import sun.invoke.util.ValueConversions;
-import sun.invoke.util.Wrapper;
-import sun.misc.Unsafe;
-import static java.lang.invoke.MethodHandleStatics.*;
-import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
-
-/**
- * Trusted implementation code for MethodHandle.
- * @author jrose
- */
-/*non-public*/ abstract class MethodHandleImpl {
-    /// Factory methods to create method handles:
-
-    private static final MemberName.Factory LOOKUP = MemberName.Factory.INSTANCE;
-
-    static void initStatics() {
-        // Trigger preceding sequence.
-    }
-
-    /** Look up a given method.
-     * Callable only from sun.invoke and related packages.
-     * <p>
-     * The resulting method handle type will be of the given type,
-     * with a receiver type {@code rcvc} prepended if the member is not static.
-     * <p>
-     * Access checks are made as of the given lookup class.
-     * In particular, if the method is protected and {@code defc} is in a
-     * different package from the lookup class, then {@code rcvc} must be
-     * the lookup class or a subclass.
-     * @param token Proof that the lookup class has access to this package.
-     * @param member Resolved method or constructor to call.
-     * @param name Name of the desired method.
-     * @param rcvc Receiver type of desired non-static method (else null)
-     * @param doDispatch whether the method handle will test the receiver type
-     * @param lookupClass access-check relative to this class
-     * @return a direct handle to the matching method
-     * @throws IllegalAccessException if the given method cannot be accessed by the lookup class
-     */
-    static
-    MethodHandle findMethod(MemberName method,
-                            boolean doDispatch, Class<?> lookupClass) throws IllegalAccessException {
-        MethodType mtype = method.getMethodType();
-        if (!method.isStatic()) {
-            // adjust the advertised receiver type to be exactly the one requested
-            // (in the case of invokespecial, this will be the calling class)
-            Class<?> recvType = method.getDeclaringClass();
-            mtype = mtype.insertParameterTypes(0, recvType);
-        }
-        DirectMethodHandle mh = new DirectMethodHandle(mtype, method, doDispatch, lookupClass);
-        if (!mh.isValid())
-            throw method.makeAccessException("no direct method handle", lookupClass);
-        assert(mh.type() == mtype);
-        if (!method.isVarargs())
-            return mh;
-        int argc = mtype.parameterCount();
-        if (argc != 0) {
-            Class<?> arrayType = mtype.parameterType(argc-1);
-            if (arrayType.isArray())
-                return AdapterMethodHandle.makeVarargsCollector(mh, arrayType);
-        }
-        throw method.makeAccessException("cannot make variable arity", null);
-    }
-
-    static
-    MethodHandle makeAllocator(MethodHandle rawConstructor) {
-        MethodType rawConType = rawConstructor.type();
-        Class<?> allocateClass = rawConType.parameterType(0);
-        // Wrap the raw (unsafe) constructor with the allocation of a suitable object.
-        // allocator(arg...)
-        // [fold]=> cookedConstructor(obj=allocate(C), arg...)
-        // [dup,collect]=> identity(obj, void=rawConstructor(obj, arg...))
-        MethodHandle returner = MethodHandles.identity(allocateClass);
-        MethodType ctype = rawConType.insertParameterTypes(0, allocateClass).changeReturnType(allocateClass);
-        MethodHandle  cookedConstructor = AdapterMethodHandle.makeCollectArguments(returner, rawConstructor, 1, false);
-        assert(cookedConstructor.type().equals(ctype));
-        ctype = ctype.dropParameterTypes(0, 1);
-        cookedConstructor = AdapterMethodHandle.makeCollectArguments(cookedConstructor, returner, 0, true);
-        MethodHandle allocator = new AllocateObject(allocateClass);
-        // allocate() => new C(void)
-        assert(allocator.type().equals(MethodType.methodType(allocateClass)));
-        ctype = ctype.dropParameterTypes(0, 1);
-        MethodHandle fold = foldArguments(cookedConstructor, ctype, 0, allocator);
-        return fold;
-    }
-
-    static final class AllocateObject<C> extends BoundMethodHandle {
-        private static final Unsafe unsafe = Unsafe.getUnsafe();
-
-        private final Class<C> allocateClass;
-
-        // for allocation only:
-        private AllocateObject(Class<C> allocateClass) {
-            super(ALLOCATE.asType(MethodType.methodType(allocateClass, AllocateObject.class)));
-            this.allocateClass = allocateClass;
-        }
-        @SuppressWarnings("unchecked")
-        private C allocate() throws InstantiationException {
-            return (C) unsafe.allocateInstance(allocateClass);
-        }
-        static final MethodHandle ALLOCATE;
-        static {
-            try {
-                ALLOCATE = IMPL_LOOKUP.findVirtual(AllocateObject.class, "allocate", MethodType.genericMethodType(0));
-            } catch (ReflectiveOperationException ex) {
-                throw uncaughtException(ex);
-            }
-        }
-    }
-
-    static
-    MethodHandle accessField(MemberName member, boolean isSetter,
-                             Class<?> lookupClass) {
-        // Use sun. misc.Unsafe to dig up the dirt on the field.
-        MethodHandle mh = new FieldAccessor(member, isSetter);
-        return mh;
-    }
-
-    static
-    MethodHandle accessArrayElement(Class<?> arrayClass, boolean isSetter) {
-        if (!arrayClass.isArray())
-            throw newIllegalArgumentException("not an array: "+arrayClass);
-        Class<?> elemClass = arrayClass.getComponentType();
-        MethodHandle[] mhs = FieldAccessor.ARRAY_CACHE.get(elemClass);
-        if (mhs == null) {
-            if (!FieldAccessor.doCache(elemClass))
-                return FieldAccessor.ahandle(arrayClass, isSetter);
-            mhs = new MethodHandle[] {
-                FieldAccessor.ahandle(arrayClass, false),
-                FieldAccessor.ahandle(arrayClass, true)
-            };
-            if (mhs[0].type().parameterType(0) == Class.class) {
-                mhs[0] = mhs[0].bindTo(elemClass);
-                mhs[1] = mhs[1].bindTo(elemClass);
-            }
-            synchronized (FieldAccessor.ARRAY_CACHE) {}  // memory barrier
-            FieldAccessor.ARRAY_CACHE.put(elemClass, mhs);
-        }
-        return mhs[isSetter ? 1 : 0];
-    }
-
-    static final class FieldAccessor<C,V> extends BoundMethodHandle {
-        private static final Unsafe unsafe = Unsafe.getUnsafe();
-        final Object base;  // for static refs only
-        final long offset;
-        final String name;
-
-        FieldAccessor(MemberName field, boolean isSetter) {
-            super(fhandle(field.getDeclaringClass(), field.getFieldType(), isSetter, field.isStatic()));
-            this.offset = fieldOffset(field);
-            this.name = field.getName();
-            this.base = null;
-        }
-        @Override
-        String debugString() { return addTypeString(name, this); }
-
-        int getFieldI(C obj) { return unsafe.getInt(obj, offset); }
-        void setFieldI(C obj, int x) { unsafe.putInt(obj, offset, x); }
-        long getFieldJ(C obj) { return unsafe.getLong(obj, offset); }
-        void setFieldJ(C obj, long x) { unsafe.putLong(obj, offset, x); }
-        float getFieldF(C obj) { return unsafe.getFloat(obj, offset); }
-        void setFieldF(C obj, float x) { unsafe.putFloat(obj, offset, x); }
-        double getFieldD(C obj) { return unsafe.getDouble(obj, offset); }
-        void setFieldD(C obj, double x) { unsafe.putDouble(obj, offset, x); }
-        boolean getFieldZ(C obj) { return unsafe.getBoolean(obj, offset); }
-        void setFieldZ(C obj, boolean x) { unsafe.putBoolean(obj, offset, x); }
-        byte getFieldB(C obj) { return unsafe.getByte(obj, offset); }
-        void setFieldB(C obj, byte x) { unsafe.putByte(obj, offset, x); }
-        short getFieldS(C obj) { return unsafe.getShort(obj, offset); }
-        void setFieldS(C obj, short x) { unsafe.putShort(obj, offset, x); }
-        char getFieldC(C obj) { return unsafe.getChar(obj, offset); }
-        void setFieldC(C obj, char x) { unsafe.putChar(obj, offset, x); }
-        @SuppressWarnings("unchecked")
-        V getFieldL(C obj) { return (V) unsafe.getObject(obj, offset); }
-        @SuppressWarnings("unchecked")
-        void setFieldL(C obj, V x) { unsafe.putObject(obj, offset, x); }
-        // cast (V) is OK here, since we wrap convertArguments around the MH.
-
-        static Integer fieldOffset(final MemberName field) {
-            return AccessController.doPrivileged(new PrivilegedAction<Integer>() {
-                    public Integer run() {
-                        try {
-                            Class c = field.getDeclaringClass();
-                            // FIXME:  Should not have to create 'f' to get this value.
-                            java.lang.reflect.Field f = c.getDeclaredField(field.getName());
-                            return unsafe.fieldOffset(f);
-                        } catch (NoSuchFieldException ee) {
-                            throw uncaughtException(ee);
-                        }
-                    }
-                });
-        }
-
-        int getStaticI() { return unsafe.getInt(base, offset); }
-        void setStaticI(int x) { unsafe.putInt(base, offset, x); }
-        long getStaticJ() { return unsafe.getLong(base, offset); }
-        void setStaticJ(long x) { unsafe.putLong(base, offset, x); }
-        float getStaticF() { return unsafe.getFloat(base, offset); }
-        void setStaticF(float x) { unsafe.putFloat(base, offset, x); }
-        double getStaticD() { return unsafe.getDouble(base, offset); }
-        void setStaticD(double x) { unsafe.putDouble(base, offset, x); }
-        boolean getStaticZ() { return unsafe.getBoolean(base, offset); }
-        void setStaticZ(boolean x) { unsafe.putBoolean(base, offset, x); }
-        byte getStaticB() { return unsafe.getByte(base, offset); }
-        void setStaticB(byte x) { unsafe.putByte(base, offset, x); }
-        short getStaticS() { return unsafe.getShort(base, offset); }
-        void setStaticS(short x) { unsafe.putShort(base, offset, x); }
-        char getStaticC() { return unsafe.getChar(base, offset); }
-        void setStaticC(char x) { unsafe.putChar(base, offset, x); }
-        V getStaticL() { return (V) unsafe.getObject(base, offset); }
-        void setStaticL(V x) { unsafe.putObject(base, offset, x); }
-
-        static String fname(Class<?> vclass, boolean isSetter, boolean isStatic) {
-            String stem;
-            if (!isStatic)
-                stem = (!isSetter ? "getField" : "setField");
-            else
-                stem = (!isSetter ? "getStatic" : "setStatic");
-            return stem + Wrapper.basicTypeChar(vclass);
-        }
-        static MethodType ftype(Class<?> cclass, Class<?> vclass, boolean isSetter, boolean isStatic) {
-            MethodType type;
-            if (!isStatic) {
-                if (!isSetter)
-                    return MethodType.methodType(vclass, cclass);
-                else
-                    return MethodType.methodType(void.class, cclass, vclass);
-            } else {
-                if (!isSetter)
-                    return MethodType.methodType(vclass);
-                else
-                    return MethodType.methodType(void.class, vclass);
-            }
-        }
-        static MethodHandle fhandle(Class<?> cclass, Class<?> vclass, boolean isSetter, boolean isStatic) {
-            String name = FieldAccessor.fname(vclass, isSetter, isStatic);
-            if (cclass.isPrimitive())  throw newIllegalArgumentException("primitive "+cclass);
-            Class<?> ecclass = Object.class;  //erase this type
-            Class<?> evclass = vclass;
-            if (!evclass.isPrimitive())  evclass = Object.class;
-            MethodType type = FieldAccessor.ftype(ecclass, evclass, isSetter, isStatic);
-            MethodHandle mh;
-            try {
-                mh = IMPL_LOOKUP.findVirtual(FieldAccessor.class, name, type);
-            } catch (ReflectiveOperationException ex) {
-                throw uncaughtException(ex);
-            }
-            if (evclass != vclass || (!isStatic && ecclass != cclass)) {
-                MethodType strongType = FieldAccessor.ftype(cclass, vclass, isSetter, isStatic);
-                strongType = strongType.insertParameterTypes(0, FieldAccessor.class);
-                mh = convertArguments(mh, strongType, 0);
-            }
-            return mh;
-        }
-
-        /// Support for array element access
-        static final HashMap<Class<?>, MethodHandle[]> ARRAY_CACHE =
-                new HashMap<Class<?>, MethodHandle[]>();
-        // FIXME: Cache on the classes themselves, not here.
-        static boolean doCache(Class<?> elemClass) {
-            if (elemClass.isPrimitive())  return true;
-            ClassLoader cl = elemClass.getClassLoader();
-            return cl == null || cl == ClassLoader.getSystemClassLoader();
-        }
-        static int getElementI(int[] a, int i) { return a[i]; }
-        static void setElementI(int[] a, int i, int x) { a[i] = x; }
-        static long getElementJ(long[] a, int i) { return a[i]; }
-        static void setElementJ(long[] a, int i, long x) { a[i] = x; }
-        static float getElementF(float[] a, int i) { return a[i]; }
-        static void setElementF(float[] a, int i, float x) { a[i] = x; }
-        static double getElementD(double[] a, int i) { return a[i]; }
-        static void setElementD(double[] a, int i, double x) { a[i] = x; }
-        static boolean getElementZ(boolean[] a, int i) { return a[i]; }
-        static void setElementZ(boolean[] a, int i, boolean x) { a[i] = x; }
-        static byte getElementB(byte[] a, int i) { return a[i]; }
-        static void setElementB(byte[] a, int i, byte x) { a[i] = x; }
-        static short getElementS(short[] a, int i) { return a[i]; }
-        static void setElementS(short[] a, int i, short x) { a[i] = x; }
-        static char getElementC(char[] a, int i) { return a[i]; }
-        static void setElementC(char[] a, int i, char x) { a[i] = x; }
-        static Object getElementL(Object[] a, int i) { return a[i]; }
-        static void setElementL(Object[] a, int i, Object x) { a[i] = x; }
-        static <V> V getElementL(Class<V[]> aclass, V[] a, int i) { return aclass.cast(a)[i]; }
-        static <V> void setElementL(Class<V[]> aclass, V[] a, int i, V x) { aclass.cast(a)[i] = x; }
-
-        static String aname(Class<?> aclass, boolean isSetter) {
-            Class<?> vclass = aclass.getComponentType();
-            if (vclass == null)  throw new IllegalArgumentException();
-            return (!isSetter ? "getElement" : "setElement") + Wrapper.basicTypeChar(vclass);
-        }
-        static MethodType atype(Class<?> aclass, boolean isSetter) {
-            Class<?> vclass = aclass.getComponentType();
-            if (!isSetter)
-                return MethodType.methodType(vclass, aclass, int.class);
-            else
-                return MethodType.methodType(void.class, aclass, int.class, vclass);
-        }
-        static MethodHandle ahandle(Class<?> aclass, boolean isSetter) {
-            Class<?> vclass = aclass.getComponentType();
-            String name = FieldAccessor.aname(aclass, isSetter);
-            Class<?> caclass = null;
-            if (!vclass.isPrimitive() && vclass != Object.class) {
-                caclass = aclass;
-                aclass = Object[].class;
-                vclass = Object.class;
-            }
-            MethodType type = FieldAccessor.atype(aclass, isSetter);
-            if (caclass != null)
-                type = type.insertParameterTypes(0, Class.class);
-            MethodHandle mh;
-            try {
-                mh = IMPL_LOOKUP.findStatic(FieldAccessor.class, name, type);
-            } catch (ReflectiveOperationException ex) {
-                throw uncaughtException(ex);
-            }
-            if (caclass != null) {
-                MethodType strongType = FieldAccessor.atype(caclass, isSetter);
-                mh = mh.bindTo(caclass);
-                mh = convertArguments(mh, strongType, 0);
-            }
-            return mh;
-        }
-    }
-
-    /** Bind a predetermined first argument to the given direct method handle.
-     * Callable only from MethodHandles.
-     * @param token Proof that the caller has access to this package.
-     * @param target Any direct method handle.
-     * @param receiver Receiver (or first static method argument) to pre-bind.
-     * @return a BoundMethodHandle for the given DirectMethodHandle, or null if it does not exist
-     */
-    static
-    MethodHandle bindReceiver(MethodHandle target, Object receiver) {
-        if (receiver == null)  return null;
-        return new BoundMethodHandle(target, receiver, 0);
-    }
-
-    /** Bind a predetermined argument to the given arbitrary method handle.
-     * Callable only from MethodHandles.
-     * @param token Proof that the caller has access to this package.
-     * @param target Any method handle.
-     * @param receiver Argument (which can be a boxed primitive) to pre-bind.
-     * @return a suitable BoundMethodHandle
-     */
-    static
-    MethodHandle bindArgument(MethodHandle target, int argnum, Object receiver) {
-        return new BoundMethodHandle(target, receiver, argnum);
-    }
-
-    static native MethodHandle permuteArguments(MethodHandle target,
-                                                MethodType newType,
-                                                MethodType oldType,
-                                                int[] permutationOrNull);
-
-    /*non-public*/ static
-    MethodHandle convertArguments(MethodHandle target, MethodType newType, int level) {
-        MethodType oldType = target.type();
-        if (oldType.equals(newType))
-            return target;
-        assert(level > 1 || oldType.isConvertibleTo(newType));
-        MethodHandle retFilter = null;
-        Class<?> oldRT = oldType.returnType();
-        Class<?> newRT = newType.returnType();
-        if (!VerifyType.isNullConversion(oldRT, newRT)) {
-            if (oldRT == void.class) {
-                Wrapper wrap = newRT.isPrimitive() ? Wrapper.forPrimitiveType(newRT) : Wrapper.OBJECT;
-                retFilter = ValueConversions.zeroConstantFunction(wrap);
-            } else {
-                retFilter = MethodHandles.identity(newRT);
-                retFilter = convertArguments(retFilter, retFilter.type().changeParameterType(0, oldRT), level);
-            }
-            newType = newType.changeReturnType(oldRT);
-        }
-        MethodHandle res = null;
-        Exception ex = null;
-        try {
-            res = convertArguments(target, newType, oldType, level);
-        } catch (IllegalArgumentException ex1) {
-            ex = ex1;
-        }
-        if (res == null) {
-            WrongMethodTypeException wmt = new WrongMethodTypeException("cannot convert to "+newType+": "+target);
-            wmt.initCause(ex);
-            throw wmt;
-        }
-        if (retFilter != null)
-            res = MethodHandles.filterReturnValue(res, retFilter);
-        return res;
-    }
-
-    static MethodHandle convertArguments(MethodHandle target,
-                                                MethodType newType,
-                                                MethodType oldType,
-                                                int level) {
-        assert(oldType.parameterCount() == target.type().parameterCount());
-        if (newType == oldType)
-            return target;
-        if (oldType.parameterCount() != newType.parameterCount())
-            throw newIllegalArgumentException("mismatched parameter count", oldType, newType);
-        return AdapterMethodHandle.makePairwiseConvert(newType, target, level);
-    }
-
-    static MethodHandle spreadArguments(MethodHandle target, Class<?> arrayType, int arrayLength) {
-        MethodType oldType = target.type();
-        int nargs = oldType.parameterCount();
-        int keepPosArgs = nargs - arrayLength;
-        MethodType newType = oldType
-                .dropParameterTypes(keepPosArgs, nargs)
-                .insertParameterTypes(keepPosArgs, arrayType);
-        return spreadArguments(target, newType, keepPosArgs, arrayType, arrayLength);
-    }
-    // called internally only
-    static MethodHandle spreadArgumentsFromPos(MethodHandle target, MethodType newType, int spreadArgPos) {
-        int arrayLength = target.type().parameterCount() - spreadArgPos;
-        return spreadArguments(target, newType, spreadArgPos, Object[].class, arrayLength);
-    }
-    static MethodHandle spreadArguments(MethodHandle target,
-                                               MethodType newType,
-                                               int spreadArgPos,
-                                               Class<?> arrayType,
-                                               int arrayLength) {
-        // TO DO: maybe allow the restarg to be Object and implicitly cast to Object[]
-        MethodType oldType = target.type();
-        // spread the last argument of newType to oldType
-        assert(arrayLength == oldType.parameterCount() - spreadArgPos);
-        assert(newType.parameterType(spreadArgPos) == arrayType);
-        return AdapterMethodHandle.makeSpreadArguments(newType, target, arrayType, spreadArgPos, arrayLength);
-    }
-
-    static MethodHandle collectArguments(MethodHandle target,
-                                                int collectArg,
-                                                MethodHandle collector) {
-        MethodType type = target.type();
-        Class<?> collectType = collector.type().returnType();
-        assert(collectType != void.class);  // else use foldArguments
-        if (collectType != type.parameterType(collectArg))
-            target = target.asType(type.changeParameterType(collectArg, collectType));
-        MethodType newType = type
-                .dropParameterTypes(collectArg, collectArg+1)
-                .insertParameterTypes(collectArg, collector.type().parameterArray());
-        return collectArguments(target, newType, collectArg, collector);
-    }
-    static MethodHandle collectArguments(MethodHandle target,
-                                                MethodType newType,
-                                                int collectArg,
-                                                MethodHandle collector) {
-        MethodType oldType = target.type();     // (a...,c)=>r
-        //         newType                      // (a..., b...)=>r
-        MethodType colType = collector.type();  // (b...)=>c
-        //         oldType                      // (a..., b...)=>r
-        assert(newType.parameterCount() == collectArg + colType.parameterCount());
-        assert(oldType.parameterCount() == collectArg + 1);
-        return AdapterMethodHandle.makeCollectArguments(target, collector, collectArg, false);
-    }
-
-    static MethodHandle filterArgument(MethodHandle target,
-                                       int pos,
-                                       MethodHandle filter) {
-        MethodType ttype = target.type();
-        MethodType ftype = filter.type();
-        assert(ftype.parameterCount() == 1);
-        return AdapterMethodHandle.makeCollectArguments(target, filter, pos, false);
-    }
-
-    static MethodHandle foldArguments(MethodHandle target,
-                                      MethodType newType,
-                                      int foldPos,
-                                      MethodHandle combiner) {
-        MethodType oldType = target.type();
-        MethodType ctype = combiner.type();
-        return AdapterMethodHandle.makeCollectArguments(target, combiner, foldPos, true);
-    }
-
-    static
-    MethodHandle dropArguments(MethodHandle target,
-                               MethodType newType, int argnum) {
-        int drops = newType.parameterCount() - target.type().parameterCount();
-        return AdapterMethodHandle.makeDropArguments(newType, target, argnum, drops);
-    }
-
-    static
-    MethodHandle selectAlternative(boolean testResult, MethodHandle target, MethodHandle fallback) {
-        return testResult ? target : fallback;
-    }
-
-    static MethodHandle SELECT_ALTERNATIVE;
-    static MethodHandle selectAlternative() {
-        if (SELECT_ALTERNATIVE != null)  return SELECT_ALTERNATIVE;
-        try {
-            SELECT_ALTERNATIVE
-            = IMPL_LOOKUP.findStatic(MethodHandleImpl.class, "selectAlternative",
-                    MethodType.methodType(MethodHandle.class, boolean.class, MethodHandle.class, MethodHandle.class));
-        } catch (ReflectiveOperationException ex) {
-            throw new RuntimeException(ex);
-        }
-        return SELECT_ALTERNATIVE;
-    }
-
-    static
-    MethodHandle makeGuardWithTest(MethodHandle test,
-                                   MethodHandle target,
-                                   MethodHandle fallback) {
-        // gwt(arg...)
-        // [fold]=> continueAfterTest(z=test(arg...), arg...)
-        // [filter]=> (tf=select(z))(arg...)
-        //    where select(z) = select(z, t, f).bindTo(t, f) => z ? t f
-        // [tailcall]=> tf(arg...)
-        assert(test.type().returnType() == boolean.class);
-        MethodType targetType = target.type();
-        MethodType foldTargetType = targetType.insertParameterTypes(0, boolean.class);
-        // working backwards, as usual:
-        assert(target.type().equals(fallback.type()));
-        MethodHandle tailcall = MethodHandles.exactInvoker(target.type());
-        MethodHandle select = selectAlternative();
-        select = bindArgument(select, 2, fallback);
-        select = bindArgument(select, 1, target);
-        // select(z: boolean) => (z ? target : fallback)
-        MethodHandle filter = filterArgument(tailcall, 0, select);
-        assert(filter.type().parameterType(0) == boolean.class);
-        MethodHandle fold = foldArguments(filter, filter.type().dropParameterTypes(0, 1), 0, test);
-        return fold;
-    }
-
-    private static class GuardWithCatch extends BoundMethodHandle {
-        private final MethodHandle target;
-        private final Class<? extends Throwable> exType;
-        private final MethodHandle catcher;
-        GuardWithCatch(MethodHandle target, Class<? extends Throwable> exType, MethodHandle catcher) {
-            this(INVOKES[target.type().parameterCount()], target, exType, catcher);
-        }
-        // FIXME: Build the control flow out of foldArguments.
-        GuardWithCatch(MethodHandle invoker,
-                       MethodHandle target, Class<? extends Throwable> exType, MethodHandle catcher) {
-            super(invoker);
-            this.target = target;
-            this.exType = exType;
-            this.catcher = catcher;
-        }
-        @Override
-        String debugString() {
-            return addTypeString(target, this);
-        }
-        private Object invoke_V(Object... av) throws Throwable {
-            try {
-                return target.invokeExact(av);
-            } catch (Throwable t) {
-                if (!exType.isInstance(t))  throw t;
-                return catcher.invokeExact(t, av);
-            }
-        }
-        private Object invoke_L0() throws Throwable {
-            try {
-                return target.invokeExact();
-            } catch (Throwable t) {
-                if (!exType.isInstance(t))  throw t;
-                return catcher.invokeExact(t);
-            }
-        }
-        private Object invoke_L1(Object a0) throws Throwable {
-            try {
-                return target.invokeExact(a0);
-            } catch (Throwable t) {
-                if (!exType.isInstance(t))  throw t;
-                return catcher.invokeExact(t, a0);
-            }
-        }
-        private Object invoke_L2(Object a0, Object a1) throws Throwable {
-            try {
-                return target.invokeExact(a0, a1);
-            } catch (Throwable t) {
-                if (!exType.isInstance(t))  throw t;
-                return catcher.invokeExact(t, a0, a1);
-            }
-        }
-        private Object invoke_L3(Object a0, Object a1, Object a2) throws Throwable {
-            try {
-                return target.invokeExact(a0, a1, a2);
-            } catch (Throwable t) {
-                if (!exType.isInstance(t))  throw t;
-                return catcher.invokeExact(t, a0, a1, a2);
-            }
-        }
-        private Object invoke_L4(Object a0, Object a1, Object a2, Object a3) throws Throwable {
-            try {
-                return target.invokeExact(a0, a1, a2, a3);
-            } catch (Throwable t) {
-                if (!exType.isInstance(t))  throw t;
-                return catcher.invokeExact(t, a0, a1, a2, a3);
-            }
-        }
-        private Object invoke_L5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable {
-            try {
-                return target.invokeExact(a0, a1, a2, a3, a4);
-            } catch (Throwable t) {
-                if (!exType.isInstance(t))  throw t;
-                return catcher.invokeExact(t, a0, a1, a2, a3, a4);
-            }
-        }
-        private Object invoke_L6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable {
-            try {
-                return target.invokeExact(a0, a1, a2, a3, a4, a5);
-            } catch (Throwable t) {
-                if (!exType.isInstance(t))  throw t;
-                return catcher.invokeExact(t, a0, a1, a2, a3, a4, a5);
-            }
-        }
-        private Object invoke_L7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable {
-            try {
-                return target.invokeExact(a0, a1, a2, a3, a4, a5, a6);
-            } catch (Throwable t) {
-                if (!exType.isInstance(t))  throw t;
-                return catcher.invokeExact(t, a0, a1, a2, a3, a4, a5, a6);
-            }
-        }
-        private Object invoke_L8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable {
-            try {
-                return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7);
-            } catch (Throwable t) {
-                if (!exType.isInstance(t))  throw t;
-                return catcher.invokeExact(t, a0, a1, a2, a3, a4, a5, a6, a7);
-            }
-        }
-        static MethodHandle[] makeInvokes() {
-            ArrayList<MethodHandle> invokes = new ArrayList<MethodHandle>();
-            MethodHandles.Lookup lookup = IMPL_LOOKUP;
-            for (;;) {
-                int nargs = invokes.size();
-                String name = "invoke_L"+nargs;
-                MethodHandle invoke = null;
-                try {
-                    invoke = lookup.findVirtual(GuardWithCatch.class, name, MethodType.genericMethodType(nargs));
-                } catch (ReflectiveOperationException ex) {
-                }
-                if (invoke == null)  break;
-                invokes.add(invoke);
-            }
-            assert(invokes.size() == 9);  // current number of methods
-            return invokes.toArray(new MethodHandle[0]);
-        };
-        static final MethodHandle[] INVOKES = makeInvokes();
-        // For testing use this:
-        //static final MethodHandle[] INVOKES = Arrays.copyOf(makeInvokes(), 2);
-        static final MethodHandle VARARGS_INVOKE;
-        static {
-            try {
-                VARARGS_INVOKE = IMPL_LOOKUP.findVirtual(GuardWithCatch.class, "invoke_V", MethodType.genericMethodType(0, true));
-            } catch (ReflectiveOperationException ex) {
-                throw uncaughtException(ex);
-            }
-        }
-    }
-
-
-    static
-    MethodHandle makeGuardWithCatch(MethodHandle target,
-                                    Class<? extends Throwable> exType,
-                                    MethodHandle catcher) {
-        MethodType type = target.type();
-        MethodType ctype = catcher.type();
-        int nargs = type.parameterCount();
-        if (nargs < GuardWithCatch.INVOKES.length) {
-            MethodType gtype = type.generic();
-            MethodType gcatchType = gtype.insertParameterTypes(0, Throwable.class);
-            // Note: convertArguments(...2) avoids interface casts present in convertArguments(...0)
-            MethodHandle gtarget = convertArguments(target, gtype, type, 2);
-            MethodHandle gcatcher = convertArguments(catcher, gcatchType, ctype, 2);
-            MethodHandle gguard = new GuardWithCatch(gtarget, exType, gcatcher);
-            if (gtarget == null || gcatcher == null || gguard == null)  return null;
-            return convertArguments(gguard, type, gtype, 2);
-        } else {
-            MethodType gtype = MethodType.genericMethodType(0, true);
-            MethodType gcatchType = gtype.insertParameterTypes(0, Throwable.class);
-            MethodHandle gtarget = spreadArgumentsFromPos(target, gtype, 0);
-            catcher = catcher.asType(ctype.changeParameterType(0, Throwable.class));
-            MethodHandle gcatcher = spreadArgumentsFromPos(catcher, gcatchType, 1);
-            MethodHandle gguard = new GuardWithCatch(GuardWithCatch.VARARGS_INVOKE, gtarget, exType, gcatcher);
-            if (gtarget == null || gcatcher == null || gguard == null)  return null;
-            return collectArguments(gguard, type, 0, ValueConversions.varargsArray(nargs)).asType(type);
-        }
-    }
-
-    static
-    MethodHandle throwException(MethodType type) {
-        return AdapterMethodHandle.makeRetypeRaw(type, throwException());
-    }
-
-    static MethodHandle THROW_EXCEPTION;
-    static MethodHandle throwException() {
-        if (THROW_EXCEPTION != null)  return THROW_EXCEPTION;
-        try {
-            THROW_EXCEPTION
-            = IMPL_LOOKUP.findStatic(MethodHandleImpl.class, "throwException",
-                    MethodType.methodType(Empty.class, Throwable.class));
-        } catch (ReflectiveOperationException ex) {
-            throw new RuntimeException(ex);
-        }
-        return THROW_EXCEPTION;
-    }
-    static <T extends Throwable> Empty throwException(T t) throws T { throw t; }
-}
diff --git a/openjdk/java/lang/invoke/MethodHandleNatives.java b/openjdk/java/lang/invoke/MethodHandleNatives.java
deleted file mode 100644
index 4f7da894..00000000
--- a/openjdk/java/lang/invoke/MethodHandleNatives.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * Extensively modified for IKVM.NET by Jeroen Frijters
- * Copyright (C) 2011 Jeroen Frijters
- */
-
-package java.lang.invoke;
-
-import java.lang.invoke.MethodHandles.Lookup;
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Field;
-import static java.lang.invoke.MethodHandleNatives.Constants.*;
-import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
-
-/**
- * The JVM interface for the method handles package is all here.
- * This is an interface internal and private to an implemetantion of JSR 292.
- * <em>This class is not part of the JSR 292 standard.</em>
- * @author jrose
- */
-class MethodHandleNatives {
-
-    private MethodHandleNatives() { } // static only
-
-    /// MethodName support
-
-    static native void init(MemberName self, Object ref);
-    static native void expand(MemberName self);
-    static native void resolve(MemberName self, Class<?> caller);
-    static native int getMembers(Class<?> defc, String matchName, String matchSig,
-            int matchFlags, Class<?> caller, int skip, MemberName[] results);
-
-    /** Initialize a method type, once per form. */
-    static void init(MethodType self) { }
-
-    /** Fetch the name of the handled method, if available.
-     *  This routine is for debugging and reflection.
-     */
-    static MemberName getMethodName(MethodHandle self) {
-        throw new ikvm.internal.NotYetImplementedError();
-    }
-
-    static Object[] makeTarget(Class<?> defc, String name, String sig, int mods, Class<?> refc) {
-        return new Object[] { defc, name, sig, mods, refc };
-    }
-
-    /** Java copy of MethodHandlePushLimit in range 2..255. */
-    static final int JVM_PUSH_LIMIT;
-    /** JVM stack motion (in words) after one slot is pushed, usually -1.
-     */
-    static final int JVM_STACK_MOVE_UNIT;
-
-    /** Which conv-ops are implemented by the JVM? */
-    static final int CONV_OP_IMPLEMENTED_MASK;
-    /** Derived mode flag.  Only false on some old JVM implementations. */
-    static final boolean HAVE_RICOCHET_FRAMES;
-
-    static final int OP_ROT_ARGS_DOWN_LIMIT_BIAS;
-
-    static {
-        int k;
-        JVM_PUSH_LIMIT              = 3;
-        JVM_STACK_MOVE_UNIT         = 1;
-        k                           = 0;
-        CONV_OP_IMPLEMENTED_MASK    = (k != 0) ? k : DEFAULT_CONV_OP_IMPLEMENTED_MASK;
-        k                           = 0;
-        OP_ROT_ARGS_DOWN_LIMIT_BIAS = (k != 0) ? (byte)k : -1;
-        HAVE_RICOCHET_FRAMES        = (CONV_OP_IMPLEMENTED_MASK & (1<<OP_COLLECT_ARGS)) != 0;
-        //sun.reflect.Reflection.registerMethodsToFilter(MethodHandleImpl.class, "init");
-    }
-
-    // All compile-time constants go here.
-    // There is an opportunity to check them against the JVM's idea of them.
-    static class Constants {
-        Constants() { } // static only
-        // MethodHandleImpl
-        static final int // for getConstant
-                GC_JVM_PUSH_LIMIT = 0,
-                GC_JVM_STACK_MOVE_UNIT = 1,
-                GC_CONV_OP_IMPLEMENTED_MASK = 2,
-                GC_OP_ROT_ARGS_DOWN_LIMIT_BIAS = 3;
-        static final int
-                ETF_HANDLE_OR_METHOD_NAME = 0, // all available data (immediate MH or method)
-                ETF_DIRECT_HANDLE         = 1, // ultimate method handle (will be a DMH, may be self)
-                ETF_METHOD_NAME           = 2, // ultimate method as MemberName
-                ETF_REFLECT_METHOD        = 3; // ultimate method as java.lang.reflect object (sans refClass)
-
-        // MemberName
-        // The JVM uses values of -2 and above for vtable indexes.
-        // Field values are simple positive offsets.
-        // Ref: src/share/vm/oops/methodOop.hpp
-        // This value is negative enough to avoid such numbers,
-        // but not too negative.
-        static final int
-                MN_IS_METHOD           = 0x00010000, // method (not constructor)
-                MN_IS_CONSTRUCTOR      = 0x00020000, // constructor
-                MN_IS_FIELD            = 0x00040000, // field
-                MN_IS_TYPE             = 0x00080000, // nested type
-                MN_SEARCH_SUPERCLASSES = 0x00100000, // for MHN.getMembers
-                MN_SEARCH_INTERFACES   = 0x00200000, // for MHN.getMembers
-                VM_INDEX_UNINITIALIZED = -99;
-
-        // BoundMethodHandle
-        /** Constants for decoding the vmargslot field, which contains 2 values. */
-        static final int
-            ARG_SLOT_PUSH_SHIFT = 16,
-            ARG_SLOT_MASK = (1<<ARG_SLOT_PUSH_SHIFT)-1;
-
-        // AdapterMethodHandle
-        /** Conversions recognized by the JVM.
-         *  They must align with the constants in java.lang.invoke.AdapterMethodHandle,
-         *  in the JVM file hotspot/src/share/vm/classfile/javaClasses.hpp.
-         */
-        static final int
-            OP_RETYPE_ONLY   = 0x0, // no argument changes; straight retype
-            OP_RETYPE_RAW    = 0x1, // straight retype, trusted (void->int, Object->T)
-            OP_CHECK_CAST    = 0x2, // ref-to-ref conversion; requires a Class argument
-            OP_PRIM_TO_PRIM  = 0x3, // converts from one primitive to another
-            OP_REF_TO_PRIM   = 0x4, // unboxes a wrapper to produce a primitive
-            OP_PRIM_TO_REF   = 0x5, // boxes a primitive into a wrapper
-            OP_SWAP_ARGS     = 0x6, // swap arguments (vminfo is 2nd arg)
-            OP_ROT_ARGS      = 0x7, // rotate arguments (vminfo is displaced arg)
-            OP_DUP_ARGS      = 0x8, // duplicates one or more arguments (at TOS)
-            OP_DROP_ARGS     = 0x9, // remove one or more argument slots
-            OP_COLLECT_ARGS  = 0xA, // combine arguments using an auxiliary function
-            OP_SPREAD_ARGS   = 0xB, // expand in place a varargs array (of known size)
-            OP_FOLD_ARGS     = 0xC, // combine but do not remove arguments; prepend result
-            //OP_UNUSED_13   = 0xD, // unused code, perhaps for reified argument lists
-            CONV_OP_LIMIT    = 0xE; // limit of CONV_OP enumeration
-        /** Shift and mask values for decoding the AMH.conversion field.
-         *  These numbers are shared with the JVM for creating AMHs.
-         */
-        static final int
-            CONV_OP_MASK     = 0xF00, // this nybble contains the conversion op field
-            CONV_TYPE_MASK   = 0x0F,  // fits T_ADDRESS and below
-            CONV_VMINFO_MASK = 0x0FF, // LSB is reserved for JVM use
-            CONV_VMINFO_SHIFT     =  0, // position of bits in CONV_VMINFO_MASK
-            CONV_OP_SHIFT         =  8, // position of bits in CONV_OP_MASK
-            CONV_DEST_TYPE_SHIFT  = 12, // byte 2 has the adapter BasicType (if needed)
-            CONV_SRC_TYPE_SHIFT   = 16, // byte 2 has the source BasicType (if needed)
-            CONV_STACK_MOVE_SHIFT = 20, // high 12 bits give signed SP change
-            CONV_STACK_MOVE_MASK  = (1 << (32 - CONV_STACK_MOVE_SHIFT)) - 1;
-
-        /** Which conv-ops are implemented by the JVM? */
-        static final int DEFAULT_CONV_OP_IMPLEMENTED_MASK =
-                // Value to use if the corresponding JVM query fails.
-                ((1<<OP_RETYPE_ONLY)
-                |(1<<OP_RETYPE_RAW)
-                |(1<<OP_CHECK_CAST)
-                |(1<<OP_PRIM_TO_PRIM)
-                |(1<<OP_REF_TO_PRIM)
-                |(1<<OP_SWAP_ARGS)
-                |(1<<OP_ROT_ARGS)
-                |(1<<OP_DUP_ARGS)
-                |(1<<OP_DROP_ARGS)
-                //|(1<<OP_SPREAD_ARGS)
-                );
-
-        /**
-         * Basic types as encoded in the JVM.  These code values are not
-         * intended for use outside this class.  They are used as part of
-         * a private interface between the JVM and this class.
-         */
-        static final int
-            T_BOOLEAN  =  4,
-            T_CHAR     =  5,
-            T_FLOAT    =  6,
-            T_DOUBLE   =  7,
-            T_BYTE     =  8,
-            T_SHORT    =  9,
-            T_INT      = 10,
-            T_LONG     = 11,
-            T_OBJECT   = 12,
-            //T_ARRAY    = 13
-            T_VOID     = 14,
-            //T_ADDRESS  = 15
-            T_ILLEGAL  = 99;
-
-        /**
-         * Constant pool reference-kind codes, as used by CONSTANT_MethodHandle CP entries.
-         */
-        static final int
-            REF_getField                = 1,
-            REF_getStatic               = 2,
-            REF_putField                = 3,
-            REF_putStatic               = 4,
-            REF_invokeVirtual           = 5,
-            REF_invokeStatic            = 6,
-            REF_invokeSpecial           = 7,
-            REF_newInvokeSpecial        = 8,
-            REF_invokeInterface         = 9;
-    }
-
-    /**
-     * This assertion marks code which was written before ricochet frames were implemented.
-     * Such code will go away when the ports catch up.
-     */
-    static boolean workaroundWithoutRicochetFrames() {
-        assert(!HAVE_RICOCHET_FRAMES) : "this code should not be executed if `-XX:+UseRicochetFrames is enabled";
-        return true;
-    }
-}
diff --git a/openjdk/java/lang/invoke/MethodHandles.java b/openjdk/java/lang/invoke/MethodHandles.java
deleted file mode 100644
index 6f0db408..00000000
--- a/openjdk/java/lang/invoke/MethodHandles.java
+++ /dev/null
@@ -1,2273 +0,0 @@
-/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.invoke;
-
-import java.lang.reflect.*;
-import sun.invoke.WrapperInstance;
-import sun.invoke.util.ValueConversions;
-import sun.invoke.util.VerifyAccess;
-import sun.invoke.util.Wrapper;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Arrays;
-import sun.reflect.CallerSensitive;
-import sun.reflect.Reflection;
-import static java.lang.invoke.MethodHandleStatics.*;
-import static java.lang.invoke.MethodHandleNatives.Constants.*;
-
-/**
- * This class consists exclusively of static methods that operate on or return
- * method handles. They fall into several categories:
- * <ul>
- * <li>Lookup methods which help create method handles for methods and fields.
- * <li>Combinator methods, which combine or transform pre-existing method handles into new ones.
- * <li>Other factory methods to create method handles that emulate other common JVM operations or control flow patterns.
- * <li>Wrapper methods which can convert between method handles and interface types.
- * </ul>
- * <p>
- * @author John Rose, JSR 292 EG
- */
-public class MethodHandles {
-
-    private MethodHandles() { }  // do not instantiate
-
-    private static final MemberName.Factory IMPL_NAMES = MemberName.getFactory();
-    static { MethodHandleImpl.initStatics(); }
-    // See IMPL_LOOKUP below.
-
-    //// Method handle creation from ordinary methods.
-
-    /**
-     * Returns a {@link Lookup lookup object} on the caller,
-     * which has the capability to access any method handle that the caller has access to,
-     * including direct method handles to private fields and methods.
-     * This lookup object is a <em>capability</em> which may be delegated to trusted agents.
-     * Do not store it in place where untrusted code can access it.
-     */
-    @CallerSensitive
-    public static Lookup lookup() {
-        return new Lookup(Reflection.getCallerClass());
-    }
-
-    /**
-     * Returns a {@link Lookup lookup object} which is trusted minimally.
-     * It can only be used to create method handles to
-     * publicly accessible fields and methods.
-     * <p>
-     * As a matter of pure convention, the {@linkplain Lookup#lookupClass lookup class}
-     * of this lookup object will be {@link java.lang.Object}.
-     * <p>
-     * The lookup class can be changed to any other class {@code C} using an expression of the form
-     * {@linkplain Lookup#in <code>publicLookup().in(C.class)</code>}.
-     * Since all classes have equal access to public names,
-     * such a change would confer no new access rights.
-     */
-    public static Lookup publicLookup() {
-        return Lookup.PUBLIC_LOOKUP;
-    }
-
-    /**
-     * A <em>lookup object</em> is a factory for creating method handles,
-     * when the creation requires access checking.
-     * Method handles do not perform
-     * access checks when they are called, but rather when they are created.
-     * Therefore, method handle access
-     * restrictions must be enforced when a method handle is created.
-     * The caller class against which those restrictions are enforced
-     * is known as the {@linkplain #lookupClass lookup class}.
-     * <p>
-     * A lookup class which needs to create method handles will call
-     * {@link MethodHandles#lookup MethodHandles.lookup} to create a factory for itself.
-     * When the {@code Lookup} factory object is created, the identity of the lookup class is
-     * determined, and securely stored in the {@code Lookup} object.
-     * The lookup class (or its delegates) may then use factory methods
-     * on the {@code Lookup} object to create method handles for access-checked members.
-     * This includes all methods, constructors, and fields which are allowed to the lookup class,
-     * even private ones.
-     * <p>
-     * The factory methods on a {@code Lookup} object correspond to all major
-     * use cases for methods, constructors, and fields.
-     * Here is a summary of the correspondence between these factory methods and
-     * the behavior the resulting method handles:
-     * <code>
-     * <table border=1 cellpadding=5 summary="lookup method behaviors">
-     * <tr><th>lookup expression</th><th>member</th><th>behavior</th></tr>
-     * <tr>
-     *     <td>{@linkplain java.lang.invoke.MethodHandles.Lookup#findGetter lookup.findGetter(C.class,"f",FT.class)}</td>
-     *     <td>FT f;</td><td>(T) this.f;</td>
-     * </tr>
-     * <tr>
-     *     <td>{@linkplain java.lang.invoke.MethodHandles.Lookup#findStaticGetter lookup.findStaticGetter(C.class,"f",FT.class)}</td>
-     *     <td>static<br>FT f;</td><td>(T) C.f;</td>
-     * </tr>
-     * <tr>
-     *     <td>{@linkplain java.lang.invoke.MethodHandles.Lookup#findSetter lookup.findSetter(C.class,"f",FT.class)}</td>
-     *     <td>FT f;</td><td>this.f = x;</td>
-     * </tr>
-     * <tr>
-     *     <td>{@linkplain java.lang.invoke.MethodHandles.Lookup#findStaticSetter lookup.findStaticSetter(C.class,"f",FT.class)}</td>
-     *     <td>static<br>FT f;</td><td>C.f = arg;</td>
-     * </tr>
-     * <tr>
-     *     <td>{@linkplain java.lang.invoke.MethodHandles.Lookup#findVirtual lookup.findVirtual(C.class,"m",MT)}</td>
-     *     <td>T m(A*);</td><td>(T) this.m(arg*);</td>
-     * </tr>
-     * <tr>
-     *     <td>{@linkplain java.lang.invoke.MethodHandles.Lookup#findStatic lookup.findStatic(C.class,"m",MT)}</td>
-     *     <td>static<br>T m(A*);</td><td>(T) C.m(arg*);</td>
-     * </tr>
-     * <tr>
-     *     <td>{@linkplain java.lang.invoke.MethodHandles.Lookup#findSpecial lookup.findSpecial(C.class,"m",MT,this.class)}</td>
-     *     <td>T m(A*);</td><td>(T) super.m(arg*);</td>
-     * </tr>
-     * <tr>
-     *     <td>{@linkplain java.lang.invoke.MethodHandles.Lookup#findConstructor lookup.findConstructor(C.class,MT)}</td>
-     *     <td>C(A*);</td><td>(T) new C(arg*);</td>
-     * </tr>
-     * <tr>
-     *     <td>{@linkplain java.lang.invoke.MethodHandles.Lookup#unreflectGetter lookup.unreflectGetter(aField)}</td>
-     *     <td>(static)?<br>FT f;</td><td>(FT) aField.get(thisOrNull);</td>
-     * </tr>
-     * <tr>
-     *     <td>{@linkplain java.lang.invoke.MethodHandles.Lookup#unreflectSetter lookup.unreflectSetter(aField)}</td>
-     *     <td>(static)?<br>FT f;</td><td>aField.set(thisOrNull, arg);</td>
-     * </tr>
-     * <tr>
-     *     <td>{@linkplain java.lang.invoke.MethodHandles.Lookup#unreflect lookup.unreflect(aMethod)}</td>
-     *     <td>(static)?<br>T m(A*);</td><td>(T) aMethod.invoke(thisOrNull, arg*);</td>
-     * </tr>
-     * <tr>
-     *     <td>{@linkplain java.lang.invoke.MethodHandles.Lookup#unreflectConstructor lookup.unreflectConstructor(aConstructor)}</td>
-     *     <td>C(A*);</td><td>(C) aConstructor.newInstance(arg*);</td>
-     * </tr>
-     * <tr>
-     *     <td>{@linkplain java.lang.invoke.MethodHandles.Lookup#unreflect lookup.unreflect(aMethod)}</td>
-     *     <td>(static)?<br>T m(A*);</td><td>(T) aMethod.invoke(thisOrNull, arg*);</td>
-     * </tr>
-     * </table>
-     * </code>
-     * Here, the type {@code C} is the class or interface being searched for a member,
-     * documented as a parameter named {@code refc} in the lookup methods.
-     * The method or constructor type {@code MT} is composed from the return type {@code T}
-     * and the sequence of argument types {@code A*}.
-     * Both {@code MT} and the field type {@code FT} are documented as a parameter named {@code type}.
-     * The formal parameter {@code this} stands for the self-reference of type {@code C};
-     * if it is present, it is always the leading argument to the method handle invocation.
-     * The name {@code arg} stands for all the other method handle arguments.
-     * In the code examples for the Core Reflection API, the name {@code thisOrNull}
-     * stands for a null reference if the accessed method or field is static,
-     * and {@code this} otherwise.
-     * The names {@code aMethod}, {@code aField}, and {@code aConstructor} stand
-     * for reflective objects corresponding to the given members.
-     * <p>
-     * In cases where the given member is of variable arity (i.e., a method or constructor)
-     * the returned method handle will also be of {@linkplain MethodHandle#asVarargsCollector variable arity}.
-     * In all other cases, the returned method handle will be of fixed arity.
-     * <p>
-     * The equivalence between looked-up method handles and underlying
-     * class members can break down in a few ways:
-     * <ul>
-     * <li>If {@code C} is not symbolically accessible from the lookup class's loader,
-     * the lookup can still succeed, even when there is no equivalent
-     * Java expression or bytecoded constant.
-     * <li>Likewise, if {@code T} or {@code MT}
-     * is not symbolically accessible from the lookup class's loader,
-     * the lookup can still succeed.
-     * For example, lookups for {@code MethodHandle.invokeExact} and
-     * {@code MethodHandle.invoke} will always succeed, regardless of requested type.
-     * <li>If there is a security manager installed, it can forbid the lookup
-     * on various grounds (<a href="#secmgr">see below</a>).
-     * By contrast, the {@code ldc} instruction is not subject to
-     * security manager checks.
-     * </ul>
-     *
-     * <h3><a name="access"></a>Access checking</h3>
-     * Access checks are applied in the factory methods of {@code Lookup},
-     * when a method handle is created.
-     * This is a key difference from the Core Reflection API, since
-     * {@link java.lang.reflect.Method#invoke java.lang.reflect.Method.invoke}
-     * performs access checking against every caller, on every call.
-     * <p>
-     * All access checks start from a {@code Lookup} object, which
-     * compares its recorded lookup class against all requests to
-     * create method handles.
-     * A single {@code Lookup} object can be used to create any number
-     * of access-checked method handles, all checked against a single
-     * lookup class.
-     * <p>
-     * A {@code Lookup} object can be shared with other trusted code,
-     * such as a metaobject protocol.
-     * A shared {@code Lookup} object delegates the capability
-     * to create method handles on private members of the lookup class.
-     * Even if privileged code uses the {@code Lookup} object,
-     * the access checking is confined to the privileges of the
-     * original lookup class.
-     * <p>
-     * A lookup can fail, because
-     * the containing class is not accessible to the lookup class, or
-     * because the desired class member is missing, or because the
-     * desired class member is not accessible to the lookup class.
-     * In any of these cases, a {@code ReflectiveOperationException} will be
-     * thrown from the attempted lookup.  The exact class will be one of
-     * the following:
-     * <ul>
-     * <li>NoSuchMethodException &mdash; if a method is requested but does not exist
-     * <li>NoSuchFieldException &mdash; if a field is requested but does not exist
-     * <li>IllegalAccessException &mdash; if the member exists but an access check fails
-     * </ul>
-     * <p>
-     * In general, the conditions under which a method handle may be
-     * looked up for a method {@code M} are exactly equivalent to the conditions
-     * under which the lookup class could have compiled and resolved a call to {@code M}.
-     * And the effect of invoking the method handle resulting from the lookup
-     * is exactly equivalent to executing the compiled and resolved call to {@code M}.
-     * The same point is true of fields and constructors.
-     * <p>
-     * In some cases, access between nested classes is obtained by the Java compiler by creating
-     * an wrapper method to access a private method of another class
-     * in the same top-level declaration.
-     * For example, a nested class {@code C.D}
-     * can access private members within other related classes such as
-     * {@code C}, {@code C.D.E}, or {@code C.B},
-     * but the Java compiler may need to generate wrapper methods in
-     * those related classes.  In such cases, a {@code Lookup} object on
-     * {@code C.E} would be unable to those private members.
-     * A workaround for this limitation is the {@link Lookup#in Lookup.in} method,
-     * which can transform a lookup on {@code C.E} into one on any of those other
-     * classes, without special elevation of privilege.
-     * <p>
-     * Although bytecode instructions can only refer to classes in
-     * a related class loader, this API can search for methods in any
-     * class, as long as a reference to its {@code Class} object is
-     * available.  Such cross-loader references are also possible with the
-     * Core Reflection API, and are impossible to bytecode instructions
-     * such as {@code invokestatic} or {@code getfield}.
-     * There is a {@linkplain java.lang.SecurityManager security manager API}
-     * to allow applications to check such cross-loader references.
-     * These checks apply to both the {@code MethodHandles.Lookup} API
-     * and the Core Reflection API
-     * (as found on {@link java.lang.Class Class}).
-     * <p>
-     * Access checks only apply to named and reflected methods,
-     * constructors, and fields.
-     * Other method handle creation methods, such as
-     * {@link MethodHandle#asType MethodHandle.asType},
-     * do not require any access checks, and are done
-     * with static methods of {@link MethodHandles},
-     * independently of any {@code Lookup} object.
-     *
-     * <h3>Security manager interactions</h3>
-     * <a name="secmgr"></a>
-     * If a security manager is present, member lookups are subject to
-     * additional checks.
-     * From one to four calls are made to the security manager.
-     * Any of these calls can refuse access by throwing a
-     * {@link java.lang.SecurityException SecurityException}.
-     * Define {@code smgr} as the security manager,
-     * {@code refc} as the containing class in which the member
-     * is being sought, and {@code defc} as the class in which the
-     * member is actually defined.
-     * The calls are made according to the following rules:
-     * <ul>
-     * <li>In all cases, {@link SecurityManager#checkMemberAccess
-     *     smgr.checkMemberAccess(refc, Member.PUBLIC)} is called.
-     * <li>If the class loader of the lookup class is not
-     *     the same as or an ancestor of the class loader of {@code refc},
-     *     then {@link SecurityManager#checkPackageAccess
-     *     smgr.checkPackageAccess(refcPkg)} is called,
-     *     where {@code refcPkg} is the package of {@code refc}.
-     * <li>If the retrieved member is not public,
-     *     {@link SecurityManager#checkMemberAccess
-     *     smgr.checkMemberAccess(defc, Member.DECLARED)} is called.
-     *     (Note that {@code defc} might be the same as {@code refc}.)
-     *     The default implementation of this security manager method
-     *     inspects the stack to determine the original caller of
-     *     the reflective request (such as {@code findStatic}),
-     *     and performs additional permission checks if the
-     *     class loader of {@code defc} differs from the class
-     *     loader of the class from which the reflective request came.
-     * <li>If the retrieved member is not public,
-     *     and if {@code defc} and {@code refc} are in different class loaders,
-     *     and if the class loader of the lookup class is not
-     *     the same as or an ancestor of the class loader of {@code defc},
-     *     then {@link SecurityManager#checkPackageAccess
-     *     smgr.checkPackageAccess(defcPkg)} is called,
-     *     where {@code defcPkg} is the package of {@code defc}.
-     * </ul>
-     */
-    public static final
-    class Lookup {
-        /** The class on behalf of whom the lookup is being performed. */
-        private final Class<?> lookupClass;
-
-        /** The allowed sorts of members which may be looked up (PUBLIC, etc.). */
-        private final int allowedModes;
-
-        // [IKVM] when dynamically linking method handle constants, we don't want a security manager check
-        private final boolean noSecurityCheck;
-
-        /** A single-bit mask representing {@code public} access,
-         *  which may contribute to the result of {@link #lookupModes lookupModes}.
-         *  The value, {@code 0x01}, happens to be the same as the value of the
-         *  {@code public} {@linkplain java.lang.reflect.Modifier#PUBLIC modifier bit}.
-         */
-        public static final int PUBLIC = Modifier.PUBLIC;
-
-        /** A single-bit mask representing {@code private} access,
-         *  which may contribute to the result of {@link #lookupModes lookupModes}.
-         *  The value, {@code 0x02}, happens to be the same as the value of the
-         *  {@code private} {@linkplain java.lang.reflect.Modifier#PRIVATE modifier bit}.
-         */
-        public static final int PRIVATE = Modifier.PRIVATE;
-
-        /** A single-bit mask representing {@code protected} access,
-         *  which may contribute to the result of {@link #lookupModes lookupModes}.
-         *  The value, {@code 0x04}, happens to be the same as the value of the
-         *  {@code protected} {@linkplain java.lang.reflect.Modifier#PROTECTED modifier bit}.
-         */
-        public static final int PROTECTED = Modifier.PROTECTED;
-
-        /** A single-bit mask representing {@code package} access (default access),
-         *  which may contribute to the result of {@link #lookupModes lookupModes}.
-         *  The value is {@code 0x08}, which does not correspond meaningfully to
-         *  any particular {@linkplain java.lang.reflect.Modifier modifier bit}.
-         */
-        public static final int PACKAGE = Modifier.STATIC;
-
-        private static final int ALL_MODES = (PUBLIC | PRIVATE | PROTECTED | PACKAGE);
-        private static final int TRUSTED   = -1;
-
-        private static int fixmods(int mods) {
-            mods &= (ALL_MODES - PACKAGE);
-            return (mods != 0) ? mods : PACKAGE;
-        }
-
-        /** Tells which class is performing the lookup.  It is this class against
-         *  which checks are performed for visibility and access permissions.
-         *  <p>
-         *  The class implies a maximum level of access permission,
-         *  but the permissions may be additionally limited by the bitmask
-         *  {@link #lookupModes lookupModes}, which controls whether non-public members
-         *  can be accessed.
-         */
-        public Class<?> lookupClass() {
-            return lookupClass;
-        }
-
-        // This is just for calling out to MethodHandleImpl.
-        private Class<?> lookupClassOrNull() {
-            return (allowedModes == TRUSTED) ? null : lookupClass;
-        }
-
-        /** Tells which access-protection classes of members this lookup object can produce.
-         *  The result is a bit-mask of the bits
-         *  {@linkplain #PUBLIC PUBLIC (0x01)},
-         *  {@linkplain #PRIVATE PRIVATE (0x02)},
-         *  {@linkplain #PROTECTED PROTECTED (0x04)},
-         *  and {@linkplain #PACKAGE PACKAGE (0x08)}.
-         *  <p>
-         *  A freshly-created lookup object
-         *  on the {@linkplain java.lang.invoke.MethodHandles#lookup() caller's class}
-         *  has all possible bits set, since the caller class can access all its own members.
-         *  A lookup object on a new lookup class
-         *  {@linkplain java.lang.invoke.MethodHandles.Lookup#in created from a previous lookup object}
-         *  may have some mode bits set to zero.
-         *  The purpose of this is to restrict access via the new lookup object,
-         *  so that it can access only names which can be reached by the original
-         *  lookup object, and also by the new lookup class.
-         */
-        public int lookupModes() {
-            return allowedModes & ALL_MODES;
-        }
-
-        /** Embody the current class (the lookupClass) as a lookup class
-         * for method handle creation.
-         * Must be called by from a method in this package,
-         * which in turn is called by a method not in this package.
-         * <p>
-         * Also, don't make it private, lest javac interpose
-         * an access$N method.
-         */
-        Lookup(Class<?> lookupClass) {
-            this(lookupClass, ALL_MODES);
-            checkUnprivilegedlookupClass(lookupClass);
-        }
-
-        private Lookup(Class<?> lookupClass, int allowedModes) {
-            this(lookupClass, allowedModes, false);
-        }
-
-        Lookup(Class<?> lookupClass, int allowedModes, boolean noSecurityCheck) {
-            this.lookupClass = lookupClass;
-            this.allowedModes = allowedModes;
-            this.noSecurityCheck = noSecurityCheck;
-        }
-
-        /**
-         * Creates a lookup on the specified new lookup class.
-         * The resulting object will report the specified
-         * class as its own {@link #lookupClass lookupClass}.
-         * <p>
-         * However, the resulting {@code Lookup} object is guaranteed
-         * to have no more access capabilities than the original.
-         * In particular, access capabilities can be lost as follows:<ul>
-         * <li>If the new lookup class differs from the old one,
-         * protected members will not be accessible by virtue of inheritance.
-         * (Protected members may continue to be accessible because of package sharing.)
-         * <li>If the new lookup class is in a different package
-         * than the old one, protected and default (package) members will not be accessible.
-         * <li>If the new lookup class is not within the same package member
-         * as the old one, private members will not be accessible.
-         * <li>If the new lookup class is not accessible to the old lookup class,
-         * then no members, not even public members, will be accessible.
-         * (In all other cases, public members will continue to be accessible.)
-         * </ul>
-         *
-         * @param requestedLookupClass the desired lookup class for the new lookup object
-         * @return a lookup object which reports the desired lookup class
-         * @throws NullPointerException if the argument is null
-         */
-        public Lookup in(Class<?> requestedLookupClass) {
-            requestedLookupClass.getClass();  // null check
-            if (allowedModes == TRUSTED)  // IMPL_LOOKUP can make any lookup at all
-                return new Lookup(requestedLookupClass, ALL_MODES);
-            if (requestedLookupClass == this.lookupClass)
-                return this;  // keep same capabilities
-            int newModes = (allowedModes & (ALL_MODES & ~PROTECTED));
-            if ((newModes & PACKAGE) != 0
-                && !VerifyAccess.isSamePackage(this.lookupClass, requestedLookupClass)) {
-                newModes &= ~(PACKAGE|PRIVATE);
-            }
-            // Allow nestmate lookups to be created without special privilege:
-            if ((newModes & PRIVATE) != 0
-                && !VerifyAccess.isSamePackageMember(this.lookupClass, requestedLookupClass)) {
-                newModes &= ~PRIVATE;
-            }
-            if ((newModes & PUBLIC) != 0
-                && !VerifyAccess.isClassAccessible(requestedLookupClass, this.lookupClass, allowedModes)) {
-                // The requested class it not accessible from the lookup class.
-                // No permissions.
-                newModes = 0;
-            }
-            checkUnprivilegedlookupClass(requestedLookupClass);
-            return new Lookup(requestedLookupClass, newModes);
-        }
-
-        // Make sure outer class is initialized first.
-        static { IMPL_NAMES.getClass(); }
-
-        /** Version of lookup which is trusted minimally.
-         *  It can only be used to create method handles to
-         *  publicly accessible members.
-         */
-        static final Lookup PUBLIC_LOOKUP = new Lookup(Object.class, PUBLIC);
-
-        /** Package-private version of lookup which is trusted. */
-        static final Lookup IMPL_LOOKUP = new Lookup(Object.class, TRUSTED);
-
-        private static void checkUnprivilegedlookupClass(Class<?> lookupClass) {
-            String name = lookupClass.getName();
-            if (name.startsWith("java.lang.invoke."))
-                throw newIllegalArgumentException("illegal lookupClass: "+lookupClass);
-        }
-
-        /**
-         * Displays the name of the class from which lookups are to be made.
-         * (The name is the one reported by {@link java.lang.Class#getName() Class.getName}.)
-         * If there are restrictions on the access permitted to this lookup,
-         * this is indicated by adding a suffix to the class name, consisting
-         * of a slash and a keyword.  The keyword represents the strongest
-         * allowed access, and is chosen as follows:
-         * <ul>
-         * <li>If no access is allowed, the suffix is "/noaccess".
-         * <li>If only public access is allowed, the suffix is "/public".
-         * <li>If only public and package access are allowed, the suffix is "/package".
-         * <li>If only public, package, and private access are allowed, the suffix is "/private".
-         * </ul>
-         * If none of the above cases apply, it is the case that full
-         * access (public, package, private, and protected) is allowed.
-         * In this case, no suffix is added.
-         * This is true only of an object obtained originally from
-         * {@link java.lang.invoke.MethodHandles#lookup MethodHandles.lookup}.
-         * Objects created by {@link java.lang.invoke.MethodHandles.Lookup#in Lookup.in}
-         * always have restricted access, and will display a suffix.
-         * <p>
-         * (It may seem strange that protected access should be
-         * stronger than private access.  Viewed independently from
-         * package access, protected access is the first to be lost,
-         * because it requires a direct subclass relationship between
-         * caller and callee.)
-         * @see #in
-         */
-        @Override
-        public String toString() {
-            String cname = lookupClass.getName();
-            switch (allowedModes) {
-            case 0:  // no privileges
-                return cname + "/noaccess";
-            case PUBLIC:
-                return cname + "/public";
-            case PUBLIC|PACKAGE:
-                return cname + "/package";
-            case ALL_MODES & ~PROTECTED:
-                return cname + "/private";
-            case ALL_MODES:
-                return cname;
-            case TRUSTED:
-                return "/trusted";  // internal only; not exported
-            default:  // Should not happen, but it's a bitfield...
-                cname = cname + "/" + Integer.toHexString(allowedModes);
-                assert(false) : cname;
-                return cname;
-            }
-        }
-
-        /* Obtain the external caller class, when called from Lookup.<init> or a first-level subroutine. */
-        private static Class<?> getCallerClassAtEntryPoint(boolean inSubroutine) {
-            final int CALLER_DEPTH = 4;
-            //  Stack for the constructor entry point (inSubroutine=false):
-            // 0: Reflection.getCC, 1: getCallerClassAtEntryPoint,
-            // 2: Lookup.<init>, 3: MethodHandles.*, 4: caller
-            //  The stack is slightly different for a subroutine of a Lookup.find* method:
-            // 2: Lookup.*, 3: Lookup.find*.*, 4: caller
-            // Note:  This should be the only use of getCallerClass in this file.
-            assert(Reflection.getCallerClass(CALLER_DEPTH-2) == Lookup.class);
-            assert(Reflection.getCallerClass(CALLER_DEPTH-1) == (inSubroutine ? Lookup.class : MethodHandles.class));
-            return Reflection.getCallerClass(CALLER_DEPTH);
-        }
-
-        /**
-         * Produces a method handle for a static method.
-         * The type of the method handle will be that of the method.
-         * (Since static methods do not take receivers, there is no
-         * additional receiver argument inserted into the method handle type,
-         * as there would be with {@link #findVirtual findVirtual} or {@link #findSpecial findSpecial}.)
-         * The method and all its argument types must be accessible to the lookup class.
-         * If the method's class has not yet been initialized, that is done
-         * immediately, before the method handle is returned.
-         * <p>
-         * The returned method handle will have
-         * {@linkplain MethodHandle#asVarargsCollector variable arity} if and only if
-         * the method's variable arity modifier bit ({@code 0x0080}) is set.
-         * @param refc the class from which the method is accessed
-         * @param name the name of the method
-         * @param type the type of the method
-         * @return the desired method handle
-         * @throws NoSuchMethodException if the method does not exist
-         * @throws IllegalAccessException if access checking fails,
-         *                                or if the method is not {@code static},
-         *                                or if the method's variable arity modifier bit
-         *                                is set and {@code asVarargsCollector} fails
-         * @exception SecurityException if a security manager is present and it
-         *                              <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
-         * @throws NullPointerException if any argument is null
-         */
-        public
-        MethodHandle findStatic(Class<?> refc, String name, MethodType type) throws NoSuchMethodException, IllegalAccessException {
-            MemberName method = resolveOrFail(refc, name, type, true);
-            checkSecurityManager(refc, method);  // stack walk magic: do not refactor
-            return accessStatic(refc, method);
-        }
-        private
-        MethodHandle accessStatic(Class<?> refc, MemberName method) throws IllegalAccessException {
-            checkMethod(refc, method, true);
-            return MethodHandleImpl.findMethod(method, false, lookupClassOrNull());
-        }
-        private
-        MethodHandle resolveStatic(Class<?> refc, String name, MethodType type) throws NoSuchMethodException, IllegalAccessException {
-            MemberName method = resolveOrFail(refc, name, type, true);
-            return accessStatic(refc, method);
-        }
-
-        /**
-         * Produces a method handle for a virtual method.
-         * The type of the method handle will be that of the method,
-         * with the receiver type (usually {@code refc}) prepended.
-         * The method and all its argument types must be accessible to the lookup class.
-         * <p>
-         * When called, the handle will treat the first argument as a receiver
-         * and dispatch on the receiver's type to determine which method
-         * implementation to enter.
-         * (The dispatching action is identical with that performed by an
-         * {@code invokevirtual} or {@code invokeinterface} instruction.)
-         * <p>
-         * The returned method handle will have
-         * {@linkplain MethodHandle#asVarargsCollector variable arity} if and only if
-         * the method's variable arity modifier bit ({@code 0x0080}) is set.
-         * <p>
-         * Because of the general equivalence between {@code invokevirtual}
-         * instructions and method handles produced by {@code findVirtual},
-         * if the class is {@code MethodHandle} and the name string is
-         * {@code invokeExact} or {@code invoke}, the resulting
-         * method handle is equivalent to one produced by
-         * {@link java.lang.invoke.MethodHandles#exactInvoker MethodHandles.exactInvoker} or
-         * {@link java.lang.invoke.MethodHandles#invoker MethodHandles.invoker}
-         * with the same {@code type} argument.
-         *
-         * @param refc the class or interface from which the method is accessed
-         * @param name the name of the method
-         * @param type the type of the method, with the receiver argument omitted
-         * @return the desired method handle
-         * @throws NoSuchMethodException if the method does not exist
-         * @throws IllegalAccessException if access checking fails,
-         *                                or if the method is {@code static}
-         *                                or if the method's variable arity modifier bit
-         *                                is set and {@code asVarargsCollector} fails
-         * @exception SecurityException if a security manager is present and it
-         *                              <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
-         * @throws NullPointerException if any argument is null
-         */
-        public MethodHandle findVirtual(Class<?> refc, String name, MethodType type) throws NoSuchMethodException, IllegalAccessException {
-            MemberName method = resolveOrFail(refc, name, type, false);
-            checkSecurityManager(refc, method);  // stack walk magic: do not refactor
-            return accessVirtual(refc, method);
-        }
-        private MethodHandle resolveVirtual(Class<?> refc, String name, MethodType type) throws NoSuchMethodException, IllegalAccessException {
-            MemberName method = resolveOrFail(refc, name, type, false);
-            return accessVirtual(refc, method);
-        }
-        private MethodHandle accessVirtual(Class<?> refc, MemberName method) throws IllegalAccessException {
-            checkMethod(refc, method, false);
-            MethodHandle mh = MethodHandleImpl.findMethod(method, true, lookupClassOrNull());
-            return restrictProtectedReceiver(method, mh);
-        }
-
-        /**
-         * Produces a method handle which creates an object and initializes it, using
-         * the constructor of the specified type.
-         * The parameter types of the method handle will be those of the constructor,
-         * while the return type will be a reference to the constructor's class.
-         * The constructor and all its argument types must be accessible to the lookup class.
-         * If the constructor's class has not yet been initialized, that is done
-         * immediately, before the method handle is returned.
-         * <p>
-         * Note:  The requested type must have a return type of {@code void}.
-         * This is consistent with the JVM's treatment of constructor type descriptors.
-         * <p>
-         * The returned method handle will have
-         * {@linkplain MethodHandle#asVarargsCollector variable arity} if and only if
-         * the constructor's variable arity modifier bit ({@code 0x0080}) is set.
-         * @param refc the class or interface from which the method is accessed
-         * @param type the type of the method, with the receiver argument omitted, and a void return type
-         * @return the desired method handle
-         * @throws NoSuchMethodException if the constructor does not exist
-         * @throws IllegalAccessException if access checking fails
-         *                                or if the method's variable arity modifier bit
-         *                                is set and {@code asVarargsCollector} fails
-         * @exception SecurityException if a security manager is present and it
-         *                              <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
-         * @throws NullPointerException if any argument is null
-         */
-        public MethodHandle findConstructor(Class<?> refc, MethodType type) throws NoSuchMethodException, IllegalAccessException {
-            String name = "<init>";
-            MemberName ctor = resolveOrFail(refc, name, type, false, false, lookupClassOrNull());
-            checkSecurityManager(refc, ctor);  // stack walk magic: do not refactor
-            return accessConstructor(refc, ctor);
-        }
-        private MethodHandle accessConstructor(Class<?> refc, MemberName ctor) throws IllegalAccessException {
-            assert(ctor.isConstructor());
-            checkAccess(refc, ctor);
-            MethodHandle rawMH = MethodHandleImpl.findMethod(ctor, false, lookupClassOrNull());
-            MethodHandle allocMH = MethodHandleImpl.makeAllocator(rawMH);
-            return fixVarargs(allocMH, rawMH);
-        }
-        private MethodHandle resolveConstructor(Class<?> refc, MethodType type) throws NoSuchMethodException, IllegalAccessException {
-            String name = "<init>";
-            MemberName ctor = resolveOrFail(refc, name, type, false, false, lookupClassOrNull());
-            return accessConstructor(refc, ctor);
-        }
-
-        /** Return a version of MH which matches matchMH w.r.t. isVarargsCollector. */
-        private static MethodHandle fixVarargs(MethodHandle mh, MethodHandle matchMH) {
-            boolean va1 = mh.isVarargsCollector();
-            boolean va2 = matchMH.isVarargsCollector();
-            if (va1 == va2) {
-                return mh;
-            } else if (va2) {
-                MethodType type = mh.type();
-                int arity = type.parameterCount();
-                return mh.asVarargsCollector(type.parameterType(arity-1));
-            } else {
-                return mh.asFixedArity();
-            }
-        }
-
-        /**
-         * Produces an early-bound method handle for a virtual method,
-         * as if called from an {@code invokespecial}
-         * instruction from {@code caller}.
-         * The type of the method handle will be that of the method,
-         * with a suitably restricted receiver type (such as {@code caller}) prepended.
-         * The method and all its argument types must be accessible
-         * to the caller.
-         * <p>
-         * When called, the handle will treat the first argument as a receiver,
-         * but will not dispatch on the receiver's type.
-         * (This direct invocation action is identical with that performed by an
-         * {@code invokespecial} instruction.)
-         * <p>
-         * If the explicitly specified caller class is not identical with the
-         * lookup class, or if this lookup object does not have private access
-         * privileges, the access fails.
-         * <p>
-         * The returned method handle will have
-         * {@linkplain MethodHandle#asVarargsCollector variable arity} if and only if
-         * the method's variable arity modifier bit ({@code 0x0080}) is set.
-         * @param refc the class or interface from which the method is accessed
-         * @param name the name of the method (which must not be "&lt;init&gt;")
-         * @param type the type of the method, with the receiver argument omitted
-         * @param specialCaller the proposed calling class to perform the {@code invokespecial}
-         * @return the desired method handle
-         * @throws NoSuchMethodException if the method does not exist
-         * @throws IllegalAccessException if access checking fails
-         *                                or if the method's variable arity modifier bit
-         *                                is set and {@code asVarargsCollector} fails
-         * @exception SecurityException if a security manager is present and it
-         *                              <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
-         * @throws NullPointerException if any argument is null
-         */
-        public MethodHandle findSpecial(Class<?> refc, String name, MethodType type,
-                                        Class<?> specialCaller) throws NoSuchMethodException, IllegalAccessException {
-            checkSpecialCaller(specialCaller);
-            MemberName method = resolveOrFail(refc, name, type, false, false, specialCaller);
-            checkSecurityManager(refc, method);  // stack walk magic: do not refactor
-            return accessSpecial(refc, method, specialCaller);
-        }
-        private MethodHandle accessSpecial(Class<?> refc, MemberName method,
-                                           Class<?> specialCaller) throws NoSuchMethodException, IllegalAccessException {
-            checkMethod(refc, method, false);
-            MethodHandle mh = MethodHandleImpl.findMethod(method, false, specialCaller);
-            return restrictReceiver(method, mh, specialCaller);
-        }
-        private MethodHandle resolveSpecial(Class<?> refc, String name, MethodType type) throws NoSuchMethodException, IllegalAccessException {
-            Class<?> specialCaller = lookupClass();
-            checkSpecialCaller(specialCaller);
-            MemberName method = resolveOrFail(refc, name, type, false, false, specialCaller);
-            return accessSpecial(refc, method, specialCaller);
-        }
-
-        /**
-         * Produces a method handle giving read access to a non-static field.
-         * The type of the method handle will have a return type of the field's
-         * value type.
-         * The method handle's single argument will be the instance containing
-         * the field.
-         * Access checking is performed immediately on behalf of the lookup class.
-         * @param refc the class or interface from which the method is accessed
-         * @param name the field's name
-         * @param type the field's type
-         * @return a method handle which can load values from the field
-         * @throws NoSuchFieldException if the field does not exist
-         * @throws IllegalAccessException if access checking fails, or if the field is {@code static}
-         * @exception SecurityException if a security manager is present and it
-         *                              <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
-         * @throws NullPointerException if any argument is null
-         */
-        public MethodHandle findGetter(Class<?> refc, String name, Class<?> type) throws NoSuchFieldException, IllegalAccessException {
-            MemberName field = resolveOrFail(refc, name, type, false);
-            checkSecurityManager(refc, field);  // stack walk magic: do not refactor
-            return makeAccessor(refc, field, false, false, 0);
-        }
-        private MethodHandle resolveGetter(Class<?> refc, String name, Class<?> type) throws NoSuchFieldException, IllegalAccessException {
-            MemberName field = resolveOrFail(refc, name, type, false);
-            return makeAccessor(refc, field, false, false, 0);
-        }
-
-        /**
-         * Produces a method handle giving write access to a non-static field.
-         * The type of the method handle will have a void return type.
-         * The method handle will take two arguments, the instance containing
-         * the field, and the value to be stored.
-         * The second argument will be of the field's value type.
-         * Access checking is performed immediately on behalf of the lookup class.
-         * @param refc the class or interface from which the method is accessed
-         * @param name the field's name
-         * @param type the field's type
-         * @return a method handle which can store values into the field
-         * @throws NoSuchFieldException if the field does not exist
-         * @throws IllegalAccessException if access checking fails, or if the field is {@code static}
-         * @exception SecurityException if a security manager is present and it
-         *                              <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
-         * @throws NullPointerException if any argument is null
-         */
-        public MethodHandle findSetter(Class<?> refc, String name, Class<?> type) throws NoSuchFieldException, IllegalAccessException {
-            MemberName field = resolveOrFail(refc, name, type, false);
-            checkSecurityManager(refc, field);  // stack walk magic: do not refactor
-            return makeAccessor(refc, field, false, true, 0);
-        }
-        private MethodHandle resolveSetter(Class<?> refc, String name, Class<?> type) throws NoSuchFieldException, IllegalAccessException {
-            MemberName field = resolveOrFail(refc, name, type, false);
-            return makeAccessor(refc, field, false, true, 0);
-        }
-
-        /**
-         * Produces a method handle giving read access to a static field.
-         * The type of the method handle will have a return type of the field's
-         * value type.
-         * The method handle will take no arguments.
-         * Access checking is performed immediately on behalf of the lookup class.
-         * @param refc the class or interface from which the method is accessed
-         * @param name the field's name
-         * @param type the field's type
-         * @return a method handle which can load values from the field
-         * @throws NoSuchFieldException if the field does not exist
-         * @throws IllegalAccessException if access checking fails, or if the field is not {@code static}
-         * @exception SecurityException if a security manager is present and it
-         *                              <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
-         * @throws NullPointerException if any argument is null
-         */
-        public MethodHandle findStaticGetter(Class<?> refc, String name, Class<?> type) throws NoSuchFieldException, IllegalAccessException {
-            MemberName field = resolveOrFail(refc, name, type, true);
-            checkSecurityManager(refc, field);  // stack walk magic: do not refactor
-            return makeAccessor(refc, field, false, false, 1);
-        }
-        private MethodHandle resolveStaticGetter(Class<?> refc, String name, Class<?> type) throws NoSuchFieldException, IllegalAccessException {
-            MemberName field = resolveOrFail(refc, name, type, true);
-            return makeAccessor(refc, field, false, false, 1);
-        }
-
-        /**
-         * Produces a method handle giving write access to a static field.
-         * The type of the method handle will have a void return type.
-         * The method handle will take a single
-         * argument, of the field's value type, the value to be stored.
-         * Access checking is performed immediately on behalf of the lookup class.
-         * @param refc the class or interface from which the method is accessed
-         * @param name the field's name
-         * @param type the field's type
-         * @return a method handle which can store values into the field
-         * @throws NoSuchFieldException if the field does not exist
-         * @throws IllegalAccessException if access checking fails, or if the field is not {@code static}
-         * @exception SecurityException if a security manager is present and it
-         *                              <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
-         * @throws NullPointerException if any argument is null
-         */
-        public MethodHandle findStaticSetter(Class<?> refc, String name, Class<?> type) throws NoSuchFieldException, IllegalAccessException {
-            MemberName field = resolveOrFail(refc, name, type, true);
-            checkSecurityManager(refc, field);  // stack walk magic: do not refactor
-            return makeAccessor(refc, field, false, true, 1);
-        }
-        private MethodHandle resolveStaticSetter(Class<?> refc, String name, Class<?> type) throws NoSuchFieldException, IllegalAccessException {
-            MemberName field = resolveOrFail(refc, name, type, true);
-            return makeAccessor(refc, field, false, true, 1);
-        }
-
-        /**
-         * Produces an early-bound method handle for a non-static method.
-         * The receiver must have a supertype {@code defc} in which a method
-         * of the given name and type is accessible to the lookup class.
-         * The method and all its argument types must be accessible to the lookup class.
-         * The type of the method handle will be that of the method,
-         * without any insertion of an additional receiver parameter.
-         * The given receiver will be bound into the method handle,
-         * so that every call to the method handle will invoke the
-         * requested method on the given receiver.
-         * <p>
-         * The returned method handle will have
-         * {@linkplain MethodHandle#asVarargsCollector variable arity} if and only if
-         * the method's variable arity modifier bit ({@code 0x0080}) is set
-         * <em>and</em> the trailing array argument is not the only argument.
-         * (If the trailing array argument is the only argument,
-         * the given receiver value will be bound to it.)
-         * <p>
-         * This is equivalent to the following code:
-         * <blockquote><pre>
-import static java.lang.invoke.MethodHandles.*;
-import static java.lang.invoke.MethodType.*;
-...
-MethodHandle mh0 = lookup().{@link #findVirtual findVirtual}(defc, name, type);
-MethodHandle mh1 = mh0.{@link MethodHandle#bindTo bindTo}(receiver);
-MethodType mt1 = mh1.type();
-if (mh0.isVarargsCollector())
-  mh1 = mh1.asVarargsCollector(mt1.parameterType(mt1.parameterCount()-1));
-return mh1;
-         * </pre></blockquote>
-         * where {@code defc} is either {@code receiver.getClass()} or a super
-         * type of that class, in which the requested method is accessible
-         * to the lookup class.
-         * (Note that {@code bindTo} does not preserve variable arity.)
-         * @param receiver the object from which the method is accessed
-         * @param name the name of the method
-         * @param type the type of the method, with the receiver argument omitted
-         * @return the desired method handle
-         * @throws NoSuchMethodException if the method does not exist
-         * @throws IllegalAccessException if access checking fails
-         *                                or if the method's variable arity modifier bit
-         *                                is set and {@code asVarargsCollector} fails
-         * @exception SecurityException if a security manager is present and it
-         *                              <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
-         * @throws NullPointerException if any argument is null
-         */
-        public MethodHandle bind(Object receiver, String name, MethodType type) throws NoSuchMethodException, IllegalAccessException {
-            Class<? extends Object> refc = receiver.getClass(); // may get NPE
-            MemberName method = resolveOrFail(refc, name, type, false);
-            checkSecurityManager(refc, method);  // stack walk magic: do not refactor
-            checkMethod(refc, method, false);
-            MethodHandle dmh = MethodHandleImpl.findMethod(method, true, lookupClassOrNull());
-            MethodHandle bmh = MethodHandleImpl.bindReceiver(dmh, receiver);
-            if (bmh == null)
-                throw method.makeAccessException("no access", this);
-            return fixVarargs(bmh, dmh);
-        }
-
-        /**
-         * Makes a direct method handle to <i>m</i>, if the lookup class has permission.
-         * If <i>m</i> is non-static, the receiver argument is treated as an initial argument.
-         * If <i>m</i> is virtual, overriding is respected on every call.
-         * Unlike the Core Reflection API, exceptions are <em>not</em> wrapped.
-         * The type of the method handle will be that of the method,
-         * with the receiver type prepended (but only if it is non-static).
-         * If the method's {@code accessible} flag is not set,
-         * access checking is performed immediately on behalf of the lookup class.
-         * If <i>m</i> is not public, do not share the resulting handle with untrusted parties.
-         * <p>
-         * The returned method handle will have
-         * {@linkplain MethodHandle#asVarargsCollector variable arity} if and only if
-         * the method's variable arity modifier bit ({@code 0x0080}) is set.
-         * @param m the reflected method
-         * @return a method handle which can invoke the reflected method
-         * @throws IllegalAccessException if access checking fails
-         *                                or if the method's variable arity modifier bit
-         *                                is set and {@code asVarargsCollector} fails
-         * @throws NullPointerException if the argument is null
-         */
-        public MethodHandle unreflect(Method m) throws IllegalAccessException {
-            MemberName method = new MemberName(m);
-            assert(method.isMethod());
-            if (m.isAccessible())
-                return MethodHandleImpl.findMethod(method, true, /*no lookupClass*/ null);
-            checkMethod(method.getDeclaringClass(), method, method.isStatic());
-            MethodHandle mh = MethodHandleImpl.findMethod(method, true, lookupClassOrNull());
-            return restrictProtectedReceiver(method, mh);
-        }
-
-        /**
-         * Produces a method handle for a reflected method.
-         * It will bypass checks for overriding methods on the receiver,
-         * as if by a {@code invokespecial} instruction from within the {@code specialCaller}.
-         * The type of the method handle will be that of the method,
-         * with the special caller type prepended (and <em>not</em> the receiver of the method).
-         * If the method's {@code accessible} flag is not set,
-         * access checking is performed immediately on behalf of the lookup class,
-         * as if {@code invokespecial} instruction were being linked.
-         * <p>
-         * The returned method handle will have
-         * {@linkplain MethodHandle#asVarargsCollector variable arity} if and only if
-         * the method's variable arity modifier bit ({@code 0x0080}) is set.
-         * @param m the reflected method
-         * @param specialCaller the class nominally calling the method
-         * @return a method handle which can invoke the reflected method
-         * @throws IllegalAccessException if access checking fails
-         *                                or if the method's variable arity modifier bit
-         *                                is set and {@code asVarargsCollector} fails
-         * @throws NullPointerException if any argument is null
-         */
-        public MethodHandle unreflectSpecial(Method m, Class<?> specialCaller) throws IllegalAccessException {
-            checkSpecialCaller(specialCaller);
-            MemberName method = new MemberName(m);
-            assert(method.isMethod());
-            // ignore m.isAccessible:  this is a new kind of access
-            checkMethod(m.getDeclaringClass(), method, false);
-            MethodHandle mh = MethodHandleImpl.findMethod(method, false, lookupClassOrNull());
-            return restrictReceiver(method, mh, specialCaller);
-        }
-
-        /**
-         * Produces a method handle for a reflected constructor.
-         * The type of the method handle will be that of the constructor,
-         * with the return type changed to the declaring class.
-         * The method handle will perform a {@code newInstance} operation,
-         * creating a new instance of the constructor's class on the
-         * arguments passed to the method handle.
-         * <p>
-         * If the constructor's {@code accessible} flag is not set,
-         * access checking is performed immediately on behalf of the lookup class.
-         * <p>
-         * The returned method handle will have
-         * {@linkplain MethodHandle#asVarargsCollector variable arity} if and only if
-         * the constructor's variable arity modifier bit ({@code 0x0080}) is set.
-         * @param c the reflected constructor
-         * @return a method handle which can invoke the reflected constructor
-         * @throws IllegalAccessException if access checking fails
-         *                                or if the method's variable arity modifier bit
-         *                                is set and {@code asVarargsCollector} fails
-         * @throws NullPointerException if the argument is null
-         */
-        public MethodHandle unreflectConstructor(Constructor c) throws IllegalAccessException {
-            MemberName ctor = new MemberName(c);
-            assert(ctor.isConstructor());
-            MethodHandle rawCtor;
-            if (c.isAccessible()) {
-                rawCtor = MethodHandleImpl.findMethod(ctor, false, /*no lookupClass*/ null);
-            } else {
-                checkAccess(c.getDeclaringClass(), ctor);
-                rawCtor = MethodHandleImpl.findMethod(ctor, false, lookupClassOrNull());
-            }
-            MethodHandle allocator = MethodHandleImpl.makeAllocator(rawCtor);
-            return fixVarargs(allocator, rawCtor);
-        }
-
-        /**
-         * Produces a method handle giving read access to a reflected field.
-         * The type of the method handle will have a return type of the field's
-         * value type.
-         * If the field is static, the method handle will take no arguments.
-         * Otherwise, its single argument will be the instance containing
-         * the field.
-         * If the field's {@code accessible} flag is not set,
-         * access checking is performed immediately on behalf of the lookup class.
-         * @param f the reflected field
-         * @return a method handle which can load values from the reflected field
-         * @throws IllegalAccessException if access checking fails
-         * @throws NullPointerException if the argument is null
-         */
-        public MethodHandle unreflectGetter(Field f) throws IllegalAccessException {
-            return makeAccessor(f.getDeclaringClass(), new MemberName(f), f.isAccessible(), false, -1);
-        }
-
-        /**
-         * Produces a method handle giving write access to a reflected field.
-         * The type of the method handle will have a void return type.
-         * If the field is static, the method handle will take a single
-         * argument, of the field's value type, the value to be stored.
-         * Otherwise, the two arguments will be the instance containing
-         * the field, and the value to be stored.
-         * If the field's {@code accessible} flag is not set,
-         * access checking is performed immediately on behalf of the lookup class.
-         * @param f the reflected field
-         * @return a method handle which can store values into the reflected field
-         * @throws IllegalAccessException if access checking fails
-         * @throws NullPointerException if the argument is null
-         */
-        public MethodHandle unreflectSetter(Field f) throws IllegalAccessException {
-            return makeAccessor(f.getDeclaringClass(), new MemberName(f), f.isAccessible(), true, -1);
-        }
-
-        /// Helper methods, all package-private.
-
-        MemberName resolveOrFail(Class<?> refc, String name, Class<?> type, boolean isStatic) throws NoSuchFieldException, IllegalAccessException {
-            checkSymbolicClass(refc);  // do this before attempting to resolve
-            name.getClass(); type.getClass();  // NPE
-            int mods = (isStatic ? Modifier.STATIC : 0);
-            return IMPL_NAMES.resolveOrFail(new MemberName(refc, name, type, mods), true, lookupClassOrNull(),
-                                            NoSuchFieldException.class);
-        }
-
-        MemberName resolveOrFail(Class<?> refc, String name, MethodType type, boolean isStatic) throws NoSuchMethodException, IllegalAccessException {
-            checkSymbolicClass(refc);  // do this before attempting to resolve
-            name.getClass(); type.getClass();  // NPE
-            int mods = (isStatic ? Modifier.STATIC : 0);
-            return IMPL_NAMES.resolveOrFail(new MemberName(refc, name, type, mods), true, lookupClassOrNull(),
-                                            NoSuchMethodException.class);
-        }
-
-        MemberName resolveOrFail(Class<?> refc, String name, MethodType type, boolean isStatic,
-                                 boolean searchSupers, Class<?> specialCaller) throws NoSuchMethodException, IllegalAccessException {
-            checkSymbolicClass(refc);  // do this before attempting to resolve
-            name.getClass(); type.getClass();  // NPE
-            int mods = (isStatic ? Modifier.STATIC : 0);
-            return IMPL_NAMES.resolveOrFail(new MemberName(refc, name, type, mods), searchSupers, specialCaller,
-                                            NoSuchMethodException.class);
-        }
-
-        void checkSymbolicClass(Class<?> refc) throws IllegalAccessException {
-            Class<?> caller = lookupClassOrNull();
-            if (caller != null && !VerifyAccess.isClassAccessible(refc, caller, allowedModes))
-                throw new MemberName(refc).makeAccessException("symbolic reference class is not public", this);
-        }
-
-        /**
-         * Perform necessary <a href="MethodHandles.Lookup.html#secmgr">access checks</a>.
-         * This function performs stack walk magic: do not refactor it.
-         */
-        void checkSecurityManager(Class<?> refc, MemberName m) {
-            if (noSecurityCheck) return;
-            SecurityManager smgr = System.getSecurityManager();
-            if (smgr == null)  return;
-            if (allowedModes == TRUSTED)  return;
-            // Step 1:
-            smgr.checkMemberAccess(refc, Member.PUBLIC);
-            // Step 2:
-            Class<?> callerClass = ((allowedModes & PRIVATE) != 0
-                                    ? lookupClass  // for strong access modes, no extra check
-                                    // next line does stack walk magic; do not refactor:
-                                    : getCallerClassAtEntryPoint(true));
-            if (!VerifyAccess.classLoaderIsAncestor(lookupClass, refc) ||
-                (callerClass != lookupClass &&
-                 !VerifyAccess.classLoaderIsAncestor(callerClass, refc)))
-                smgr.checkPackageAccess(VerifyAccess.getPackageName(refc));
-            // Step 3:
-            if (m.isPublic()) return;
-            Class<?> defc = m.getDeclaringClass();
-            smgr.checkMemberAccess(defc, Member.DECLARED);  // STACK WALK HERE
-            // Step 4:
-            if (defc != refc)
-                smgr.checkPackageAccess(VerifyAccess.getPackageName(defc));
-
-            // Comment from SM.checkMemberAccess, where which=DECLARED:
-            /*
-             * stack depth of 4 should be the caller of one of the
-             * methods in java.lang.Class that invoke checkMember
-             * access. The stack should look like:
-             *
-             * someCaller                        [3]
-             * java.lang.Class.someReflectionAPI [2]
-             * java.lang.Class.checkMemberAccess [1]
-             * SecurityManager.checkMemberAccess [0]
-             *
-             */
-            // For us it is this stack:
-            // someCaller                        [3]
-            // Lookup.findSomeMember             [2]
-            // Lookup.checkSecurityManager       [1]
-            // SecurityManager.checkMemberAccess [0]
-        }
-
-        void checkMethod(Class<?> refc, MemberName m, boolean wantStatic) throws IllegalAccessException {
-            String message;
-            if (m.isConstructor())
-                message = "expected a method, not a constructor";
-            else if (!m.isMethod())
-                message = "expected a method";
-            else if (wantStatic != m.isStatic())
-                message = wantStatic ? "expected a static method" : "expected a non-static method";
-            else
-                { checkAccess(refc, m); return; }
-            throw m.makeAccessException(message, this);
-        }
-
-        void checkAccess(Class<?> refc, MemberName m) throws IllegalAccessException {
-            int allowedModes = this.allowedModes;
-            if (allowedModes == TRUSTED)  return;
-            int mods = m.getModifiers();
-            if (Modifier.isPublic(mods) && Modifier.isPublic(refc.getModifiers()) && allowedModes != 0)
-                return;  // common case
-            int requestedModes = fixmods(mods);  // adjust 0 => PACKAGE
-            if ((requestedModes & allowedModes) != 0
-                && VerifyAccess.isMemberAccessible(refc, m.getDeclaringClass(),
-                                                   mods, lookupClass(), allowedModes))
-                return;
-            if (((requestedModes & ~allowedModes) & PROTECTED) != 0
-                && (allowedModes & PACKAGE) != 0
-                && VerifyAccess.isSamePackage(m.getDeclaringClass(), lookupClass()))
-                // Protected members can also be checked as if they were package-private.
-                return;
-            throw m.makeAccessException(accessFailedMessage(refc, m), this);
-        }
-
-        String accessFailedMessage(Class<?> refc, MemberName m) {
-            Class<?> defc = m.getDeclaringClass();
-            int mods = m.getModifiers();
-            // check the class first:
-            boolean classOK = (Modifier.isPublic(defc.getModifiers()) &&
-                               (defc == refc ||
-                                Modifier.isPublic(refc.getModifiers())));
-            if (!classOK && (allowedModes & PACKAGE) != 0) {
-                classOK = (VerifyAccess.isClassAccessible(defc, lookupClass(), ALL_MODES) &&
-                           (defc == refc ||
-                            VerifyAccess.isClassAccessible(refc, lookupClass(), ALL_MODES)));
-            }
-            if (!classOK)
-                return "class is not public";
-            if (Modifier.isPublic(mods))
-                return "access to public member failed";  // (how?)
-            if (Modifier.isPrivate(mods))
-                return "member is private";
-            if (Modifier.isProtected(mods))
-                return "member is protected";
-            return "member is private to package";
-        }
-
-        private static final boolean ALLOW_NESTMATE_ACCESS = false;
-
-        void checkSpecialCaller(Class<?> specialCaller) throws IllegalAccessException {
-            if (allowedModes == TRUSTED)  return;
-            if ((allowedModes & PRIVATE) == 0
-                || (specialCaller != lookupClass()
-                    && !(ALLOW_NESTMATE_ACCESS &&
-                         VerifyAccess.isSamePackageMember(specialCaller, lookupClass()))))
-                throw new MemberName(specialCaller).
-                    makeAccessException("no private access for invokespecial", this);
-        }
-
-        MethodHandle restrictProtectedReceiver(MemberName method, MethodHandle mh) throws IllegalAccessException {
-            // The accessing class only has the right to use a protected member
-            // on itself or a subclass.  Enforce that restriction, from JVMS 5.4.4, etc.
-            if (!method.isProtected() || method.isStatic()
-                || allowedModes == TRUSTED
-                || method.getDeclaringClass() == lookupClass()
-                || VerifyAccess.isSamePackage(method.getDeclaringClass(), lookupClass())
-                || (ALLOW_NESTMATE_ACCESS &&
-                    VerifyAccess.isSamePackageMember(method.getDeclaringClass(), lookupClass())))
-                return mh;
-            else
-                return restrictReceiver(method, mh, lookupClass());
-        }
-        MethodHandle restrictReceiver(MemberName method, MethodHandle mh, Class<?> caller) throws IllegalAccessException {
-            assert(!method.isStatic());
-            Class<?> defc = method.getDeclaringClass();  // receiver type of mh is too wide
-            if (defc.isInterface() || !defc.isAssignableFrom(caller)) {
-                throw method.makeAccessException("caller class must be a subclass below the method", caller);
-            }
-            MethodType rawType = mh.type();
-            if (rawType.parameterType(0) == caller)  return mh;
-            MethodType narrowType = rawType.changeParameterType(0, caller);
-            MethodHandle narrowMH = MethodHandleImpl.convertArguments(mh, narrowType, rawType, 0);
-            return fixVarargs(narrowMH, mh);
-        }
-
-        MethodHandle makeAccessor(Class<?> refc, MemberName field,
-                                  boolean trusted, boolean isSetter,
-                                  int checkStatic) throws IllegalAccessException {
-            assert(field.isField());
-            if (checkStatic >= 0 && (checkStatic != 0) != field.isStatic())
-                throw field.makeAccessException((checkStatic != 0)
-                                                ? "expected a static field"
-                                                : "expected a non-static field", this);
-            if (trusted)
-                return MethodHandleImpl.accessField(field, isSetter, /*no lookupClass*/ null);
-            checkAccess(refc, field);
-            MethodHandle mh = MethodHandleImpl.accessField(field, isSetter, lookupClassOrNull());
-            return restrictProtectedReceiver(field, mh);
-        }
-
-        /** Hook called from the JVM (via MethodHandleNatives) to link MH constants:
-         */
-        /*non-public*/
-        MethodHandle linkMethodHandleConstant(int refKind, Class<?> defc, String name, Object type) throws ReflectiveOperationException {
-            switch (refKind) {
-            case REF_getField:          return resolveGetter(       defc, name, (Class<?>)   type );
-            case REF_getStatic:         return resolveStaticGetter( defc, name, (Class<?>)   type );
-            case REF_putField:          return resolveSetter(       defc, name, (Class<?>)   type );
-            case REF_putStatic:         return resolveStaticSetter( defc, name, (Class<?>)   type );
-            case REF_invokeVirtual:     return resolveVirtual(      defc, name, (MethodType) type );
-            case REF_invokeStatic:      return resolveStatic(       defc, name, (MethodType) type );
-            case REF_invokeSpecial:     return resolveSpecial(      defc, name, (MethodType) type );
-            case REF_newInvokeSpecial:  return resolveConstructor(  defc,       (MethodType) type );
-            case REF_invokeInterface:   return resolveVirtual(      defc, name, (MethodType) type );
-            }
-            // oops
-            throw new ReflectiveOperationException("bad MethodHandle constant #"+refKind+" "+name+" : "+type);
-        }
-    }
-
-    /**
-     * Produces a method handle giving read access to elements of an array.
-     * The type of the method handle will have a return type of the array's
-     * element type.  Its first argument will be the array type,
-     * and the second will be {@code int}.
-     * @param arrayClass an array type
-     * @return a method handle which can load values from the given array type
-     * @throws NullPointerException if the argument is null
-     * @throws  IllegalArgumentException if arrayClass is not an array type
-     */
-    public static
-    MethodHandle arrayElementGetter(Class<?> arrayClass) throws IllegalArgumentException {
-        return MethodHandleImpl.accessArrayElement(arrayClass, false);
-    }
-
-    /**
-     * Produces a method handle giving write access to elements of an array.
-     * The type of the method handle will have a void return type.
-     * Its last argument will be the array's element type.
-     * The first and second arguments will be the array type and int.
-     * @return a method handle which can store values into the array type
-     * @throws NullPointerException if the argument is null
-     * @throws IllegalArgumentException if arrayClass is not an array type
-     */
-    public static
-    MethodHandle arrayElementSetter(Class<?> arrayClass) throws IllegalArgumentException {
-        return MethodHandleImpl.accessArrayElement(arrayClass, true);
-    }
-
-    /// method handle invocation (reflective style)
-
-    /**
-     * Produces a method handle which will invoke any method handle of the
-     * given {@code type}, with a given number of trailing arguments replaced by
-     * a single trailing {@code Object[]} array.
-     * The resulting invoker will be a method handle with the following
-     * arguments:
-     * <ul>
-     * <li>a single {@code MethodHandle} target
-     * <li>zero or more leading values (counted by {@code leadingArgCount})
-     * <li>an {@code Object[]} array containing trailing arguments
-     * </ul>
-     * <p>
-     * The invoker will invoke its target like a call to {@link MethodHandle#invoke invoke} with
-     * the indicated {@code type}.
-     * That is, if the target is exactly of the given {@code type}, it will behave
-     * like {@code invokeExact}; otherwise it behave as if {@link MethodHandle#asType asType}
-     * is used to convert the target to the required {@code type}.
-     * <p>
-     * The type of the returned invoker will not be the given {@code type}, but rather
-     * will have all parameters except the first {@code leadingArgCount}
-     * replaced by a single array of type {@code Object[]}, which will be
-     * the final parameter.
-     * <p>
-     * Before invoking its target, the invoker will spread the final array, apply
-     * reference casts as necessary, and unbox and widen primitive arguments.
-     * <p>
-     * This method is equivalent to the following code (though it may be more efficient):
-     * <p><blockquote><pre>
-MethodHandle invoker = MethodHandles.invoker(type);
-int spreadArgCount = type.parameterCount() - leadingArgCount;
-invoker = invoker.asSpreader(Object[].class, spreadArgCount);
-return invoker;
-     * </pre></blockquote>
-     * <p>
-     * This method throws no reflective or security exceptions.
-     * @param type the desired target type
-     * @param leadingArgCount number of fixed arguments, to be passed unchanged to the target
-     * @return a method handle suitable for invoking any method handle of the given type
-     * @throws NullPointerException if {@code type} is null
-     * @throws IllegalArgumentException if {@code leadingArgCount} is not in
-     *                  the range from 0 to {@code type.parameterCount()} inclusive
-     */
-    static public
-    MethodHandle spreadInvoker(MethodType type, int leadingArgCount) {
-        if (leadingArgCount < 0 || leadingArgCount > type.parameterCount())
-            throw new IllegalArgumentException("bad argument count "+leadingArgCount);
-        return type.invokers().spreadInvoker(leadingArgCount);
-    }
-
-    /**
-     * Produces a special <em>invoker method handle</em> which can be used to
-     * invoke any method handle of the given type, as if by {@link MethodHandle#invokeExact invokeExact}.
-     * The resulting invoker will have a type which is
-     * exactly equal to the desired type, except that it will accept
-     * an additional leading argument of type {@code MethodHandle}.
-     * <p>
-     * This method is equivalent to the following code (though it may be more efficient):
-     * <p><blockquote><pre>
-publicLookup().findVirtual(MethodHandle.class, "invokeExact", type)
-     * </pre></blockquote>
-     *
-     * <p style="font-size:smaller;">
-     * <em>Discussion:</em>
-     * Invoker method handles can be useful when working with variable method handles
-     * of unknown types.
-     * For example, to emulate an {@code invokeExact} call to a variable method
-     * handle {@code M}, extract its type {@code T},
-     * look up the invoker method {@code X} for {@code T},
-     * and call the invoker method, as {@code X.invoke(T, A...)}.
-     * (It would not work to call {@code X.invokeExact}, since the type {@code T}
-     * is unknown.)
-     * If spreading, collecting, or other argument transformations are required,
-     * they can be applied once to the invoker {@code X} and reused on many {@code M}
-     * method handle values, as long as they are compatible with the type of {@code X}.
-     * <p>
-     * <em>(Note:  The invoker method is not available via the Core Reflection API.
-     * An attempt to call {@linkplain java.lang.reflect.Method#invoke java.lang.reflect.Method.invoke}
-     * on the declared {@code invokeExact} or {@code invoke} method will raise an
-     * {@link java.lang.UnsupportedOperationException UnsupportedOperationException}.)</em>
-     * <p>
-     * This method throws no reflective or security exceptions.
-     * @param type the desired target type
-     * @return a method handle suitable for invoking any method handle of the given type
-     */
-    static public
-    MethodHandle exactInvoker(MethodType type) {
-        return type.invokers().exactInvoker();
-    }
-
-    /**
-     * Produces a special <em>invoker method handle</em> which can be used to
-     * invoke any method handle compatible with the given type, as if by {@link MethodHandle#invoke invoke}.
-     * The resulting invoker will have a type which is
-     * exactly equal to the desired type, except that it will accept
-     * an additional leading argument of type {@code MethodHandle}.
-     * <p>
-     * Before invoking its target, if the target differs from the expected type,
-     * the invoker will apply reference casts as
-     * necessary and box, unbox, or widen primitive values, as if by {@link MethodHandle#asType asType}.
-     * Similarly, the return value will be converted as necessary.
-     * If the target is a {@linkplain MethodHandle#asVarargsCollector variable arity method handle},
-     * the required arity conversion will be made, again as if by {@link MethodHandle#asType asType}.
-     * <p>
-     * A {@linkplain MethodType#genericMethodType general method type},
-     * mentions only {@code Object} arguments and return values.
-     * An invoker for such a type is capable of calling any method handle
-     * of the same arity as the general type.
-     * <p>
-     * This method is equivalent to the following code (though it may be more efficient):
-     * <p><blockquote><pre>
-publicLookup().findVirtual(MethodHandle.class, "invoke", type)
-     * </pre></blockquote>
-     * <p>
-     * This method throws no reflective or security exceptions.
-     * @param type the desired target type
-     * @return a method handle suitable for invoking any method handle convertible to the given type
-     */
-    static public
-    MethodHandle invoker(MethodType type) {
-        return type.invokers().generalInvoker();
-    }
-
-    /**
-     * Perform value checking, exactly as if for an adapted method handle.
-     * It is assumed that the given value is either null, of type T0,
-     * or (if T0 is primitive) of the wrapper class corresponding to T0.
-     * The following checks and conversions are made:
-     * <ul>
-     * <li>If T0 and T1 are references, then a cast to T1 is applied.
-     *     (The types do not need to be related in any particular way.)
-     * <li>If T0 and T1 are primitives, then a widening or narrowing
-     *     conversion is applied, if one exists.
-     * <li>If T0 is a primitive and T1 a reference, and
-     *     T0 has a wrapper class TW, a boxing conversion to TW is applied,
-     *     possibly followed by a reference conversion.
-     *     T1 must be TW or a supertype.
-     * <li>If T0 is a reference and T1 a primitive, and
-     *     T1 has a wrapper class TW, an unboxing conversion is applied,
-     *     possibly preceded by a reference conversion.
-     *     T0 must be TW or a supertype.
-     * <li>If T1 is void, the return value is discarded
-     * <li>If T0 is void and T1 a reference, a null value is introduced.
-     * <li>If T0 is void and T1 a primitive, a zero value is introduced.
-     * </ul>
-     * If the value is discarded, null will be returned.
-     * @param valueType
-     * @param value
-     * @return the value, converted if necessary
-     * @throws java.lang.ClassCastException if a cast fails
-     */
-    // FIXME: This is used in just one place.  Refactor away.
-    static
-    <T0, T1> T1 checkValue(Class<T0> t0, Class<T1> t1, Object value)
-       throws ClassCastException
-    {
-        if (t0 == t1) {
-            // no conversion needed; just reassert the same type
-            if (t0.isPrimitive())
-                return Wrapper.asPrimitiveType(t1).cast(value);
-            else
-                return Wrapper.OBJECT.convert(value, t1);
-        }
-        boolean prim0 = t0.isPrimitive(), prim1 = t1.isPrimitive();
-        if (!prim0) {
-            // check contract with caller
-            Wrapper.OBJECT.convert(value, t0);
-            if (!prim1) {
-                return Wrapper.OBJECT.convert(value, t1);
-            }
-            // convert reference to primitive by unboxing
-            Wrapper w1 = Wrapper.forPrimitiveType(t1);
-            return w1.convert(value, t1);
-        }
-        // check contract with caller:
-        Wrapper.asWrapperType(t0).cast(value);
-        Wrapper w1 = Wrapper.forPrimitiveType(t1);
-        return w1.convert(value, t1);
-    }
-
-    // FIXME: Delete this.  It is used only for insertArguments & bindTo.
-    // Replace by a more standard check.
-    static
-    Object checkValue(Class<?> T1, Object value)
-       throws ClassCastException
-    {
-        Class<?> T0;
-        if (value == null)
-            T0 = Object.class;
-        else
-            T0 = value.getClass();
-        return checkValue(T0, T1, value);
-    }
-
-    /// method handle modification (creation from other method handles)
-
-    /**
-     * Produces a method handle which adapts the type of the
-     * given method handle to a new type by pairwise argument and return type conversion.
-     * The original type and new type must have the same number of arguments.
-     * The resulting method handle is guaranteed to report a type
-     * which is equal to the desired new type.
-     * <p>
-     * If the original type and new type are equal, returns target.
-     * <p>
-     * The same conversions are allowed as for {@link MethodHandle#asType MethodHandle.asType},
-     * and some additional conversions are also applied if those conversions fail.
-     * Given types <em>T0</em>, <em>T1</em>, one of the following conversions is applied
-     * if possible, before or instead of any conversions done by {@code asType}:
-     * <ul>
-     * <li>If <em>T0</em> and <em>T1</em> are references, and <em>T1</em> is an interface type,
-     *     then the value of type <em>T0</em> is passed as a <em>T1</em> without a cast.
-     *     (This treatment of interfaces follows the usage of the bytecode verifier.)
-     * <li>If <em>T0</em> is boolean and <em>T1</em> is another primitive,
-     *     the boolean is converted to a byte value, 1 for true, 0 for false.
-     *     (This treatment follows the usage of the bytecode verifier.)
-     * <li>If <em>T1</em> is boolean and <em>T0</em> is another primitive,
-     *     <em>T0</em> is converted to byte via Java casting conversion (JLS 5.5),
-     *     and the low order bit of the result is tested, as if by {@code (x & 1) != 0}.
-     * <li>If <em>T0</em> and <em>T1</em> are primitives other than boolean,
-     *     then a Java casting conversion (JLS 5.5) is applied.
-     *     (Specifically, <em>T0</em> will convert to <em>T1</em> by
-     *     widening and/or narrowing.)
-     * <li>If <em>T0</em> is a reference and <em>T1</em> a primitive, an unboxing
-     *     conversion will be applied at runtime, possibly followed
-     *     by a Java casting conversion (JLS 5.5) on the primitive value,
-     *     possibly followed by a conversion from byte to boolean by testing
-     *     the low-order bit.
-     * <li>If <em>T0</em> is a reference and <em>T1</em> a primitive,
-     *     and if the reference is null at runtime, a zero value is introduced.
-     * </ul>
-     * @param target the method handle to invoke after arguments are retyped
-     * @param newType the expected type of the new method handle
-     * @return a method handle which delegates to the target after performing
-     *           any necessary argument conversions, and arranges for any
-     *           necessary return value conversions
-     * @throws NullPointerException if either argument is null
-     * @throws WrongMethodTypeException if the conversion cannot be made
-     * @see MethodHandle#asType
-     */
-    public static
-    MethodHandle explicitCastArguments(MethodHandle target, MethodType newType) {
-        return MethodHandleImpl.convertArguments(target, newType, 2);
-    }
-
-    /**
-     * Produces a method handle which adapts the calling sequence of the
-     * given method handle to a new type, by reordering the arguments.
-     * The resulting method handle is guaranteed to report a type
-     * which is equal to the desired new type.
-     * <p>
-     * The given array controls the reordering.
-     * Call {@code #I} the number of incoming parameters (the value
-     * {@code newType.parameterCount()}, and call {@code #O} the number
-     * of outgoing parameters (the value {@code target.type().parameterCount()}).
-     * Then the length of the reordering array must be {@code #O},
-     * and each element must be a non-negative number less than {@code #I}.
-     * For every {@code N} less than {@code #O}, the {@code N}-th
-     * outgoing argument will be taken from the {@code I}-th incoming
-     * argument, where {@code I} is {@code reorder[N]}.
-     * <p>
-     * No argument or return value conversions are applied.
-     * The type of each incoming argument, as determined by {@code newType},
-     * must be identical to the type of the corresponding outgoing parameter
-     * or parameters in the target method handle.
-     * The return type of {@code newType} must be identical to the return
-     * type of the original target.
-     * <p>
-     * The reordering array need not specify an actual permutation.
-     * An incoming argument will be duplicated if its index appears
-     * more than once in the array, and an incoming argument will be dropped
-     * if its index does not appear in the array.
-     * As in the case of {@link #dropArguments(MethodHandle,int,List) dropArguments},
-     * incoming arguments which are not mentioned in the reordering array
-     * are may be any type, as determined only by {@code newType}.
-     * <blockquote><pre>
-import static java.lang.invoke.MethodHandles.*;
-import static java.lang.invoke.MethodType.*;
-...
-MethodType intfn1 = methodType(int.class, int.class);
-MethodType intfn2 = methodType(int.class, int.class, int.class);
-MethodHandle sub = ... {int x, int y => x-y} ...;
-assert(sub.type().equals(intfn2));
-MethodHandle sub1 = permuteArguments(sub, intfn2, 0, 1);
-MethodHandle rsub = permuteArguments(sub, intfn2, 1, 0);
-assert((int)rsub.invokeExact(1, 100) == 99);
-MethodHandle add = ... {int x, int y => x+y} ...;
-assert(add.type().equals(intfn2));
-MethodHandle twice = permuteArguments(add, intfn1, 0, 0);
-assert(twice.type().equals(intfn1));
-assert((int)twice.invokeExact(21) == 42);
-     * </pre></blockquote>
-     * @param target the method handle to invoke after arguments are reordered
-     * @param newType the expected type of the new method handle
-     * @param reorder an index array which controls the reordering
-     * @return a method handle which delegates to the target after it
-     *           drops unused arguments and moves and/or duplicates the other arguments
-     * @throws NullPointerException if any argument is null
-     * @throws IllegalArgumentException if the index array length is not equal to
-     *                  the arity of the target, or if any index array element
-     *                  not a valid index for a parameter of {@code newType},
-     *                  or if two corresponding parameter types in
-     *                  {@code target.type()} and {@code newType} are not identical,
-     */
-    public static
-    MethodHandle permuteArguments(MethodHandle target, MethodType newType, int... reorder) {
-        MethodType oldType = target.type();
-        checkReorder(reorder, newType, oldType);
-        return MethodHandleImpl.permuteArguments(target,
-                                                 newType, oldType,
-                                                 reorder);
-    }
-
-    private static void checkReorder(int[] reorder, MethodType newType, MethodType oldType) {
-        if (newType.returnType() != oldType.returnType())
-            throw newIllegalArgumentException("return types do not match",
-                    oldType, newType);
-        if (reorder.length == oldType.parameterCount()) {
-            int limit = newType.parameterCount();
-            boolean bad = false;
-            for (int j = 0; j < reorder.length; j++) {
-                int i = reorder[j];
-                if (i < 0 || i >= limit) {
-                    bad = true; break;
-                }
-                Class<?> src = newType.parameterType(i);
-                Class<?> dst = oldType.parameterType(j);
-                if (src != dst)
-                    throw newIllegalArgumentException("parameter types do not match after reorder",
-                            oldType, newType);
-            }
-            if (!bad)  return;
-        }
-        throw newIllegalArgumentException("bad reorder array: "+Arrays.toString(reorder));
-    }
-
-    /**
-     * Produces a method handle of the requested return type which returns the given
-     * constant value every time it is invoked.
-     * <p>
-     * Before the method handle is returned, the passed-in value is converted to the requested type.
-     * If the requested type is primitive, widening primitive conversions are attempted,
-     * else reference conversions are attempted.
-     * <p>The returned method handle is equivalent to {@code identity(type).bindTo(value)}.
-     * @param type the return type of the desired method handle
-     * @param value the value to return
-     * @return a method handle of the given return type and no arguments, which always returns the given value
-     * @throws NullPointerException if the {@code type} argument is null
-     * @throws ClassCastException if the value cannot be converted to the required return type
-     * @throws IllegalArgumentException if the given type is {@code void.class}
-     */
-    public static
-    MethodHandle constant(Class<?> type, Object value) {
-        if (type.isPrimitive()) {
-            if (type == void.class)
-                throw newIllegalArgumentException("void type");
-            Wrapper w = Wrapper.forPrimitiveType(type);
-            return insertArguments(identity(type), 0, w.convert(value, type));
-        } else {
-            return identity(type).bindTo(type.cast(value));
-        }
-    }
-
-    /**
-     * Produces a method handle which returns its sole argument when invoked.
-     * @param type the type of the sole parameter and return value of the desired method handle
-     * @return a unary method handle which accepts and returns the given type
-     * @throws NullPointerException if the argument is null
-     * @throws IllegalArgumentException if the given type is {@code void.class}
-     */
-    public static
-    MethodHandle identity(Class<?> type) {
-        if (type == void.class)
-            throw newIllegalArgumentException("void type");
-        else if (type == Object.class)
-            return ValueConversions.identity();
-        else if (type.isPrimitive())
-            return ValueConversions.identity(Wrapper.forPrimitiveType(type));
-        else
-            return AdapterMethodHandle.makeRetypeRaw(
-                    MethodType.methodType(type, type), ValueConversions.identity());
-    }
-
-    /**
-     * Provides a target method handle with one or more <em>bound arguments</em>
-     * in advance of the method handle's invocation.
-     * The formal parameters to the target corresponding to the bound
-     * arguments are called <em>bound parameters</em>.
-     * Returns a new method handle which saves away the bound arguments.
-     * When it is invoked, it receives arguments for any non-bound parameters,
-     * binds the saved arguments to their corresponding parameters,
-     * and calls the original target.
-     * <p>
-     * The type of the new method handle will drop the types for the bound
-     * parameters from the original target type, since the new method handle
-     * will no longer require those arguments to be supplied by its callers.
-     * <p>
-     * Each given argument object must match the corresponding bound parameter type.
-     * If a bound parameter type is a primitive, the argument object
-     * must be a wrapper, and will be unboxed to produce the primitive value.
-     * <p>
-     * The {@code pos} argument selects which parameters are to be bound.
-     * It may range between zero and <i>N-L</i> (inclusively),
-     * where <i>N</i> is the arity of the target method handle
-     * and <i>L</i> is the length of the values array.
-     * @param target the method handle to invoke after the argument is inserted
-     * @param pos where to insert the argument (zero for the first)
-     * @param values the series of arguments to insert
-     * @return a method handle which inserts an additional argument,
-     *         before calling the original method handle
-     * @throws NullPointerException if the target or the {@code values} array is null
-     * @see MethodHandle#bindTo
-     */
-    public static
-    MethodHandle insertArguments(MethodHandle target, int pos, Object... values) {
-        int insCount = values.length;
-        MethodType oldType = target.type();
-        int outargs = oldType.parameterCount();
-        int inargs  = outargs - insCount;
-        if (inargs < 0)
-            throw newIllegalArgumentException("too many values to insert");
-        if (pos < 0 || pos > inargs)
-            throw newIllegalArgumentException("no argument type to append");
-        MethodHandle result = target;
-        for (int i = 0; i < insCount; i++) {
-            Object value = values[i];
-            Class<?> valueType = oldType.parameterType(pos+i);
-            value = checkValue(valueType, value);
-            if (pos == 0 && !valueType.isPrimitive()) {
-                // At least for now, make bound method handles a special case.
-                MethodHandle bmh = MethodHandleImpl.bindReceiver(result, value);
-                if (bmh != null) {
-                    result = bmh;
-                    continue;
-                }
-                // else fall through to general adapter machinery
-            }
-            result = MethodHandleImpl.bindArgument(result, pos, value);
-        }
-        return result;
-    }
-
-    /**
-     * Produces a method handle which will discard some dummy arguments
-     * before calling some other specified <i>target</i> method handle.
-     * The type of the new method handle will be the same as the target's type,
-     * except it will also include the dummy argument types,
-     * at some given position.
-     * <p>
-     * The {@code pos} argument may range between zero and <i>N</i>,
-     * where <i>N</i> is the arity of the target.
-     * If {@code pos} is zero, the dummy arguments will precede
-     * the target's real arguments; if {@code pos} is <i>N</i>
-     * they will come after.
-     * <p>
-     * <b>Example:</b>
-     * <p><blockquote><pre>
-import static java.lang.invoke.MethodHandles.*;
-import static java.lang.invoke.MethodType.*;
-...
-MethodHandle cat = lookup().findVirtual(String.class,
-  "concat", methodType(String.class, String.class));
-assertEquals("xy", (String) cat.invokeExact("x", "y"));
-MethodType bigType = cat.type().insertParameterTypes(0, int.class, String.class);
-MethodHandle d0 = dropArguments(cat, 0, bigType.parameterList().subList(0,2));
-assertEquals(bigType, d0.type());
-assertEquals("yz", (String) d0.invokeExact(123, "x", "y", "z"));
-     * </pre></blockquote>
-     * <p>
-     * This method is also equivalent to the following code:
-     * <p><blockquote><pre>
-     * {@link #dropArguments(MethodHandle,int,Class...) dropArguments}(target, pos, valueTypes.toArray(new Class[0]))
-     * </pre></blockquote>
-     * @param target the method handle to invoke after the arguments are dropped
-     * @param valueTypes the type(s) of the argument(s) to drop
-     * @param pos position of first argument to drop (zero for the leftmost)
-     * @return a method handle which drops arguments of the given types,
-     *         before calling the original method handle
-     * @throws NullPointerException if the target is null,
-     *                              or if the {@code valueTypes} list or any of its elements is null
-     * @throws IllegalArgumentException if any element of {@code valueTypes} is {@code void.class},
-     *                  or if {@code pos} is negative or greater than the arity of the target,
-     *                  or if the new method handle's type would have too many parameters
-     */
-    public static
-    MethodHandle dropArguments(MethodHandle target, int pos, List<Class<?>> valueTypes) {
-        MethodType oldType = target.type();  // get NPE
-        if (valueTypes.size() == 0)  return target;
-        int outargs = oldType.parameterCount();
-        int inargs  = outargs + valueTypes.size();
-        if (pos < 0 || pos >= inargs)
-            throw newIllegalArgumentException("no argument type to remove");
-        ArrayList<Class<?>> ptypes =
-                new ArrayList<Class<?>>(oldType.parameterList());
-        ptypes.addAll(pos, valueTypes);
-        MethodType newType = MethodType.methodType(oldType.returnType(), ptypes);
-        return MethodHandleImpl.dropArguments(target, newType, pos);
-    }
-
-    /**
-     * Produces a method handle which will discard some dummy arguments
-     * before calling some other specified <i>target</i> method handle.
-     * The type of the new method handle will be the same as the target's type,
-     * except it will also include the dummy argument types,
-     * at some given position.
-     * <p>
-     * The {@code pos} argument may range between zero and <i>N</i>,
-     * where <i>N</i> is the arity of the target.
-     * If {@code pos} is zero, the dummy arguments will precede
-     * the target's real arguments; if {@code pos} is <i>N</i>
-     * they will come after.
-     * <p>
-     * <b>Example:</b>
-     * <p><blockquote><pre>
-import static java.lang.invoke.MethodHandles.*;
-import static java.lang.invoke.MethodType.*;
-...
-MethodHandle cat = lookup().findVirtual(String.class,
-  "concat", methodType(String.class, String.class));
-assertEquals("xy", (String) cat.invokeExact("x", "y"));
-MethodHandle d0 = dropArguments(cat, 0, String.class);
-assertEquals("yz", (String) d0.invokeExact("x", "y", "z"));
-MethodHandle d1 = dropArguments(cat, 1, String.class);
-assertEquals("xz", (String) d1.invokeExact("x", "y", "z"));
-MethodHandle d2 = dropArguments(cat, 2, String.class);
-assertEquals("xy", (String) d2.invokeExact("x", "y", "z"));
-MethodHandle d12 = dropArguments(cat, 1, int.class, boolean.class);
-assertEquals("xz", (String) d12.invokeExact("x", 12, true, "z"));
-     * </pre></blockquote>
-     * <p>
-     * This method is also equivalent to the following code:
-     * <p><blockquote><pre>
-     * {@link #dropArguments(MethodHandle,int,List) dropArguments}(target, pos, Arrays.asList(valueTypes))
-     * </pre></blockquote>
-     * @param target the method handle to invoke after the arguments are dropped
-     * @param valueTypes the type(s) of the argument(s) to drop
-     * @param pos position of first argument to drop (zero for the leftmost)
-     * @return a method handle which drops arguments of the given types,
-     *         before calling the original method handle
-     * @throws NullPointerException if the target is null,
-     *                              or if the {@code valueTypes} array or any of its elements is null
-     * @throws IllegalArgumentException if any element of {@code valueTypes} is {@code void.class},
-     *                  or if {@code pos} is negative or greater than the arity of the target,
-     *                  or if the new method handle's type would have too many parameters
-     */
-    public static
-    MethodHandle dropArguments(MethodHandle target, int pos, Class<?>... valueTypes) {
-        return dropArguments(target, pos, Arrays.asList(valueTypes));
-    }
-
-    /**
-     * Adapts a target method handle by pre-processing
-     * one or more of its arguments, each with its own unary filter function,
-     * and then calling the target with each pre-processed argument
-     * replaced by the result of its corresponding filter function.
-     * <p>
-     * The pre-processing is performed by one or more method handles,
-     * specified in the elements of the {@code filters} array.
-     * The first element of the filter array corresponds to the {@code pos}
-     * argument of the target, and so on in sequence.
-     * <p>
-     * Null arguments in the array are treated as identity functions,
-     * and the corresponding arguments left unchanged.
-     * (If there are no non-null elements in the array, the original target is returned.)
-     * Each filter is applied to the corresponding argument of the adapter.
-     * <p>
-     * If a filter {@code F} applies to the {@code N}th argument of
-     * the target, then {@code F} must be a method handle which
-     * takes exactly one argument.  The type of {@code F}'s sole argument
-     * replaces the corresponding argument type of the target
-     * in the resulting adapted method handle.
-     * The return type of {@code F} must be identical to the corresponding
-     * parameter type of the target.
-     * <p>
-     * It is an error if there are elements of {@code filters}
-     * (null or not)
-     * which do not correspond to argument positions in the target.
-     * <b>Example:</b>
-     * <p><blockquote><pre>
-import static java.lang.invoke.MethodHandles.*;
-import static java.lang.invoke.MethodType.*;
-...
-MethodHandle cat = lookup().findVirtual(String.class,
-  "concat", methodType(String.class, String.class));
-MethodHandle upcase = lookup().findVirtual(String.class,
-  "toUpperCase", methodType(String.class));
-assertEquals("xy", (String) cat.invokeExact("x", "y"));
-MethodHandle f0 = filterArguments(cat, 0, upcase);
-assertEquals("Xy", (String) f0.invokeExact("x", "y")); // Xy
-MethodHandle f1 = filterArguments(cat, 1, upcase);
-assertEquals("xY", (String) f1.invokeExact("x", "y")); // xY
-MethodHandle f2 = filterArguments(cat, 0, upcase, upcase);
-assertEquals("XY", (String) f2.invokeExact("x", "y")); // XY
-     * </pre></blockquote>
-     * <p> Here is pseudocode for the resulting adapter:
-     * <blockquote><pre>
-     * V target(P... p, A[i]... a[i], B... b);
-     * A[i] filter[i](V[i]);
-     * T adapter(P... p, V[i]... v[i], B... b) {
-     *   return target(p..., f[i](v[i])..., b...);
-     * }
-     * </pre></blockquote>
-     *
-     * @param target the method handle to invoke after arguments are filtered
-     * @param pos the position of the first argument to filter
-     * @param filters method handles to call initially on filtered arguments
-     * @return method handle which incorporates the specified argument filtering logic
-     * @throws NullPointerException if the target is null
-     *                              or if the {@code filters} array is null
-     * @throws IllegalArgumentException if a non-null element of {@code filters}
-     *          does not match a corresponding argument type of target as described above,
-     *          or if the {@code pos+filters.length} is greater than {@code target.type().parameterCount()}
-     */
-    public static
-    MethodHandle filterArguments(MethodHandle target, int pos, MethodHandle... filters) {
-        MethodType targetType = target.type();
-        MethodHandle adapter = target;
-        MethodType adapterType = null;
-        assert((adapterType = targetType) != null);
-        int maxPos = targetType.parameterCount();
-        if (pos + filters.length > maxPos)
-            throw newIllegalArgumentException("too many filters");
-        int curPos = pos-1;  // pre-incremented
-        for (MethodHandle filter : filters) {
-            curPos += 1;
-            if (filter == null)  continue;  // ignore null elements of filters
-            adapter = filterArgument(adapter, curPos, filter);
-            assert((adapterType = adapterType.changeParameterType(curPos, filter.type().parameterType(0))) != null);
-        }
-        assert(adapterType.equals(adapter.type()));
-        return adapter;
-    }
-
-    /*non-public*/ static
-    MethodHandle filterArgument(MethodHandle target, int pos, MethodHandle filter) {
-        MethodType targetType = target.type();
-        MethodType filterType = filter.type();
-        if (filterType.parameterCount() != 1
-            || filterType.returnType() != targetType.parameterType(pos))
-            throw newIllegalArgumentException("target and filter types do not match", targetType, filterType);
-        return MethodHandleImpl.filterArgument(target, pos, filter);
-    }
-
-    /**
-     * Adapts a target method handle by post-processing
-     * its return value (if any) with a filter (another method handle).
-     * The result of the filter is returned from the adapter.
-     * <p>
-     * If the target returns a value, the filter must accept that value as
-     * its only argument.
-     * If the target returns void, the filter must accept no arguments.
-     * <p>
-     * The return type of the filter
-     * replaces the return type of the target
-     * in the resulting adapted method handle.
-     * The argument type of the filter (if any) must be identical to the
-     * return type of the target.
-     * <b>Example:</b>
-     * <p><blockquote><pre>
-import static java.lang.invoke.MethodHandles.*;
-import static java.lang.invoke.MethodType.*;
-...
-MethodHandle cat = lookup().findVirtual(String.class,
-  "concat", methodType(String.class, String.class));
-MethodHandle length = lookup().findVirtual(String.class,
-  "length", methodType(int.class));
-System.out.println((String) cat.invokeExact("x", "y")); // xy
-MethodHandle f0 = filterReturnValue(cat, length);
-System.out.println((int) f0.invokeExact("x", "y")); // 2
-     * </pre></blockquote>
-     * <p> Here is pseudocode for the resulting adapter:
-     * <blockquote><pre>
-     * V target(A...);
-     * T filter(V);
-     * T adapter(A... a) {
-     *   V v = target(a...);
-     *   return filter(v);
-     * }
-     * // and if the target has a void return:
-     * void target2(A...);
-     * T filter2();
-     * T adapter2(A... a) {
-     *   target2(a...);
-     *   return filter2();
-     * }
-     * // and if the filter has a void return:
-     * V target3(A...);
-     * void filter3(V);
-     * void adapter3(A... a) {
-     *   V v = target3(a...);
-     *   filter3(v);
-     * }
-     * </pre></blockquote>
-     * @param target the method handle to invoke before filtering the return value
-     * @param filter method handle to call on the return value
-     * @return method handle which incorporates the specified return value filtering logic
-     * @throws NullPointerException if either argument is null
-     * @throws IllegalArgumentException if the argument list of {@code filter}
-     *          does not match the return type of target as described above
-     */
-    public static
-    MethodHandle filterReturnValue(MethodHandle target, MethodHandle filter) {
-        MethodType targetType = target.type();
-        MethodType filterType = filter.type();
-        Class<?> rtype = targetType.returnType();
-        int filterValues = filterType.parameterCount();
-        if (filterValues == 0
-                ? (rtype != void.class)
-                : (rtype != filterType.parameterType(0)))
-            throw newIllegalArgumentException("target and filter types do not match", target, filter);
-        // result = fold( lambda(retval, arg...) { filter(retval) },
-        //                lambda(        arg...) { target(arg...) } )
-        MethodType newType = targetType.changeReturnType(filterType.returnType());
-        MethodHandle result = null;
-        if (AdapterMethodHandle.canCollectArguments(filterType, targetType, 0, false)) {
-            result = AdapterMethodHandle.makeCollectArguments(filter, target, 0, false);
-            if (result != null)  return result;
-        }
-        // FIXME: Too many nodes here.
-        assert(MethodHandleNatives.workaroundWithoutRicochetFrames());  // this class is deprecated
-        MethodHandle returner = dropArguments(filter, filterValues, targetType.parameterList());
-        result = foldArguments(returner, target);
-        assert(result.type().equals(newType));
-        return result;
-    }
-
-    /**
-     * Adapts a target method handle by pre-processing
-     * some of its arguments, and then calling the target with
-     * the result of the pre-processing, inserted into the original
-     * sequence of arguments.
-     * <p>
-     * The pre-processing is performed by {@code combiner}, a second method handle.
-     * Of the arguments passed to the adapter, the first {@code N} arguments
-     * are copied to the combiner, which is then called.
-     * (Here, {@code N} is defined as the parameter count of the combiner.)
-     * After this, control passes to the target, with any result
-     * from the combiner inserted before the original {@code N} incoming
-     * arguments.
-     * <p>
-     * If the combiner returns a value, the first parameter type of the target
-     * must be identical with the return type of the combiner, and the next
-     * {@code N} parameter types of the target must exactly match the parameters
-     * of the combiner.
-     * <p>
-     * If the combiner has a void return, no result will be inserted,
-     * and the first {@code N} parameter types of the target
-     * must exactly match the parameters of the combiner.
-     * <p>
-     * The resulting adapter is the same type as the target, except that the
-     * first parameter type is dropped,
-     * if it corresponds to the result of the combiner.
-     * <p>
-     * (Note that {@link #dropArguments(MethodHandle,int,List) dropArguments} can be used to remove any arguments
-     * that either the combiner or the target does not wish to receive.
-     * If some of the incoming arguments are destined only for the combiner,
-     * consider using {@link MethodHandle#asCollector asCollector} instead, since those
-     * arguments will not need to be live on the stack on entry to the
-     * target.)
-     * <b>Example:</b>
-     * <p><blockquote><pre>
-import static java.lang.invoke.MethodHandles.*;
-import static java.lang.invoke.MethodType.*;
-...
-MethodHandle trace = publicLookup().findVirtual(java.io.PrintStream.class,
-  "println", methodType(void.class, String.class))
-    .bindTo(System.out);
-MethodHandle cat = lookup().findVirtual(String.class,
-  "concat", methodType(String.class, String.class));
-assertEquals("boojum", (String) cat.invokeExact("boo", "jum"));
-MethodHandle catTrace = foldArguments(cat, trace);
-// also prints "boo":
-assertEquals("boojum", (String) catTrace.invokeExact("boo", "jum"));
-     * </pre></blockquote>
-     * <p> Here is pseudocode for the resulting adapter:
-     * <blockquote><pre>
-     * // there are N arguments in A...
-     * T target(V, A[N]..., B...);
-     * V combiner(A...);
-     * T adapter(A... a, B... b) {
-     *   V v = combiner(a...);
-     *   return target(v, a..., b...);
-     * }
-     * // and if the combiner has a void return:
-     * T target2(A[N]..., B...);
-     * void combiner2(A...);
-     * T adapter2(A... a, B... b) {
-     *   combiner2(a...);
-     *   return target2(a..., b...);
-     * }
-     * </pre></blockquote>
-     * @param target the method handle to invoke after arguments are combined
-     * @param combiner method handle to call initially on the incoming arguments
-     * @return method handle which incorporates the specified argument folding logic
-     * @throws NullPointerException if either argument is null
-     * @throws IllegalArgumentException if {@code combiner}'s return type
-     *          is non-void and not the same as the first argument type of
-     *          the target, or if the initial {@code N} argument types
-     *          of the target
-     *          (skipping one matching the {@code combiner}'s return type)
-     *          are not identical with the argument types of {@code combiner}
-     */
-    public static
-    MethodHandle foldArguments(MethodHandle target, MethodHandle combiner) {
-        int pos = 0;
-        MethodType targetType = target.type();
-        MethodType combinerType = combiner.type();
-        int foldPos = pos;
-        int foldArgs = combinerType.parameterCount();
-        int foldVals = combinerType.returnType() == void.class ? 0 : 1;
-        int afterInsertPos = foldPos + foldVals;
-        boolean ok = (targetType.parameterCount() >= afterInsertPos + foldArgs);
-        if (ok && !(combinerType.parameterList()
-                    .equals(targetType.parameterList().subList(afterInsertPos,
-                                                               afterInsertPos + foldArgs))))
-            ok = false;
-        if (ok && foldVals != 0 && !combinerType.returnType().equals(targetType.parameterType(0)))
-            ok = false;
-        if (!ok)
-            throw misMatchedTypes("target and combiner types", targetType, combinerType);
-        MethodType newType = targetType.dropParameterTypes(foldPos, afterInsertPos);
-        MethodHandle res = MethodHandleImpl.foldArguments(target, newType, foldPos, combiner);
-        if (res == null)  throw newIllegalArgumentException("cannot fold from "+newType+" to " +targetType);
-        return res;
-    }
-
-    /**
-     * Makes a method handle which adapts a target method handle,
-     * by guarding it with a test, a boolean-valued method handle.
-     * If the guard fails, a fallback handle is called instead.
-     * All three method handles must have the same corresponding
-     * argument and return types, except that the return type
-     * of the test must be boolean, and the test is allowed
-     * to have fewer arguments than the other two method handles.
-     * <p> Here is pseudocode for the resulting adapter:
-     * <blockquote><pre>
-     * boolean test(A...);
-     * T target(A...,B...);
-     * T fallback(A...,B...);
-     * T adapter(A... a,B... b) {
-     *   if (test(a...))
-     *     return target(a..., b...);
-     *   else
-     *     return fallback(a..., b...);
-     * }
-     * </pre></blockquote>
-     * Note that the test arguments ({@code a...} in the pseudocode) cannot
-     * be modified by execution of the test, and so are passed unchanged
-     * from the caller to the target or fallback as appropriate.
-     * @param test method handle used for test, must return boolean
-     * @param target method handle to call if test passes
-     * @param fallback method handle to call if test fails
-     * @return method handle which incorporates the specified if/then/else logic
-     * @throws NullPointerException if any argument is null
-     * @throws IllegalArgumentException if {@code test} does not return boolean,
-     *          or if all three method types do not match (with the return
-     *          type of {@code test} changed to match that of the target).
-     */
-    public static
-    MethodHandle guardWithTest(MethodHandle test,
-                               MethodHandle target,
-                               MethodHandle fallback) {
-        MethodType gtype = test.type();
-        MethodType ttype = target.type();
-        MethodType ftype = fallback.type();
-        if (!ttype.equals(ftype))
-            throw misMatchedTypes("target and fallback types", ttype, ftype);
-        if (gtype.returnType() != boolean.class)
-            throw newIllegalArgumentException("guard type is not a predicate "+gtype);
-        List<Class<?>> targs = ttype.parameterList();
-        List<Class<?>> gargs = gtype.parameterList();
-        if (!targs.equals(gargs)) {
-            int gpc = gargs.size(), tpc = targs.size();
-            if (gpc >= tpc || !targs.subList(0, gpc).equals(gargs))
-                throw misMatchedTypes("target and test types", ttype, gtype);
-            test = dropArguments(test, gpc, targs.subList(gpc, tpc));
-            gtype = test.type();
-        }
-        return MethodHandleImpl.makeGuardWithTest(test, target, fallback);
-    }
-
-    static RuntimeException misMatchedTypes(String what, MethodType t1, MethodType t2) {
-        return newIllegalArgumentException(what + " must match: " + t1 + " != " + t2);
-    }
-
-    /**
-     * Makes a method handle which adapts a target method handle,
-     * by running it inside an exception handler.
-     * If the target returns normally, the adapter returns that value.
-     * If an exception matching the specified type is thrown, the fallback
-     * handle is called instead on the exception, plus the original arguments.
-     * <p>
-     * The target and handler must have the same corresponding
-     * argument and return types, except that handler may omit trailing arguments
-     * (similarly to the predicate in {@link #guardWithTest guardWithTest}).
-     * Also, the handler must have an extra leading parameter of {@code exType} or a supertype.
-     * <p> Here is pseudocode for the resulting adapter:
-     * <blockquote><pre>
-     * T target(A..., B...);
-     * T handler(ExType, A...);
-     * T adapter(A... a, B... b) {
-     *   try {
-     *     return target(a..., b...);
-     *   } catch (ExType ex) {
-     *     return handler(ex, a...);
-     *   }
-     * }
-     * </pre></blockquote>
-     * Note that the saved arguments ({@code a...} in the pseudocode) cannot
-     * be modified by execution of the target, and so are passed unchanged
-     * from the caller to the handler, if the handler is invoked.
-     * <p>
-     * The target and handler must return the same type, even if the handler
-     * always throws.  (This might happen, for instance, because the handler
-     * is simulating a {@code finally} clause).
-     * To create such a throwing handler, compose the handler creation logic
-     * with {@link #throwException throwException},
-     * in order to create a method handle of the correct return type.
-     * @param target method handle to call
-     * @param exType the type of exception which the handler will catch
-     * @param handler method handle to call if a matching exception is thrown
-     * @return method handle which incorporates the specified try/catch logic
-     * @throws NullPointerException if any argument is null
-     * @throws IllegalArgumentException if {@code handler} does not accept
-     *          the given exception type, or if the method handle types do
-     *          not match in their return types and their
-     *          corresponding parameters
-     */
-    public static
-    MethodHandle catchException(MethodHandle target,
-                                Class<? extends Throwable> exType,
-                                MethodHandle handler) {
-        MethodType ttype = target.type();
-        MethodType htype = handler.type();
-        if (htype.parameterCount() < 1 ||
-            !htype.parameterType(0).isAssignableFrom(exType))
-            throw newIllegalArgumentException("handler does not accept exception type "+exType);
-        if (htype.returnType() != ttype.returnType())
-            throw misMatchedTypes("target and handler return types", ttype, htype);
-        List<Class<?>> targs = ttype.parameterList();
-        List<Class<?>> hargs = htype.parameterList();
-        hargs = hargs.subList(1, hargs.size());  // omit leading parameter from handler
-        if (!targs.equals(hargs)) {
-            int hpc = hargs.size(), tpc = targs.size();
-            if (hpc >= tpc || !targs.subList(0, hpc).equals(hargs))
-                throw misMatchedTypes("target and handler types", ttype, htype);
-            handler = dropArguments(handler, 1+hpc, targs.subList(hpc, tpc));
-            htype = handler.type();
-        }
-        return MethodHandleImpl.makeGuardWithCatch(target, exType, handler);
-    }
-
-    /**
-     * Produces a method handle which will throw exceptions of the given {@code exType}.
-     * The method handle will accept a single argument of {@code exType},
-     * and immediately throw it as an exception.
-     * The method type will nominally specify a return of {@code returnType}.
-     * The return type may be anything convenient:  It doesn't matter to the
-     * method handle's behavior, since it will never return normally.
-     * @return method handle which can throw the given exceptions
-     * @throws NullPointerException if either argument is null
-     */
-    public static
-    MethodHandle throwException(Class<?> returnType, Class<? extends Throwable> exType) {
-        return MethodHandleImpl.throwException(MethodType.methodType(returnType, exType));
-    }
-}
diff --git a/openjdk/java/lang/invoke/MutableCallSite.java b/openjdk/java/lang/invoke/MutableCallSite.java
deleted file mode 100644
index d48f99af..00000000
--- a/openjdk/java/lang/invoke/MutableCallSite.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.invoke;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * A {@code MutableCallSite} is a {@link CallSite} whose target variable
- * behaves like an ordinary field.
- * An {@code invokedynamic} instruction linked to a {@code MutableCallSite} delegates
- * all calls to the site's current target.
- * The {@linkplain CallSite#dynamicInvoker dynamic invoker} of a mutable call site
- * also delegates each call to the site's current target.
- * <p>
- * Here is an example of a mutable call site which introduces a
- * state variable into a method handle chain.
- * <!-- JavaDocExamplesTest.testMutableCallSite -->
- * <blockquote><pre>
-MutableCallSite name = new MutableCallSite(MethodType.methodType(String.class));
-MethodHandle MH_name = name.dynamicInvoker();
-MethodType MT_str1 = MethodType.methodType(String.class);
-MethodHandle MH_upcase = MethodHandles.lookup()
-    .findVirtual(String.class, "toUpperCase", MT_str1);
-MethodHandle worker1 = MethodHandles.filterReturnValue(MH_name, MH_upcase);
-name.setTarget(MethodHandles.constant(String.class, "Rocky"));
-assertEquals("ROCKY", (String) worker1.invokeExact());
-name.setTarget(MethodHandles.constant(String.class, "Fred"));
-assertEquals("FRED", (String) worker1.invokeExact());
-// (mutation can be continued indefinitely)
- * </pre></blockquote>
- * <p>
- * The same call site may be used in several places at once.
- * <blockquote><pre>
-MethodType MT_str2 = MethodType.methodType(String.class, String.class);
-MethodHandle MH_cat = lookup().findVirtual(String.class,
-  "concat", methodType(String.class, String.class));
-MethodHandle MH_dear = MethodHandles.insertArguments(MH_cat, 1, ", dear?");
-MethodHandle worker2 = MethodHandles.filterReturnValue(MH_name, MH_dear);
-assertEquals("Fred, dear?", (String) worker2.invokeExact());
-name.setTarget(MethodHandles.constant(String.class, "Wilma"));
-assertEquals("WILMA", (String) worker1.invokeExact());
-assertEquals("Wilma, dear?", (String) worker2.invokeExact());
- * </pre></blockquote>
- * <p>
- * <em>Non-synchronization of target values:</em>
- * A write to a mutable call site's target does not force other threads
- * to become aware of the updated value.  Threads which do not perform
- * suitable synchronization actions relative to the updated call site
- * may cache the old target value and delay their use of the new target
- * value indefinitely.
- * (This is a normal consequence of the Java Memory Model as applied
- * to object fields.)
- * <p>
- * The {@link #syncAll syncAll} operation provides a way to force threads
- * to accept a new target value, even if there is no other synchronization.
- * <p>
- * For target values which will be frequently updated, consider using
- * a {@linkplain VolatileCallSite volatile call site} instead.
- * @author John Rose, JSR 292 EG
- */
-public class MutableCallSite extends CallSite {
-    /**
-     * Creates a blank call site object with the given method type.
-     * The initial target is set to a method handle of the given type
-     * which will throw an {@link IllegalStateException} if called.
-     * <p>
-     * The type of the call site is permanently set to the given type.
-     * <p>
-     * Before this {@code CallSite} object is returned from a bootstrap method,
-     * or invoked in some other manner,
-     * it is usually provided with a more useful target method,
-     * via a call to {@link CallSite#setTarget(MethodHandle) setTarget}.
-     * @param type the method type that this call site will have
-     * @throws NullPointerException if the proposed type is null
-     */
-    public MutableCallSite(MethodType type) {
-        super(type);
-    }
-
-    /**
-     * Creates a call site object with an initial target method handle.
-     * The type of the call site is permanently set to the initial target's type.
-     * @param target the method handle that will be the initial target of the call site
-     * @throws NullPointerException if the proposed target is null
-     */
-    public MutableCallSite(MethodHandle target) {
-        super(target);
-    }
-
-    /**
-     * Returns the target method of the call site, which behaves
-     * like a normal field of the {@code MutableCallSite}.
-     * <p>
-     * The interactions of {@code getTarget} with memory are the same
-     * as of a read from an ordinary variable, such as an array element or a
-     * non-volatile, non-final field.
-     * <p>
-     * In particular, the current thread may choose to reuse the result
-     * of a previous read of the target from memory, and may fail to see
-     * a recent update to the target by another thread.
-     *
-     * @return the linkage state of this call site, a method handle which can change over time
-     * @see #setTarget
-     */
-    @Override public final MethodHandle getTarget() {
-        return target;
-    }
-
-    /**
-     * Updates the target method of this call site, as a normal variable.
-     * The type of the new target must agree with the type of the old target.
-     * <p>
-     * The interactions with memory are the same
-     * as of a write to an ordinary variable, such as an array element or a
-     * non-volatile, non-final field.
-     * <p>
-     * In particular, unrelated threads may fail to see the updated target
-     * until they perform a read from memory.
-     * Stronger guarantees can be created by putting appropriate operations
-     * into the bootstrap method and/or the target methods used
-     * at any given call site.
-     *
-     * @param newTarget the new target
-     * @throws NullPointerException if the proposed new target is null
-     * @throws WrongMethodTypeException if the proposed new target
-     *         has a method type that differs from the previous target
-     * @see #getTarget
-     */
-    @Override public void setTarget(MethodHandle newTarget) {
-        checkTargetChange(this.target, newTarget);
-        setTargetNormal(newTarget);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public final MethodHandle dynamicInvoker() {
-        return makeDynamicInvoker();
-    }
-
-    /**
-     * Performs a synchronization operation on each call site in the given array,
-     * forcing all other threads to throw away any cached values previously
-     * loaded from the target of any of the call sites.
-     * <p>
-     * This operation does not reverse any calls that have already started
-     * on an old target value.
-     * (Java supports {@linkplain java.lang.Object#wait() forward time travel} only.)
-     * <p>
-     * The overall effect is to force all future readers of each call site's target
-     * to accept the most recently stored value.
-     * ("Most recently" is reckoned relative to the {@code syncAll} itself.)
-     * Conversely, the {@code syncAll} call may block until all readers have
-     * (somehow) decached all previous versions of each call site's target.
-     * <p>
-     * To avoid race conditions, calls to {@code setTarget} and {@code syncAll}
-     * should generally be performed under some sort of mutual exclusion.
-     * Note that reader threads may observe an updated target as early
-     * as the {@code setTarget} call that install the value
-     * (and before the {@code syncAll} that confirms the value).
-     * On the other hand, reader threads may observe previous versions of
-     * the target until the {@code syncAll} call returns
-     * (and after the {@code setTarget} that attempts to convey the updated version).
-     * <p>
-     * This operation is likely to be expensive and should be used sparingly.
-     * If possible, it should be buffered for batch processing on sets of call sites.
-     * <p>
-     * If {@code sites} contains a null element,
-     * a {@code NullPointerException} will be raised.
-     * In this case, some non-null elements in the array may be
-     * processed before the method returns abnormally.
-     * Which elements these are (if any) is implementation-dependent.
-     *
-     * <h3>Java Memory Model details</h3>
-     * In terms of the Java Memory Model, this operation performs a synchronization
-     * action which is comparable in effect to the writing of a volatile variable
-     * by the current thread, and an eventual volatile read by every other thread
-     * that may access one of the affected call sites.
-     * <p>
-     * The following effects are apparent, for each individual call site {@code S}:
-     * <ul>
-     * <li>A new volatile variable {@code V} is created, and written by the current thread.
-     *     As defined by the JMM, this write is a global synchronization event.
-     * <li>As is normal with thread-local ordering of write events,
-     *     every action already performed by the current thread is
-     *     taken to happen before the volatile write to {@code V}.
-     *     (In some implementations, this means that the current thread
-     *     performs a global release operation.)
-     * <li>Specifically, the write to the current target of {@code S} is
-     *     taken to happen before the volatile write to {@code V}.
-     * <li>The volatile write to {@code V} is placed
-     *     (in an implementation specific manner)
-     *     in the global synchronization order.
-     * <li>Consider an arbitrary thread {@code T} (other than the current thread).
-     *     If {@code T} executes a synchronization action {@code A}
-     *     after the volatile write to {@code V} (in the global synchronization order),
-     *     it is therefore required to see either the current target
-     *     of {@code S}, or a later write to that target,
-     *     if it executes a read on the target of {@code S}.
-     *     (This constraint is called "synchronization-order consistency".)
-     * <li>The JMM specifically allows optimizing compilers to elide
-     *     reads or writes of variables that are known to be useless.
-     *     Such elided reads and writes have no effect on the happens-before
-     *     relation.  Regardless of this fact, the volatile {@code V}
-     *     will not be elided, even though its written value is
-     *     indeterminate and its read value is not used.
-     * </ul>
-     * Because of the last point, the implementation behaves as if a
-     * volatile read of {@code V} were performed by {@code T}
-     * immediately after its action {@code A}.  In the local ordering
-     * of actions in {@code T}, this read happens before any future
-     * read of the target of {@code S}.  It is as if the
-     * implementation arbitrarily picked a read of {@code S}'s target
-     * by {@code T}, and forced a read of {@code V} to precede it,
-     * thereby ensuring communication of the new target value.
-     * <p>
-     * As long as the constraints of the Java Memory Model are obeyed,
-     * implementations may delay the completion of a {@code syncAll}
-     * operation while other threads ({@code T} above) continue to
-     * use previous values of {@code S}'s target.
-     * However, implementations are (as always) encouraged to avoid
-     * livelock, and to eventually require all threads to take account
-     * of the updated target.
-     *
-     * <p style="font-size:smaller;">
-     * <em>Discussion:</em>
-     * For performance reasons, {@code syncAll} is not a virtual method
-     * on a single call site, but rather applies to a set of call sites.
-     * Some implementations may incur a large fixed overhead cost
-     * for processing one or more synchronization operations,
-     * but a small incremental cost for each additional call site.
-     * In any case, this operation is likely to be costly, since
-     * other threads may have to be somehow interrupted
-     * in order to make them notice the updated target value.
-     * However, it may be observed that a single call to synchronize
-     * several sites has the same formal effect as many calls,
-     * each on just one of the sites.
-     *
-     * <p style="font-size:smaller;">
-     * <em>Implementation Note:</em>
-     * Simple implementations of {@code MutableCallSite} may use
-     * a volatile variable for the target of a mutable call site.
-     * In such an implementation, the {@code syncAll} method can be a no-op,
-     * and yet it will conform to the JMM behavior documented above.
-     *
-     * @param sites an array of call sites to be synchronized
-     * @throws NullPointerException if the {@code sites} array reference is null
-     *                              or the array contains a null
-     */
-    public static void syncAll(MutableCallSite[] sites) {
-        if (sites.length == 0)  return;
-        STORE_BARRIER.lazySet(0);
-        for (int i = 0; i < sites.length; i++) {
-            sites[i].getClass();  // trigger NPE on first null
-        }
-        // FIXME: NYI
-    }
-    private static final AtomicInteger STORE_BARRIER = new AtomicInteger();
-}
diff --git a/openjdk/java/lang/invoke/VolatileCallSite.java b/openjdk/java/lang/invoke/VolatileCallSite.java
deleted file mode 100644
index de88f36b..00000000
--- a/openjdk/java/lang/invoke/VolatileCallSite.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.invoke;
-
-/**
- * A {@code VolatileCallSite} is a {@link CallSite} whose target acts like a volatile variable.
- * An {@code invokedynamic} instruction linked to a {@code VolatileCallSite} sees updates
- * to its call site target immediately, even if the update occurs in another thread.
- * There may be a performance penalty for such tight coupling between threads.
- * <p>
- * Unlike {@code MutableCallSite}, there is no
- * {@linkplain MutableCallSite#syncAll syncAll operation} on volatile
- * call sites, since every write to a volatile variable is implicitly
- * synchronized with reader threads.
- * <p>
- * In other respects, a {@code VolatileCallSite} is interchangeable
- * with {@code MutableCallSite}.
- * @see MutableCallSite
- * @author John Rose, JSR 292 EG
- */
-public class VolatileCallSite extends CallSite {
-    /**
-     * Creates a call site with a volatile binding to its target.
-     * The initial target is set to a method handle
-     * of the given type which will throw an {@code IllegalStateException} if called.
-     * @param type the method type that this call site will have
-     * @throws NullPointerException if the proposed type is null
-     */
-    public VolatileCallSite(MethodType type) {
-        super(type);
-    }
-
-    /**
-     * Creates a call site with a volatile binding to its target.
-     * The target is set to the given value.
-     * @param target the method handle that will be the initial target of the call site
-     * @throws NullPointerException if the proposed target is null
-     */
-    public VolatileCallSite(MethodHandle target) {
-        super(target);
-    }
-
-    /**
-     * Returns the target method of the call site, which behaves
-     * like a {@code volatile} field of the {@code VolatileCallSite}.
-     * <p>
-     * The interactions of {@code getTarget} with memory are the same
-     * as of a read from a {@code volatile} field.
-     * <p>
-     * In particular, the current thread is required to issue a fresh
-     * read of the target from memory, and must not fail to see
-     * a recent update to the target by another thread.
-     *
-     * @return the linkage state of this call site, a method handle which can change over time
-     * @see #setTarget
-     */
-    @Override public final MethodHandle getTarget() {
-        return getTargetVolatile();
-    }
-
-    /**
-     * Updates the target method of this call site, as a volatile variable.
-     * The type of the new target must agree with the type of the old target.
-     * <p>
-     * The interactions with memory are the same as of a write to a volatile field.
-     * In particular, any threads is guaranteed to see the updated target
-     * the next time it calls {@code getTarget}.
-     * @param newTarget the new target
-     * @throws NullPointerException if the proposed new target is null
-     * @throws WrongMethodTypeException if the proposed new target
-     *         has a method type that differs from the previous target
-     * @see #getTarget
-     */
-    @Override public void setTarget(MethodHandle newTarget) {
-        checkTargetChange(getTargetVolatile(), newTarget);
-        setTargetVolatile(newTarget);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public final MethodHandle dynamicInvoker() {
-        return makeDynamicInvoker();
-    }
-}
diff --git a/openjdk/java/lang/management/PlatformComponent.java b/openjdk/java/lang/management/PlatformComponent.java
deleted file mode 100644
index 3d29a16b..00000000
--- a/openjdk/java/lang/management/PlatformComponent.java
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.management;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.HashSet;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-
-import sun.management.ManagementFactoryHelper;
-import sun.management.Util;
-
-/**
- * This enum class defines the list of platform components
- * that provides monitoring and management support.
- * Each enum represents one MXBean interface. A MXBean
- * instance could implement one or more MXBean interfaces.
- *
- * For example, com.sun.management.GarbageCollectorMXBean
- * extends java.lang.management.GarbageCollectorMXBean
- * and there is one set of garbage collection MXBean instances,
- * each of which implements both c.s.m. and j.l.m. interfaces.
- * There are two separate enums GARBAGE_COLLECTOR
- * and SUN_GARBAGE_COLLECTOR so that ManagementFactory.getPlatformMXBeans(Class)
- * will return the list of MXBeans of the specified type.
- *
- * To add a new MXBean interface for the Java platform,
- * add a new enum constant and implement the MXBeanFetcher.
- */
-enum PlatformComponent {
-
-    /**
-     * Class loading system of the Java virtual machine.
-     */
-    CLASS_LOADING(
-        "java.lang.management.ClassLoadingMXBean",
-        "java.lang", "ClassLoading", defaultKeyProperties(),
-        true, // singleton
-        new MXBeanFetcher<ClassLoadingMXBean>() {
-            public List<ClassLoadingMXBean> getMXBeans() {
-                return Collections.singletonList(ManagementFactoryHelper.getClassLoadingMXBean());
-            }
-        }),
-
-    /**
-     * Compilation system of the Java virtual machine.
-     */
-    COMPILATION(
-        "java.lang.management.CompilationMXBean",
-        "java.lang", "Compilation", defaultKeyProperties(),
-        true, // singleton
-        new MXBeanFetcher<CompilationMXBean>() {
-            public List<CompilationMXBean> getMXBeans() {
-                CompilationMXBean m = ManagementFactoryHelper.getCompilationMXBean();
-                if (m == null) {
-                   return Collections.emptyList();
-                } else {
-                   return Collections.singletonList(m);
-                }
-            }
-        }),
-
-    /**
-     * Memory system of the Java virtual machine.
-     */
-    MEMORY(
-        "java.lang.management.MemoryMXBean",
-        "java.lang", "Memory", defaultKeyProperties(),
-        true, // singleton
-        new MXBeanFetcher<MemoryMXBean>() {
-            public List<MemoryMXBean> getMXBeans() {
-                return Collections.singletonList(ManagementFactoryHelper.getMemoryMXBean());
-            }
-        }),
-
-    /**
-     * Garbage Collector in the Java virtual machine.
-     */
-    GARBAGE_COLLECTOR(
-        "java.lang.management.GarbageCollectorMXBean",
-        "java.lang", "GarbageCollector", keyProperties("name"),
-        false, // zero or more instances
-        new MXBeanFetcher<GarbageCollectorMXBean>() {
-            public List<GarbageCollectorMXBean> getMXBeans() {
-                return ManagementFactoryHelper.
-                           getGarbageCollectorMXBeans();
-            }
-        }),
-
-    /**
-     * Memory manager in the Java virtual machine.
-     */
-    MEMORY_MANAGER(
-        "java.lang.management.MemoryManagerMXBean",
-        "java.lang", "MemoryManager", keyProperties("name"),
-        false, // zero or more instances
-        new MXBeanFetcher<MemoryManagerMXBean>() {
-            public List<MemoryManagerMXBean> getMXBeans() {
-                return ManagementFactoryHelper.getMemoryManagerMXBeans();
-            }
-        },
-        GARBAGE_COLLECTOR),
-
-    /**
-     * Memory pool in the Java virtual machine.
-     */
-    MEMORY_POOL(
-        "java.lang.management.MemoryPoolMXBean",
-        "java.lang", "MemoryPool", keyProperties("name"),
-        false, // zero or more instances
-        new MXBeanFetcher<MemoryPoolMXBean>() {
-            public List<MemoryPoolMXBean> getMXBeans() {
-                return ManagementFactoryHelper.getMemoryPoolMXBeans();
-            }
-        }),
-
-    /**
-     * Operating system on which the Java virtual machine is running
-     */
-    OPERATING_SYSTEM(
-        "java.lang.management.OperatingSystemMXBean",
-        "java.lang", "OperatingSystem", defaultKeyProperties(),
-        true, // singleton
-        new MXBeanFetcher<OperatingSystemMXBean>() {
-            public List<OperatingSystemMXBean> getMXBeans() {
-                return Collections.singletonList(ManagementFactoryHelper.getOperatingSystemMXBean());
-            }
-        }),
-
-    /**
-     * Runtime system of the Java virtual machine.
-     */
-    RUNTIME(
-        "java.lang.management.RuntimeMXBean",
-        "java.lang", "Runtime", defaultKeyProperties(),
-        true, // singleton
-        new MXBeanFetcher<RuntimeMXBean>() {
-            public List<RuntimeMXBean> getMXBeans() {
-                return Collections.singletonList(ManagementFactoryHelper.getRuntimeMXBean());
-            }
-        }),
-
-    /**
-     * Threading system of the Java virtual machine.
-     */
-    THREADING(
-        "java.lang.management.ThreadMXBean",
-        "java.lang", "Threading", defaultKeyProperties(),
-        true, // singleton
-        new MXBeanFetcher<ThreadMXBean>() {
-            public List<ThreadMXBean> getMXBeans() {
-                return Collections.singletonList(ManagementFactoryHelper.getThreadMXBean());
-            }
-        }),
-
-
-    /**
-     * Logging facility.
-     */
-    LOGGING(
-        "java.lang.management.PlatformLoggingMXBean",
-        "java.util.logging", "Logging", defaultKeyProperties(),
-        true, // singleton
-        new MXBeanFetcher<PlatformLoggingMXBean>() {
-            public List<PlatformLoggingMXBean> getMXBeans() {
-                PlatformLoggingMXBean m = ManagementFactoryHelper.getPlatformLoggingMXBean();
-                if (m == null) {
-                   return Collections.emptyList();
-                } else {
-                   return Collections.singletonList(m);
-                }
-            }
-        }),
-
-    /**
-     * Buffer pools.
-     */
-    BUFFER_POOL(
-        "java.lang.management.BufferPoolMXBean",
-        "java.nio", "BufferPool", keyProperties("name"),
-        false, // zero or more instances
-        new MXBeanFetcher<BufferPoolMXBean>() {
-            public List<BufferPoolMXBean> getMXBeans() {
-                return ManagementFactoryHelper.getBufferPoolMXBeans();
-            }
-        });
-
-    /**
-     * A task that returns the MXBeans for a component.
-     */
-    interface MXBeanFetcher<T extends PlatformManagedObject> {
-        public List<T> getMXBeans();
-    }
-
-    /*
-     * Returns a list of the GC MXBeans of the given type.
-     */
-    private static <T extends GarbageCollectorMXBean>
-            List<T> getGcMXBeanList(Class<T> gcMXBeanIntf) {
-        List<GarbageCollectorMXBean> list =
-            ManagementFactoryHelper.getGarbageCollectorMXBeans();
-        List<T> result = new ArrayList<>(list.size());
-        for (GarbageCollectorMXBean m : list) {
-            if (gcMXBeanIntf.isInstance(m)) {
-                result.add(gcMXBeanIntf.cast(m));
-            }
-        }
-        return result;
-    }
-
-    /*
-     * Returns the OS mxbean instance of the given type.
-     */
-    private static <T extends OperatingSystemMXBean>
-            List<T> getOSMXBeanList(Class<T> osMXBeanIntf) {
-        OperatingSystemMXBean m =
-            ManagementFactoryHelper.getOperatingSystemMXBean();
-        if (osMXBeanIntf.isInstance(m)) {
-            return Collections.singletonList(osMXBeanIntf.cast(m));
-        } else {
-            return Collections.emptyList();
-        }
-    }
-
-    private final String mxbeanInterfaceName;
-    private final String domain;
-    private final String type;
-    private final Set<String> keyProperties;
-    private final MXBeanFetcher fetcher;
-    private final PlatformComponent[] subComponents;
-    private final boolean singleton;
-
-    private PlatformComponent(String intfName,
-                              String domain, String type,
-                              Set<String> keyProperties,
-                              boolean singleton,
-                              MXBeanFetcher fetcher,
-                              PlatformComponent... subComponents) {
-        this.mxbeanInterfaceName = intfName;
-        this.domain = domain;
-        this.type = type;
-        this.keyProperties = keyProperties;
-        this.singleton = singleton;
-        this.fetcher = fetcher;
-        this.subComponents = subComponents;
-    }
-
-    private static Set<String> defaultKeyProps;
-    private static Set<String> defaultKeyProperties() {
-        if (defaultKeyProps == null) {
-            defaultKeyProps = Collections.singleton("type");
-        }
-        return defaultKeyProps;
-    }
-
-    private static Set<String> keyProperties(String... keyNames) {
-        Set<String> set = new HashSet<>();
-        set.add("type");
-        for (String s : keyNames) {
-            set.add(s);
-        }
-        return set;
-    }
-
-    boolean isSingleton() {
-        return singleton;
-    }
-
-    String getMXBeanInterfaceName() {
-        return mxbeanInterfaceName;
-    }
-
-    @SuppressWarnings("unchecked")
-    Class<? extends PlatformManagedObject> getMXBeanInterface() {
-        try {
-            // Lazy loading the MXBean interface only when it is needed
-            return (Class<? extends PlatformManagedObject>)
-                       Class.forName(mxbeanInterfaceName, false, null);
-        } catch (ClassNotFoundException x) {
-            throw new AssertionError(x);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    <T extends PlatformManagedObject>
-        List<T> getMXBeans(Class<T> mxbeanInterface)
-    {
-        return fetcher.getMXBeans();
-    }
-
-    <T extends PlatformManagedObject> T getSingletonMXBean(Class<T> mxbeanInterface)
-    {
-        if (!singleton)
-            throw new IllegalArgumentException(mxbeanInterfaceName +
-                " can have zero or more than one instances");
-
-        List<T> list = fetcher.getMXBeans();
-        assert list.size() == 1;
-        return list.isEmpty() ? null : list.get(0);
-    }
-
-    <T extends PlatformManagedObject>
-            T getSingletonMXBean(MBeanServerConnection mbs, Class<T> mxbeanInterface)
-        throws java.io.IOException
-    {
-        if (!singleton)
-            throw new IllegalArgumentException(mxbeanInterfaceName +
-                " can have zero or more than one instances");
-
-        // ObjectName of a singleton MXBean contains only domain and type
-        assert keyProperties.size() == 1;
-        String on = domain + ":type=" + type;
-        return ManagementFactory.newPlatformMXBeanProxy(mbs,
-                                                        on,
-                                                        mxbeanInterface);
-    }
-
-    <T extends PlatformManagedObject>
-            List<T> getMXBeans(MBeanServerConnection mbs, Class<T> mxbeanInterface)
-        throws java.io.IOException
-    {
-        List<T> result = new ArrayList<>();
-        for (ObjectName on : getObjectNames(mbs)) {
-            result.add(ManagementFactory.
-                newPlatformMXBeanProxy(mbs,
-                                       on.getCanonicalName(),
-                                       mxbeanInterface)
-            );
-        }
-        return result;
-    }
-
-    private Set<ObjectName> getObjectNames(MBeanServerConnection mbs)
-        throws java.io.IOException
-    {
-        String domainAndType = domain + ":type=" + type;
-        if (keyProperties.size() > 1) {
-            // if there are more than 1 key properties (i.e. other than "type")
-            domainAndType += ",*";
-        }
-        ObjectName on = Util.newObjectName(domainAndType);
-        Set<ObjectName> set =  mbs.queryNames(on, null);
-        for (PlatformComponent pc : subComponents) {
-            set.addAll(pc.getObjectNames(mbs));
-        }
-        return set;
-    }
-
-    // a map from MXBean interface name to PlatformComponent
-    private static Map<String, PlatformComponent> enumMap;
-    private static synchronized void ensureInitialized() {
-        if (enumMap == null) {
-            enumMap = new HashMap<>();
-            for (PlatformComponent pc: PlatformComponent.values()) {
-                // Use String as the key rather than Class<?> to avoid
-                // causing unnecessary class loading of management interface
-                enumMap.put(pc.getMXBeanInterfaceName(), pc);
-            }
-        }
-    }
-
-    static boolean isPlatformMXBean(String cn) {
-        ensureInitialized();
-        return enumMap.containsKey(cn);
-    }
-
-    static <T extends PlatformManagedObject>
-        PlatformComponent getPlatformComponent(Class<T> mxbeanInterface)
-    {
-        ensureInitialized();
-        String cn = mxbeanInterface.getName();
-        PlatformComponent pc = enumMap.get(cn);
-        if (pc != null && pc.getMXBeanInterface() == mxbeanInterface)
-            return pc;
-        return null;
-    }
-
-    private static final long serialVersionUID = 6992337162326171013L;
-}
diff --git a/openjdk/java/lang/ref/Reference.java b/openjdk/java/lang/ref/Reference.java
deleted file mode 100644
index cc2bfa5c..00000000
--- a/openjdk/java/lang/ref/Reference.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
-  Copyright (C) 2003-2012 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-package java.lang.ref;
-
-import cli.System.Collections.Hashtable;
-import sun.misc.Cleaner;
-
-public abstract class Reference<T>
-{
-    // accessed by inner class
-    volatile cli.System.WeakReference weakRef;
-    volatile T strongRef;
-    volatile ReferenceQueue<? super T> queue;
-    volatile Reference next;
-    
-    private static native boolean noclassgc();
-
-    Reference(T referent)
-    {
-        this(referent, null);
-    }
-
-    Reference(T referent, ReferenceQueue<? super T> queue)
-    {
-        this.queue = queue == null ? ReferenceQueue.NULL : queue;
-        if (referent != null)
-        {
-            if (referent instanceof Class && noclassgc())
-            {
-                // We don't do Class gc, so no point in using a weak reference for classes.
-                strongRef = referent;
-            }
-            else
-            {
-                weakRef = new cli.System.WeakReference(referent, this instanceof PhantomReference);
-                if (queue != null || referent instanceof Cleaner || this instanceof SoftReference)
-                {
-                    new QueueWatcher(this);
-                }
-            }
-        }
-    }
-
-    private static final boolean debug = false;
-
-    private static final class QueueWatcher
-    {
-        private static final Hashtable keepAlive = Hashtable.Synchronized(new Hashtable());
-        private cli.System.WeakReference handle;
-
-        QueueWatcher(Reference r)
-        {
-            handle = new cli.System.WeakReference(r, true);
-            // FXBUG when a WeakReference is finalizer reachable, it gets cleared by the GC (even if we call GC.SuppressFinalize),
-            // so we have to maintain a strong reference to it to prevent it from being cleared.
-            keepAlive.Add(handle, null);
-        }
-
-        boolean check(Reference r)
-        {
-            r.strongRef = null;
-            boolean alive = false;
-            try
-            {
-                if (false) throw new cli.System.InvalidOperationException();
-                cli.System.WeakReference referent = r.weakRef;
-                if (referent == null)
-                {
-                    // ref was explicitly cleared, so we don't enqueue
-                    return false;
-                }
-                alive = referent.get_IsAlive();
-            }
-            catch (cli.System.InvalidOperationException x)
-            {
-                // this happens if the reference is already finalized (if we were
-                // the only one still hanging on to it)
-            }
-            if (alive)
-            {
-                // we don't want to keep creating finalizable objects during shutdown
-                if (!cli.System.Environment.get_HasShutdownStarted())
-                {
-                    return true;
-                }
-            }
-            else
-            {
-                if (r instanceof Cleaner)
-                {
-                    ((Cleaner)r).clean();
-                }
-                else if (r.queue != null)
-                {
-                    r.queue.enqueue(r);
-                }
-            }
-            return false;
-        }
-
-        protected void finalize()
-        {
-            Reference r = (Reference)handle.get_Target();
-            if (debug)
-                cli.System.Console.WriteLine("~QueueWatcher: " + hashCode() + " on " + r);
-            if (r != null && r.next == null && check(r))
-            {
-                cli.System.GC.ReRegisterForFinalize(QueueWatcher.this);
-            }
-            else
-            {
-                handle.set_Target(null);
-                keepAlive.Remove(handle);
-            }
-        }
-    }
-
-    public T get()
-    {
-        try
-        {
-            if (false) throw new cli.System.InvalidOperationException();
-            cli.System.WeakReference referent = this.weakRef;
-            if (referent == null)
-            {
-                return strongRef;
-            }
-            T value = (T)referent.get_Target();
-            if (value == null)
-            {
-                queue.enqueue(this);
-            }
-            return value;
-        }
-        catch (cli.System.InvalidOperationException x)
-        {
-            // we were already finalized, so we just return null.
-            return null;
-        }
-    }
-
-    public void clear()
-    {
-        weakRef = null;
-        strongRef = null;
-    }
-
-    public synchronized boolean isEnqueued()
-    {
-        return queue != ReferenceQueue.NULL && next != null;
-    }
-
-    public boolean enqueue() 
-    {
-        return queue.enqueue(this);
-    }
-}
diff --git a/openjdk/java/lang/ref/SoftReference.java b/openjdk/java/lang/ref/SoftReference.java
deleted file mode 100644
index 04d24933..00000000
--- a/openjdk/java/lang/ref/SoftReference.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.ref;
-
-
-/**
- * Soft reference objects, which are cleared at the discretion of the garbage
- * collector in response to memory demand.  Soft references are most often used
- * to implement memory-sensitive caches.
- *
- * <p> Suppose that the garbage collector determines at a certain point in time
- * that an object is <a href="package-summary.html#reachability">softly
- * reachable</a>.  At that time it may choose to clear atomically all soft
- * references to that object and all soft references to any other
- * softly-reachable objects from which that object is reachable through a chain
- * of strong references.  At the same time or at some later time it will
- * enqueue those newly-cleared soft references that are registered with
- * reference queues.
- *
- * <p> All soft references to softly-reachable objects are guaranteed to have
- * been cleared before the virtual machine throws an
- * <code>OutOfMemoryError</code>.  Otherwise no constraints are placed upon the
- * time at which a soft reference will be cleared or the order in which a set
- * of such references to different objects will be cleared.  Virtual machine
- * implementations are, however, encouraged to bias against clearing
- * recently-created or recently-used soft references.
- *
- * <p> Direct instances of this class may be used to implement simple caches;
- * this class or derived subclasses may also be used in larger data structures
- * to implement more sophisticated caches.  As long as the referent of a soft
- * reference is strongly reachable, that is, is actually in use, the soft
- * reference will not be cleared.  Thus a sophisticated cache can, for example,
- * prevent its most recently used entries from being discarded by keeping
- * strong referents to those entries, leaving the remaining entries to be
- * discarded at the discretion of the garbage collector.
- *
- * @author   Mark Reinhold
- * @since    1.2
- */
-
-public class SoftReference<T> extends Reference<T> {
-
-    /**
-     * Timestamp clock, updated by the garbage collector
-     */
-    static private long clock;
-
-    /**
-     * Timestamp updated by each invocation of the get method.  The VM may use
-     * this field when selecting soft references to be cleared, but it is not
-     * required to do so.
-     */
-    private long timestamp;
-
-    /**
-     * Creates a new soft reference that refers to the given object.  The new
-     * reference is not registered with any queue.
-     *
-     * @param referent object the new soft reference will refer to
-     */
-    public SoftReference(T referent) {
-        super(referent);
-        strongRef = referent;
-    }
-
-    /**
-     * Creates a new soft reference that refers to the given object and is
-     * registered with the given queue.
-     *
-     * @param referent object the new soft reference will refer to
-     * @param q the queue with which the reference is to be registered,
-     *          or <tt>null</tt> if registration is not required
-     *
-     */
-    public SoftReference(T referent, ReferenceQueue<? super T> q) {
-        super(referent, q);
-        strongRef = referent;
-    }
-
-    /**
-     * Returns this reference object's referent.  If this reference object has
-     * been cleared, either by the program or by the garbage collector, then
-     * this method returns <code>null</code>.
-     *
-     * @return   The object to which this reference refers, or
-     *           <code>null</code> if this reference object has been cleared
-     */
-    public T get() {
-        T o = super.get();
-        strongRef = o;
-        return o;
-    }
-
-}
diff --git a/openjdk/java/lang/reflect/Constructor.java b/openjdk/java/lang/reflect/Constructor.java
deleted file mode 100644
index b13d30a5..00000000
--- a/openjdk/java/lang/reflect/Constructor.java
+++ /dev/null
@@ -1,674 +0,0 @@
-/*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.reflect;
-
-import sun.reflect.CallerSensitive;
-import sun.reflect.ConstructorAccessor;
-import sun.reflect.Reflection;
-import sun.reflect.generics.repository.ConstructorRepository;
-import sun.reflect.generics.factory.CoreReflectionFactory;
-import sun.reflect.generics.factory.GenericsFactory;
-import sun.reflect.generics.scope.ConstructorScope;
-import java.lang.annotation.Annotation;
-import java.util.Map;
-import sun.reflect.annotation.AnnotationParser;
-import java.lang.annotation.AnnotationFormatError;
-import java.lang.reflect.Modifier;
-
-/**
- * {@code Constructor} provides information about, and access to, a single
- * constructor for a class.
- *
- * <p>{@code Constructor} permits widening conversions to occur when matching the
- * actual parameters to newInstance() with the underlying
- * constructor's formal parameters, but throws an
- * {@code IllegalArgumentException} if a narrowing conversion would occur.
- *
- * @param <T> the class in which the constructor is declared
- *
- * @see Member
- * @see java.lang.Class
- * @see java.lang.Class#getConstructors()
- * @see java.lang.Class#getConstructor(Class[])
- * @see java.lang.Class#getDeclaredConstructors()
- *
- * @author      Kenneth Russell
- * @author      Nakul Saraiya
- */
-public final
-    class Constructor<T> extends AccessibleObject implements
-                                                    GenericDeclaration,
-                                                    Member {
-
-    private Class<T>            clazz;
-    private int                 slot;
-    private Class<?>[]          parameterTypes;
-    private Class<?>[]          exceptionTypes;
-    private int                 modifiers;
-    // Generics and annotations support
-    private transient String    signature;
-    // generic info repository; lazily initialized
-    private transient ConstructorRepository genericInfo;
-
-    // Generics infrastructure
-    // Accessor for factory
-    private GenericsFactory getFactory() {
-        // create scope and factory
-        return CoreReflectionFactory.make(this, ConstructorScope.make(this));
-    }
-
-    // Accessor for generic info repository
-    private ConstructorRepository getGenericInfo() {
-        // lazily initialize repository if necessary
-        if (genericInfo == null) {
-            // create and cache generic info repository
-            genericInfo =
-                ConstructorRepository.make(getSignature(),
-                                           getFactory());
-        }
-        return genericInfo; //return cached repository
-    }
-
-    private volatile ConstructorAccessor constructorAccessor;
-    // For sharing of ConstructorAccessors. This branching structure
-    // is currently only two levels deep (i.e., one root Constructor
-    // and potentially many Constructor objects pointing to it.)
-    private Constructor<T>      root;
-
-    /**
-     * Package-private constructor used by ReflectAccess to enable
-     * instantiation of these objects in Java code from the java.lang
-     * package via sun.reflect.LangReflectAccess.
-     */
-    Constructor(Class<T> declaringClass,
-                Class<?>[] parameterTypes,
-                Class<?>[] checkedExceptions,
-                int modifiers,
-                int slot,
-                String signature,
-                byte[] unused1,
-                byte[] unused2)
-    {
-        this.clazz = declaringClass;
-        this.parameterTypes = parameterTypes;
-        this.exceptionTypes = checkedExceptions;
-        this.modifiers = modifiers;
-        this.slot = slot;
-        this.signature = signature;
-    }
-
-    /**
-     * Package-private routine (exposed to java.lang.Class via
-     * ReflectAccess) which returns a copy of this Constructor. The copy's
-     * "root" field points to this Constructor.
-     */
-    Constructor<T> copy() {
-        // This routine enables sharing of ConstructorAccessor objects
-        // among Constructor objects which refer to the same underlying
-        // method in the VM. (All of this contortion is only necessary
-        // because of the "accessibility" bit in AccessibleObject,
-        // which implicitly requires that new java.lang.reflect
-        // objects be fabricated for each reflective call on Class
-        // objects.)
-        Constructor<T> res = new Constructor<>(clazz,
-                                                parameterTypes,
-                                                exceptionTypes, modifiers, slot,
-                                                signature,
-                                                null,
-                                                null);
-        res.root = this;
-        // Might as well eagerly propagate this if already present
-        res.constructorAccessor = constructorAccessor;
-        return res;
-    }
-
-    /**
-     * Returns the {@code Class} object representing the class that declares
-     * the constructor represented by this {@code Constructor} object.
-     */
-    public Class<T> getDeclaringClass() {
-        return clazz;
-    }
-
-    /**
-     * Returns the name of this constructor, as a string.  This is
-     * the binary name of the constructor's declaring class.
-     */
-    public String getName() {
-        return getDeclaringClass().getName();
-    }
-
-    /**
-     * Returns the Java language modifiers for the constructor
-     * represented by this {@code Constructor} object, as an integer. The
-     * {@code Modifier} class should be used to decode the modifiers.
-     *
-     * @see Modifier
-     */
-    public int getModifiers() {
-        return modifiers;
-    }
-
-    /**
-     * Returns an array of {@code TypeVariable} objects that represent the
-     * type variables declared by the generic declaration represented by this
-     * {@code GenericDeclaration} object, in declaration order.  Returns an
-     * array of length 0 if the underlying generic declaration declares no type
-     * variables.
-     *
-     * @return an array of {@code TypeVariable} objects that represent
-     *     the type variables declared by this generic declaration
-     * @throws GenericSignatureFormatError if the generic
-     *     signature of this generic declaration does not conform to
-     *     the format specified in
-     *     <cite>The Java&trade; Virtual Machine Specification</cite>
-     * @since 1.5
-     */
-    public TypeVariable<Constructor<T>>[] getTypeParameters() {
-      if (getSignature() != null) {
-        return (TypeVariable<Constructor<T>>[])getGenericInfo().getTypeParameters();
-      } else
-          return (TypeVariable<Constructor<T>>[])new TypeVariable[0];
-    }
-
-
-    /**
-     * Returns an array of {@code Class} objects that represent the formal
-     * parameter types, in declaration order, of the constructor
-     * represented by this {@code Constructor} object.  Returns an array of
-     * length 0 if the underlying constructor takes no parameters.
-     *
-     * @return the parameter types for the constructor this object
-     * represents
-     */
-    public Class<?>[] getParameterTypes() {
-        return (Class<?>[]) parameterTypes.clone();
-    }
-
-
-    /**
-     * Returns an array of {@code Type} objects that represent the formal
-     * parameter types, in declaration order, of the method represented by
-     * this {@code Constructor} object. Returns an array of length 0 if the
-     * underlying method takes no parameters.
-     *
-     * <p>If a formal parameter type is a parameterized type,
-     * the {@code Type} object returned for it must accurately reflect
-     * the actual type parameters used in the source code.
-     *
-     * <p>If a formal parameter type is a type variable or a parameterized
-     * type, it is created. Otherwise, it is resolved.
-     *
-     * @return an array of {@code Type}s that represent the formal
-     *     parameter types of the underlying method, in declaration order
-     * @throws GenericSignatureFormatError
-     *     if the generic method signature does not conform to the format
-     *     specified in
-     *     <cite>The Java&trade; Virtual Machine Specification</cite>
-     * @throws TypeNotPresentException if any of the parameter
-     *     types of the underlying method refers to a non-existent type
-     *     declaration
-     * @throws MalformedParameterizedTypeException if any of
-     *     the underlying method's parameter types refer to a parameterized
-     *     type that cannot be instantiated for any reason
-     * @since 1.5
-     */
-    public Type[] getGenericParameterTypes() {
-        if (getSignature() != null)
-            return getGenericInfo().getParameterTypes();
-        else
-            return getParameterTypes();
-    }
-
-
-    /**
-     * Returns an array of {@code Class} objects that represent the types
-     * of exceptions declared to be thrown by the underlying constructor
-     * represented by this {@code Constructor} object.  Returns an array of
-     * length 0 if the constructor declares no exceptions in its {@code throws} clause.
-     *
-     * @return the exception types declared as being thrown by the
-     * constructor this object represents
-     */
-    public Class<?>[] getExceptionTypes() {
-        return (Class<?>[])exceptionTypes.clone();
-    }
-
-
-    /**
-     * Returns an array of {@code Type} objects that represent the
-     * exceptions declared to be thrown by this {@code Constructor} object.
-     * Returns an array of length 0 if the underlying method declares
-     * no exceptions in its {@code throws} clause.
-     *
-     * <p>If an exception type is a type variable or a parameterized
-     * type, it is created. Otherwise, it is resolved.
-     *
-     * @return an array of Types that represent the exception types
-     *     thrown by the underlying method
-     * @throws GenericSignatureFormatError
-     *     if the generic method signature does not conform to the format
-     *     specified in
-     *     <cite>The Java&trade; Virtual Machine Specification</cite>
-     * @throws TypeNotPresentException if the underlying method's
-     *     {@code throws} clause refers to a non-existent type declaration
-     * @throws MalformedParameterizedTypeException if
-     *     the underlying method's {@code throws} clause refers to a
-     *     parameterized type that cannot be instantiated for any reason
-     * @since 1.5
-     */
-      public Type[] getGenericExceptionTypes() {
-          Type[] result;
-          if (getSignature() != null &&
-              ( (result = getGenericInfo().getExceptionTypes()).length > 0  ))
-              return result;
-          else
-              return getExceptionTypes();
-      }
-
-    /**
-     * Compares this {@code Constructor} against the specified object.
-     * Returns true if the objects are the same.  Two {@code Constructor} objects are
-     * the same if they were declared by the same class and have the
-     * same formal parameter types.
-     */
-    public boolean equals(Object obj) {
-        if (obj != null && obj instanceof Constructor) {
-            Constructor<?> other = (Constructor<?>)obj;
-            if (getDeclaringClass() == other.getDeclaringClass()) {
-                /* Avoid unnecessary cloning */
-                Class<?>[] params1 = parameterTypes;
-                Class<?>[] params2 = other.parameterTypes;
-                if (params1.length == params2.length) {
-                    for (int i = 0; i < params1.length; i++) {
-                        if (params1[i] != params2[i])
-                            return false;
-                    }
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Returns a hashcode for this {@code Constructor}. The hashcode is
-     * the same as the hashcode for the underlying constructor's
-     * declaring class name.
-     */
-    public int hashCode() {
-        return getDeclaringClass().getName().hashCode();
-    }
-
-    /**
-     * Returns a string describing this {@code Constructor}.  The string is
-     * formatted as the constructor access modifiers, if any,
-     * followed by the fully-qualified name of the declaring class,
-     * followed by a parenthesized, comma-separated list of the
-     * constructor's formal parameter types.  For example:
-     * <pre>
-     *    public java.util.Hashtable(int,float)
-     * </pre>
-     *
-     * <p>The only possible modifiers for constructors are the access
-     * modifiers {@code public}, {@code protected} or
-     * {@code private}.  Only one of these may appear, or none if the
-     * constructor has default (package) access.
-     */
-    public String toString() {
-        try {
-            StringBuffer sb = new StringBuffer();
-            int mod = getModifiers() & Modifier.constructorModifiers();
-            if (mod != 0) {
-                sb.append(Modifier.toString(mod) + " ");
-            }
-            sb.append(Field.getTypeName(getDeclaringClass()));
-            sb.append("(");
-            Class<?>[] params = parameterTypes; // avoid clone
-            for (int j = 0; j < params.length; j++) {
-                sb.append(Field.getTypeName(params[j]));
-                if (j < (params.length - 1))
-                    sb.append(",");
-            }
-            sb.append(")");
-            Class<?>[] exceptions = exceptionTypes; // avoid clone
-            if (exceptions.length > 0) {
-                sb.append(" throws ");
-                for (int k = 0; k < exceptions.length; k++) {
-                    sb.append(exceptions[k].getName());
-                    if (k < (exceptions.length - 1))
-                        sb.append(",");
-                }
-            }
-            return sb.toString();
-        } catch (Exception e) {
-            return "<" + e + ">";
-        }
-    }
-
-    /**
-     * Returns a string describing this {@code Constructor},
-     * including type parameters.  The string is formatted as the
-     * constructor access modifiers, if any, followed by an
-     * angle-bracketed comma separated list of the constructor's type
-     * parameters, if any, followed by the fully-qualified name of the
-     * declaring class, followed by a parenthesized, comma-separated
-     * list of the constructor's generic formal parameter types.
-     *
-     * If this constructor was declared to take a variable number of
-     * arguments, instead of denoting the last parameter as
-     * "<tt><i>Type</i>[]</tt>", it is denoted as
-     * "<tt><i>Type</i>...</tt>".
-     *
-     * A space is used to separate access modifiers from one another
-     * and from the type parameters or return type.  If there are no
-     * type parameters, the type parameter list is elided; if the type
-     * parameter list is present, a space separates the list from the
-     * class name.  If the constructor is declared to throw
-     * exceptions, the parameter list is followed by a space, followed
-     * by the word "{@code throws}" followed by a
-     * comma-separated list of the thrown exception types.
-     *
-     * <p>The only possible modifiers for constructors are the access
-     * modifiers {@code public}, {@code protected} or
-     * {@code private}.  Only one of these may appear, or none if the
-     * constructor has default (package) access.
-     *
-     * @return a string describing this {@code Constructor},
-     * include type parameters
-     *
-     * @since 1.5
-     */
-    public String toGenericString() {
-        try {
-            StringBuilder sb = new StringBuilder();
-            int mod = getModifiers() & Modifier.constructorModifiers();
-            if (mod != 0) {
-                sb.append(Modifier.toString(mod) + " ");
-            }
-            TypeVariable<?>[] typeparms = getTypeParameters();
-            if (typeparms.length > 0) {
-                boolean first = true;
-                sb.append("<");
-                for(TypeVariable<?> typeparm: typeparms) {
-                    if (!first)
-                        sb.append(",");
-                    // Class objects can't occur here; no need to test
-                    // and call Class.getName().
-                    sb.append(typeparm.toString());
-                    first = false;
-                }
-                sb.append("> ");
-            }
-            sb.append(Field.getTypeName(getDeclaringClass()));
-            sb.append("(");
-            Type[] params = getGenericParameterTypes();
-            for (int j = 0; j < params.length; j++) {
-                String param = (params[j] instanceof Class<?>)?
-                    Field.getTypeName((Class<?>)params[j]):
-                    (params[j].toString());
-                if (isVarArgs() && (j == params.length - 1)) // replace T[] with T...
-                    param = param.replaceFirst("\\[\\]$", "...");
-                sb.append(param);
-                if (j < (params.length - 1))
-                    sb.append(",");
-            }
-            sb.append(")");
-            Type[] exceptions = getGenericExceptionTypes();
-            if (exceptions.length > 0) {
-                sb.append(" throws ");
-                for (int k = 0; k < exceptions.length; k++) {
-                    sb.append((exceptions[k] instanceof Class)?
-                              ((Class<?>)exceptions[k]).getName():
-                              exceptions[k].toString());
-                    if (k < (exceptions.length - 1))
-                        sb.append(",");
-                }
-            }
-            return sb.toString();
-        } catch (Exception e) {
-            return "<" + e + ">";
-        }
-    }
-
-    /**
-     * Uses the constructor represented by this {@code Constructor} object to
-     * create and initialize a new instance of the constructor's
-     * declaring class, with the specified initialization parameters.
-     * Individual parameters are automatically unwrapped to match
-     * primitive formal parameters, and both primitive and reference
-     * parameters are subject to method invocation conversions as necessary.
-     *
-     * <p>If the number of formal parameters required by the underlying constructor
-     * is 0, the supplied {@code initargs} array may be of length 0 or null.
-     *
-     * <p>If the constructor's declaring class is an inner class in a
-     * non-static context, the first argument to the constructor needs
-     * to be the enclosing instance; see section 15.9.3 of
-     * <cite>The Java&trade; Language Specification</cite>.
-     *
-     * <p>If the required access and argument checks succeed and the
-     * instantiation will proceed, the constructor's declaring class
-     * is initialized if it has not already been initialized.
-     *
-     * <p>If the constructor completes normally, returns the newly
-     * created and initialized instance.
-     *
-     * @param initargs array of objects to be passed as arguments to
-     * the constructor call; values of primitive types are wrapped in
-     * a wrapper object of the appropriate type (e.g. a {@code float}
-     * in a {@link java.lang.Float Float})
-     *
-     * @return a new object created by calling the constructor
-     * this object represents
-     *
-     * @exception IllegalAccessException    if this {@code Constructor} object
-     *              is enforcing Java language access control and the underlying
-     *              constructor is inaccessible.
-     * @exception IllegalArgumentException  if the number of actual
-     *              and formal parameters differ; if an unwrapping
-     *              conversion for primitive arguments fails; or if,
-     *              after possible unwrapping, a parameter value
-     *              cannot be converted to the corresponding formal
-     *              parameter type by a method invocation conversion; if
-     *              this constructor pertains to an enum type.
-     * @exception InstantiationException    if the class that declares the
-     *              underlying constructor represents an abstract class.
-     * @exception InvocationTargetException if the underlying constructor
-     *              throws an exception.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     */
-    @CallerSensitive
-    public T newInstance(Object ... initargs)
-        throws InstantiationException, IllegalAccessException,
-               IllegalArgumentException, InvocationTargetException
-    {
-        if (!override) {
-            if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
-                Class<?> caller = Reflection.getCallerClass();
-                checkAccess(caller, clazz, null, modifiers);
-            }
-        }
-        if ((clazz.getModifiers() & Modifier.ENUM) != 0)
-            throw new IllegalArgumentException("Cannot reflectively create enum objects");
-        ConstructorAccessor ca = constructorAccessor;   // read volatile
-        if (ca == null) {
-            ca = acquireConstructorAccessor();
-        }
-        return (T) ca.newInstance(initargs);
-    }
-
-    /**
-     * Returns {@code true} if this constructor was declared to take
-     * a variable number of arguments; returns {@code false}
-     * otherwise.
-     *
-     * @return {@code true} if an only if this constructor was declared to
-     * take a variable number of arguments.
-     * @since 1.5
-     */
-    public boolean isVarArgs() {
-        return (getModifiers() & Modifier.VARARGS) != 0;
-    }
-
-    /**
-     * Returns {@code true} if this constructor is a synthetic
-     * constructor; returns {@code false} otherwise.
-     *
-     * @return true if and only if this constructor is a synthetic
-     * constructor as defined by
-     * <cite>The Java&trade; Language Specification</cite>.
-     * @since 1.5
-     */
-    public boolean isSynthetic() {
-        return Modifier.isSynthetic(getModifiers());
-    }
-
-    // NOTE that there is no synchronization used here. It is correct
-    // (though not efficient) to generate more than one
-    // ConstructorAccessor for a given Constructor. However, avoiding
-    // synchronization will probably make the implementation more
-    // scalable.
-    private ConstructorAccessor acquireConstructorAccessor() {
-        // First check to see if one has been created yet, and take it
-        // if so.
-        ConstructorAccessor tmp = null;
-        if (root != null) tmp = root.getConstructorAccessor();
-        if (tmp != null) {
-            constructorAccessor = tmp;
-        } else {
-            // Otherwise fabricate one and propagate it up to the root
-            tmp = reflectionFactory.newConstructorAccessor(this);
-            setConstructorAccessor(tmp);
-        }
-
-        return tmp;
-    }
-
-    // Returns ConstructorAccessor for this Constructor object, not
-    // looking up the chain to the root
-    ConstructorAccessor getConstructorAccessor() {
-        return constructorAccessor;
-    }
-
-    // Sets the ConstructorAccessor for this Constructor object and
-    // (recursively) its root
-    void setConstructorAccessor(ConstructorAccessor accessor) {
-        constructorAccessor = accessor;
-        // Propagate up
-        if (root != null) {
-            root.setConstructorAccessor(accessor);
-        }
-    }
-
-    int getSlot() {
-        return slot;
-    }
-
-   String getSignature() {
-            return signature;
-   }
-
-    byte[] getRawAnnotations() {
-        return null;
-    }
-
-    byte[] getRawParameterAnnotations() {
-        return null;
-    }
-
-    /**
-     * @throws NullPointerException {@inheritDoc}
-     * @since 1.5
-     */
-    public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
-        if (annotationClass == null)
-            throw new NullPointerException();
-
-        return (T) declaredAnnotations().get(annotationClass);
-    }
-
-    private static final Annotation[] EMPTY_ANNOTATION_ARRAY=new Annotation[0];
-
-    /**
-     * @since 1.5
-     */
-    public Annotation[] getDeclaredAnnotations()  {
-        return declaredAnnotations().values().toArray(EMPTY_ANNOTATION_ARRAY);
-    }
-
-    private transient Map<Class<? extends Annotation>, Annotation> declaredAnnotations;
-
-    private synchronized  Map<Class<? extends Annotation>, Annotation> declaredAnnotations() {
-        if (declaredAnnotations == null) {
-            declaredAnnotations = Method.getDeclaredAnnotationsImpl(this);
-        }
-        return declaredAnnotations;
-    }
-
-    /**
-     * Returns an array of arrays that represent the annotations on the formal
-     * parameters, in declaration order, of the method represented by
-     * this {@code Constructor} object. (Returns an array of length zero if the
-     * underlying method is parameterless.  If the method has one or more
-     * parameters, a nested array of length zero is returned for each parameter
-     * with no annotations.) The annotation objects contained in the returned
-     * arrays are serializable.  The caller of this method is free to modify
-     * the returned arrays; it will have no effect on the arrays returned to
-     * other callers.
-     *
-     * @return an array of arrays that represent the annotations on the formal
-     *    parameters, in declaration order, of the method represented by this
-     *    Constructor object
-     * @since 1.5
-     */
-    public Annotation[][] getParameterAnnotations() {
-        int numParameters = parameterTypes.length;
-        Annotation[][] result = Method.getParameterAnnotationsImpl(this);
-        if (result == null)
-            return new Annotation[numParameters][0];
-        if (result.length != numParameters) {
-            Class<?> declaringClass = getDeclaringClass();
-            if (declaringClass.isEnum() ||
-                declaringClass.isAnonymousClass() ||
-                declaringClass.isLocalClass() )
-                ; // Can't do reliable parameter counting
-            else {
-                if (!declaringClass.isMemberClass() || // top-level
-                    // Check for the enclosing instance parameter for
-                    // non-static member classes
-                    (declaringClass.isMemberClass() &&
-                     ((declaringClass.getModifiers() & Modifier.STATIC) == 0)  &&
-                     result.length + 1 != numParameters) ) {
-                    throw new AnnotationFormatError(
-                              "Parameter annotations don't match number of parameters");
-                }
-            }
-        }
-        return result;
-    }
-}
diff --git a/openjdk/java/lang/reflect/Field.java b/openjdk/java/lang/reflect/Field.java
deleted file mode 100644
index b2cb46b3..00000000
--- a/openjdk/java/lang/reflect/Field.java
+++ /dev/null
@@ -1,1134 +0,0 @@
-/*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.reflect;
-
-import sun.reflect.CallerSensitive;
-import sun.reflect.FieldAccessor;
-import sun.reflect.Reflection;
-import sun.reflect.generics.repository.FieldRepository;
-import sun.reflect.generics.factory.CoreReflectionFactory;
-import sun.reflect.generics.factory.GenericsFactory;
-import sun.reflect.generics.scope.ClassScope;
-import java.lang.annotation.Annotation;
-import java.util.Map;
-import sun.reflect.annotation.AnnotationParser;
-
-
-/**
- * A {@code Field} provides information about, and dynamic access to, a
- * single field of a class or an interface.  The reflected field may
- * be a class (static) field or an instance field.
- *
- * <p>A {@code Field} permits widening conversions to occur during a get or
- * set access operation, but throws an {@code IllegalArgumentException} if a
- * narrowing conversion would occur.
- *
- * @see Member
- * @see java.lang.Class
- * @see java.lang.Class#getFields()
- * @see java.lang.Class#getField(String)
- * @see java.lang.Class#getDeclaredFields()
- * @see java.lang.Class#getDeclaredField(String)
- *
- * @author Kenneth Russell
- * @author Nakul Saraiya
- */
-public final
-class Field extends AccessibleObject implements Member {
-
-    private Class<?>            clazz;
-    private int                 slot;
-    // This is guaranteed to be interned by the VM in the 1.4
-    // reflection implementation
-    private String              name;
-    private Class<?>            type;
-    private int                 modifiers;
-    // Generics and annotations support
-    private transient String    signature;
-    // generic info repository; lazily initialized
-    private transient FieldRepository genericInfo;
-    // Cached field accessor created without override
-    private FieldAccessor fieldAccessor;
-    // Cached field accessor created with override
-    private FieldAccessor overrideFieldAccessor;
-    // For sharing of FieldAccessors. This branching structure is
-    // currently only two levels deep (i.e., one root Field and
-    // potentially many Field objects pointing to it.)
-    private Field               root;
-
-    // Generics infrastructure
-
-    private String getGenericSignature() {return signature;}
-
-    // Accessor for factory
-    private GenericsFactory getFactory() {
-        Class<?> c = getDeclaringClass();
-        // create scope and factory
-        return CoreReflectionFactory.make(c, ClassScope.make(c));
-    }
-
-    // Accessor for generic info repository
-    private FieldRepository getGenericInfo() {
-        // lazily initialize repository if necessary
-        if (genericInfo == null) {
-            // create and cache generic info repository
-            genericInfo = FieldRepository.make(getGenericSignature(),
-                                               getFactory());
-        }
-        return genericInfo; //return cached repository
-    }
-
-
-    /**
-     * Package-private constructor used by ReflectAccess to enable
-     * instantiation of these objects in Java code from the java.lang
-     * package via sun.reflect.LangReflectAccess.
-     */
-    Field(Class<?> declaringClass,
-          String name,
-          Class<?> type,
-          int modifiers,
-          int slot,
-          String signature,
-          byte[] unused)
-    {
-        this.clazz = declaringClass;
-        this.name = name;
-        this.type = type;
-        this.modifiers = modifiers;
-        this.slot = slot;
-        this.signature = signature;
-    }
-
-    /**
-     * Package-private routine (exposed to java.lang.Class via
-     * ReflectAccess) which returns a copy of this Field. The copy's
-     * "root" field points to this Field.
-     */
-    Field copy() {
-        // This routine enables sharing of FieldAccessor objects
-        // among Field objects which refer to the same underlying
-        // method in the VM. (All of this contortion is only necessary
-        // because of the "accessibility" bit in AccessibleObject,
-        // which implicitly requires that new java.lang.reflect
-        // objects be fabricated for each reflective call on Class
-        // objects.)
-        Field res = new Field(clazz, name, type, modifiers, slot, signature, null);
-        res.root = this;
-        // Might as well eagerly propagate this if already present
-        res.fieldAccessor = fieldAccessor;
-        res.overrideFieldAccessor = overrideFieldAccessor;
-        return res;
-    }
-
-    /**
-     * Returns the {@code Class} object representing the class or interface
-     * that declares the field represented by this {@code Field} object.
-     */
-    public Class<?> getDeclaringClass() {
-        return clazz;
-    }
-
-    /**
-     * Returns the name of the field represented by this {@code Field} object.
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Returns the Java language modifiers for the field represented
-     * by this {@code Field} object, as an integer. The {@code Modifier} class should
-     * be used to decode the modifiers.
-     *
-     * @see Modifier
-     */
-    public int getModifiers() {
-        return modifiers;
-    }
-
-    /**
-     * Returns {@code true} if this field represents an element of
-     * an enumerated type; returns {@code false} otherwise.
-     *
-     * @return {@code true} if and only if this field represents an element of
-     * an enumerated type.
-     * @since 1.5
-     */
-    public boolean isEnumConstant() {
-        return (getModifiers() & Modifier.ENUM) != 0;
-    }
-
-    /**
-     * Returns {@code true} if this field is a synthetic
-     * field; returns {@code false} otherwise.
-     *
-     * @return true if and only if this field is a synthetic
-     * field as defined by the Java Language Specification.
-     * @since 1.5
-     */
-    public boolean isSynthetic() {
-        return Modifier.isSynthetic(getModifiers());
-    }
-
-    /**
-     * Returns a {@code Class} object that identifies the
-     * declared type for the field represented by this
-     * {@code Field} object.
-     *
-     * @return a {@code Class} object identifying the declared
-     * type of the field represented by this object
-     */
-    public Class<?> getType() {
-        return type;
-    }
-
-    /**
-     * Returns a {@code Type} object that represents the declared type for
-     * the field represented by this {@code Field} object.
-     *
-     * <p>If the {@code Type} is a parameterized type, the
-     * {@code Type} object returned must accurately reflect the
-     * actual type parameters used in the source code.
-     *
-     * <p>If the type of the underlying field is a type variable or a
-     * parameterized type, it is created. Otherwise, it is resolved.
-     *
-     * @return a {@code Type} object that represents the declared type for
-     *     the field represented by this {@code Field} object
-     * @throws GenericSignatureFormatError if the generic field
-     *     signature does not conform to the format specified in
-     *     <cite>The Java&trade; Virtual Machine Specification</cite>
-     * @throws TypeNotPresentException if the generic type
-     *     signature of the underlying field refers to a non-existent
-     *     type declaration
-     * @throws MalformedParameterizedTypeException if the generic
-     *     signature of the underlying field refers to a parameterized type
-     *     that cannot be instantiated for any reason
-     * @since 1.5
-     */
-    public Type getGenericType() {
-        if (getGenericSignature() != null)
-            return getGenericInfo().getGenericType();
-        else
-            return getType();
-    }
-
-
-    /**
-     * Compares this {@code Field} against the specified object.  Returns
-     * true if the objects are the same.  Two {@code Field} objects are the same if
-     * they were declared by the same class and have the same name
-     * and type.
-     */
-    public boolean equals(Object obj) {
-        if (obj != null && obj instanceof Field) {
-            Field other = (Field)obj;
-            return (getDeclaringClass() == other.getDeclaringClass())
-                && (getName() == other.getName())
-                && (getType() == other.getType());
-        }
-        return false;
-    }
-
-    /**
-     * Returns a hashcode for this {@code Field}.  This is computed as the
-     * exclusive-or of the hashcodes for the underlying field's
-     * declaring class name and its name.
-     */
-    public int hashCode() {
-        return getDeclaringClass().getName().hashCode() ^ getName().hashCode();
-    }
-
-    /**
-     * Returns a string describing this {@code Field}.  The format is
-     * the access modifiers for the field, if any, followed
-     * by the field type, followed by a space, followed by
-     * the fully-qualified name of the class declaring the field,
-     * followed by a period, followed by the name of the field.
-     * For example:
-     * <pre>
-     *    public static final int java.lang.Thread.MIN_PRIORITY
-     *    private int java.io.FileDescriptor.fd
-     * </pre>
-     *
-     * <p>The modifiers are placed in canonical order as specified by
-     * "The Java Language Specification".  This is {@code public},
-     * {@code protected} or {@code private} first, and then other
-     * modifiers in the following order: {@code static}, {@code final},
-     * {@code transient}, {@code volatile}.
-     */
-    public String toString() {
-        int mod = getModifiers();
-        return (((mod == 0) ? "" : (Modifier.toString(mod) + " "))
-            + getTypeName(getType()) + " "
-            + getTypeName(getDeclaringClass()) + "."
-            + getName());
-    }
-
-    /**
-     * Returns a string describing this {@code Field}, including
-     * its generic type.  The format is the access modifiers for the
-     * field, if any, followed by the generic field type, followed by
-     * a space, followed by the fully-qualified name of the class
-     * declaring the field, followed by a period, followed by the name
-     * of the field.
-     *
-     * <p>The modifiers are placed in canonical order as specified by
-     * "The Java Language Specification".  This is {@code public},
-     * {@code protected} or {@code private} first, and then other
-     * modifiers in the following order: {@code static}, {@code final},
-     * {@code transient}, {@code volatile}.
-     *
-     * @return a string describing this {@code Field}, including
-     * its generic type
-     *
-     * @since 1.5
-     */
-    public String toGenericString() {
-        int mod = getModifiers();
-        Type fieldType = getGenericType();
-        return (((mod == 0) ? "" : (Modifier.toString(mod) + " "))
-            +  ((fieldType instanceof Class) ?
-                getTypeName((Class)fieldType): fieldType.toString())+ " "
-            + getTypeName(getDeclaringClass()) + "."
-            + getName());
-    }
-
-    /**
-     * Returns the value of the field represented by this {@code Field}, on
-     * the specified object. The value is automatically wrapped in an
-     * object if it has a primitive type.
-     *
-     * <p>The underlying field's value is obtained as follows:
-     *
-     * <p>If the underlying field is a static field, the {@code obj} argument
-     * is ignored; it may be null.
-     *
-     * <p>Otherwise, the underlying field is an instance field.  If the
-     * specified {@code obj} argument is null, the method throws a
-     * {@code NullPointerException}. If the specified object is not an
-     * instance of the class or interface declaring the underlying
-     * field, the method throws an {@code IllegalArgumentException}.
-     *
-     * <p>If this {@code Field} object is enforcing Java language access control, and
-     * the underlying field is inaccessible, the method throws an
-     * {@code IllegalAccessException}.
-     * If the underlying field is static, the class that declared the
-     * field is initialized if it has not already been initialized.
-     *
-     * <p>Otherwise, the value is retrieved from the underlying instance
-     * or static field.  If the field has a primitive type, the value
-     * is wrapped in an object before being returned, otherwise it is
-     * returned as is.
-     *
-     * <p>If the field is hidden in the type of {@code obj},
-     * the field's value is obtained according to the preceding rules.
-     *
-     * @param obj object from which the represented field's value is
-     * to be extracted
-     * @return the value of the represented field in object
-     * {@code obj}; primitive values are wrapped in an appropriate
-     * object before being returned
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is inaccessible.
-     * @exception IllegalArgumentException  if the specified object is not an
-     *              instance of the class or interface declaring the underlying
-     *              field (or a subclass or implementor thereof).
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     */
-    @CallerSensitive
-    public Object get(Object obj)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        if (!override) {
-            if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
-                checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers);
-            }
-        }
-        return getFieldAccessor(obj).get(obj);
-    }
-
-    /**
-     * Gets the value of a static or instance {@code boolean} field.
-     *
-     * @param obj the object to extract the {@code boolean} value
-     * from
-     * @return the value of the {@code boolean} field
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is inaccessible.
-     * @exception IllegalArgumentException  if the specified object is not
-     *              an instance of the class or interface declaring the
-     *              underlying field (or a subclass or implementor
-     *              thereof), or if the field value cannot be
-     *              converted to the type {@code boolean} by a
-     *              widening conversion.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#get
-     */
-    @CallerSensitive
-    public boolean getBoolean(Object obj)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        if (!override) {
-            if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
-                checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers);
-            }
-        }
-        return getFieldAccessor(obj).getBoolean(obj);
-    }
-
-    /**
-     * Gets the value of a static or instance {@code byte} field.
-     *
-     * @param obj the object to extract the {@code byte} value
-     * from
-     * @return the value of the {@code byte} field
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is inaccessible.
-     * @exception IllegalArgumentException  if the specified object is not
-     *              an instance of the class or interface declaring the
-     *              underlying field (or a subclass or implementor
-     *              thereof), or if the field value cannot be
-     *              converted to the type {@code byte} by a
-     *              widening conversion.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#get
-     */
-    @CallerSensitive
-    public byte getByte(Object obj)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        if (!override) {
-            if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
-                checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers);
-            }
-        }
-        return getFieldAccessor(obj).getByte(obj);
-    }
-
-    /**
-     * Gets the value of a static or instance field of type
-     * {@code char} or of another primitive type convertible to
-     * type {@code char} via a widening conversion.
-     *
-     * @param obj the object to extract the {@code char} value
-     * from
-     * @return the value of the field converted to type {@code char}
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is inaccessible.
-     * @exception IllegalArgumentException  if the specified object is not
-     *              an instance of the class or interface declaring the
-     *              underlying field (or a subclass or implementor
-     *              thereof), or if the field value cannot be
-     *              converted to the type {@code char} by a
-     *              widening conversion.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see Field#get
-     */
-    @CallerSensitive
-    public char getChar(Object obj)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        if (!override) {
-            if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
-                checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers);
-            }
-        }
-        return getFieldAccessor(obj).getChar(obj);
-    }
-
-    /**
-     * Gets the value of a static or instance field of type
-     * {@code short} or of another primitive type convertible to
-     * type {@code short} via a widening conversion.
-     *
-     * @param obj the object to extract the {@code short} value
-     * from
-     * @return the value of the field converted to type {@code short}
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is inaccessible.
-     * @exception IllegalArgumentException  if the specified object is not
-     *              an instance of the class or interface declaring the
-     *              underlying field (or a subclass or implementor
-     *              thereof), or if the field value cannot be
-     *              converted to the type {@code short} by a
-     *              widening conversion.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#get
-     */
-    @CallerSensitive
-    public short getShort(Object obj)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        if (!override) {
-            if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
-                checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers);
-            }
-        }
-        return getFieldAccessor(obj).getShort(obj);
-    }
-
-    /**
-     * Gets the value of a static or instance field of type
-     * {@code int} or of another primitive type convertible to
-     * type {@code int} via a widening conversion.
-     *
-     * @param obj the object to extract the {@code int} value
-     * from
-     * @return the value of the field converted to type {@code int}
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is inaccessible.
-     * @exception IllegalArgumentException  if the specified object is not
-     *              an instance of the class or interface declaring the
-     *              underlying field (or a subclass or implementor
-     *              thereof), or if the field value cannot be
-     *              converted to the type {@code int} by a
-     *              widening conversion.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#get
-     */
-    @CallerSensitive
-    public int getInt(Object obj)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        if (!override) {
-            if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
-                checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers);
-            }
-        }
-        return getFieldAccessor(obj).getInt(obj);
-    }
-
-    /**
-     * Gets the value of a static or instance field of type
-     * {@code long} or of another primitive type convertible to
-     * type {@code long} via a widening conversion.
-     *
-     * @param obj the object to extract the {@code long} value
-     * from
-     * @return the value of the field converted to type {@code long}
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is inaccessible.
-     * @exception IllegalArgumentException  if the specified object is not
-     *              an instance of the class or interface declaring the
-     *              underlying field (or a subclass or implementor
-     *              thereof), or if the field value cannot be
-     *              converted to the type {@code long} by a
-     *              widening conversion.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#get
-     */
-    @CallerSensitive
-    public long getLong(Object obj)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        if (!override) {
-            if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
-                checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers);
-            }
-        }
-        return getFieldAccessor(obj).getLong(obj);
-    }
-
-    /**
-     * Gets the value of a static or instance field of type
-     * {@code float} or of another primitive type convertible to
-     * type {@code float} via a widening conversion.
-     *
-     * @param obj the object to extract the {@code float} value
-     * from
-     * @return the value of the field converted to type {@code float}
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is inaccessible.
-     * @exception IllegalArgumentException  if the specified object is not
-     *              an instance of the class or interface declaring the
-     *              underlying field (or a subclass or implementor
-     *              thereof), or if the field value cannot be
-     *              converted to the type {@code float} by a
-     *              widening conversion.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see Field#get
-     */
-    @CallerSensitive
-    public float getFloat(Object obj)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        if (!override) {
-            if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
-                checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers);
-            }
-        }
-        return getFieldAccessor(obj).getFloat(obj);
-    }
-
-    /**
-     * Gets the value of a static or instance field of type
-     * {@code double} or of another primitive type convertible to
-     * type {@code double} via a widening conversion.
-     *
-     * @param obj the object to extract the {@code double} value
-     * from
-     * @return the value of the field converted to type {@code double}
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is inaccessible.
-     * @exception IllegalArgumentException  if the specified object is not
-     *              an instance of the class or interface declaring the
-     *              underlying field (or a subclass or implementor
-     *              thereof), or if the field value cannot be
-     *              converted to the type {@code double} by a
-     *              widening conversion.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#get
-     */
-    @CallerSensitive
-    public double getDouble(Object obj)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        if (!override) {
-            if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
-                checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers);
-            }
-        }
-        return getFieldAccessor(obj).getDouble(obj);
-    }
-
-    /**
-     * Sets the field represented by this {@code Field} object on the
-     * specified object argument to the specified new value. The new
-     * value is automatically unwrapped if the underlying field has a
-     * primitive type.
-     *
-     * <p>The operation proceeds as follows:
-     *
-     * <p>If the underlying field is static, the {@code obj} argument is
-     * ignored; it may be null.
-     *
-     * <p>Otherwise the underlying field is an instance field.  If the
-     * specified object argument is null, the method throws a
-     * {@code NullPointerException}.  If the specified object argument is not
-     * an instance of the class or interface declaring the underlying
-     * field, the method throws an {@code IllegalArgumentException}.
-     *
-     * <p>If this {@code Field} object is enforcing Java language access control, and
-     * the underlying field is inaccessible, the method throws an
-     * {@code IllegalAccessException}.
-     *
-     * <p>If the underlying field is final, the method throws an
-     * {@code IllegalAccessException} unless {@code setAccessible(true)}
-     * has succeeded for this {@code Field} object
-     * and the field is non-static. Setting a final field in this way
-     * is meaningful only during deserialization or reconstruction of
-     * instances of classes with blank final fields, before they are
-     * made available for access by other parts of a program. Use in
-     * any other context may have unpredictable effects, including cases
-     * in which other parts of a program continue to use the original
-     * value of this field.
-     *
-     * <p>If the underlying field is of a primitive type, an unwrapping
-     * conversion is attempted to convert the new value to a value of
-     * a primitive type.  If this attempt fails, the method throws an
-     * {@code IllegalArgumentException}.
-     *
-     * <p>If, after possible unwrapping, the new value cannot be
-     * converted to the type of the underlying field by an identity or
-     * widening conversion, the method throws an
-     * {@code IllegalArgumentException}.
-     *
-     * <p>If the underlying field is static, the class that declared the
-     * field is initialized if it has not already been initialized.
-     *
-     * <p>The field is set to the possibly unwrapped and widened new value.
-     *
-     * <p>If the field is hidden in the type of {@code obj},
-     * the field's value is set according to the preceding rules.
-     *
-     * @param obj the object whose field should be modified
-     * @param value the new value for the field of {@code obj}
-     * being modified
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is either inaccessible or final.
-     * @exception IllegalArgumentException  if the specified object is not an
-     *              instance of the class or interface declaring the underlying
-     *              field (or a subclass or implementor thereof),
-     *              or if an unwrapping conversion fails.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     */
-    @CallerSensitive
-    public void set(Object obj, Object value)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        if (!override) {
-            if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
-                checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers);
-            }
-        }
-        getFieldAccessor(obj).set(obj, value);
-    }
-
-    /**
-     * Sets the value of a field as a {@code boolean} on the specified object.
-     * This method is equivalent to
-     * {@code set(obj, zObj)},
-     * where {@code zObj} is a {@code Boolean} object and
-     * {@code zObj.booleanValue() == z}.
-     *
-     * @param obj the object whose field should be modified
-     * @param z   the new value for the field of {@code obj}
-     * being modified
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is either inaccessible or final.
-     * @exception IllegalArgumentException  if the specified object is not an
-     *              instance of the class or interface declaring the underlying
-     *              field (or a subclass or implementor thereof),
-     *              or if an unwrapping conversion fails.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#set
-     */
-    @CallerSensitive
-    public void setBoolean(Object obj, boolean z)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        if (!override) {
-            if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
-                checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers);
-            }
-        }
-        getFieldAccessor(obj).setBoolean(obj, z);
-    }
-
-    /**
-     * Sets the value of a field as a {@code byte} on the specified object.
-     * This method is equivalent to
-     * {@code set(obj, bObj)},
-     * where {@code bObj} is a {@code Byte} object and
-     * {@code bObj.byteValue() == b}.
-     *
-     * @param obj the object whose field should be modified
-     * @param b   the new value for the field of {@code obj}
-     * being modified
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is either inaccessible or final.
-     * @exception IllegalArgumentException  if the specified object is not an
-     *              instance of the class or interface declaring the underlying
-     *              field (or a subclass or implementor thereof),
-     *              or if an unwrapping conversion fails.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#set
-     */
-    @CallerSensitive
-    public void setByte(Object obj, byte b)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        if (!override) {
-            if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
-                checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers);
-            }
-        }
-        getFieldAccessor(obj).setByte(obj, b);
-    }
-
-    /**
-     * Sets the value of a field as a {@code char} on the specified object.
-     * This method is equivalent to
-     * {@code set(obj, cObj)},
-     * where {@code cObj} is a {@code Character} object and
-     * {@code cObj.charValue() == c}.
-     *
-     * @param obj the object whose field should be modified
-     * @param c   the new value for the field of {@code obj}
-     * being modified
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is either inaccessible or final.
-     * @exception IllegalArgumentException  if the specified object is not an
-     *              instance of the class or interface declaring the underlying
-     *              field (or a subclass or implementor thereof),
-     *              or if an unwrapping conversion fails.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#set
-     */
-    @CallerSensitive
-    public void setChar(Object obj, char c)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        if (!override) {
-            if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
-                checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers);
-            }
-        }
-        getFieldAccessor(obj).setChar(obj, c);
-    }
-
-    /**
-     * Sets the value of a field as a {@code short} on the specified object.
-     * This method is equivalent to
-     * {@code set(obj, sObj)},
-     * where {@code sObj} is a {@code Short} object and
-     * {@code sObj.shortValue() == s}.
-     *
-     * @param obj the object whose field should be modified
-     * @param s   the new value for the field of {@code obj}
-     * being modified
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is either inaccessible or final.
-     * @exception IllegalArgumentException  if the specified object is not an
-     *              instance of the class or interface declaring the underlying
-     *              field (or a subclass or implementor thereof),
-     *              or if an unwrapping conversion fails.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#set
-     */
-    @CallerSensitive
-    public void setShort(Object obj, short s)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        if (!override) {
-            if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
-                checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers);
-            }
-        }
-        getFieldAccessor(obj).setShort(obj, s);
-    }
-
-    /**
-     * Sets the value of a field as an {@code int} on the specified object.
-     * This method is equivalent to
-     * {@code set(obj, iObj)},
-     * where {@code iObj} is a {@code Integer} object and
-     * {@code iObj.intValue() == i}.
-     *
-     * @param obj the object whose field should be modified
-     * @param i   the new value for the field of {@code obj}
-     * being modified
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is either inaccessible or final.
-     * @exception IllegalArgumentException  if the specified object is not an
-     *              instance of the class or interface declaring the underlying
-     *              field (or a subclass or implementor thereof),
-     *              or if an unwrapping conversion fails.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#set
-     */
-    @CallerSensitive
-    public void setInt(Object obj, int i)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        if (!override) {
-            if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
-                checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers);
-            }
-        }
-        getFieldAccessor(obj).setInt(obj, i);
-    }
-
-    /**
-     * Sets the value of a field as a {@code long} on the specified object.
-     * This method is equivalent to
-     * {@code set(obj, lObj)},
-     * where {@code lObj} is a {@code Long} object and
-     * {@code lObj.longValue() == l}.
-     *
-     * @param obj the object whose field should be modified
-     * @param l   the new value for the field of {@code obj}
-     * being modified
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is either inaccessible or final.
-     * @exception IllegalArgumentException  if the specified object is not an
-     *              instance of the class or interface declaring the underlying
-     *              field (or a subclass or implementor thereof),
-     *              or if an unwrapping conversion fails.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#set
-     */
-    @CallerSensitive
-    public void setLong(Object obj, long l)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        if (!override) {
-            if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
-                checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers);
-            }
-        }
-        getFieldAccessor(obj).setLong(obj, l);
-    }
-
-    /**
-     * Sets the value of a field as a {@code float} on the specified object.
-     * This method is equivalent to
-     * {@code set(obj, fObj)},
-     * where {@code fObj} is a {@code Float} object and
-     * {@code fObj.floatValue() == f}.
-     *
-     * @param obj the object whose field should be modified
-     * @param f   the new value for the field of {@code obj}
-     * being modified
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is either inaccessible or final.
-     * @exception IllegalArgumentException  if the specified object is not an
-     *              instance of the class or interface declaring the underlying
-     *              field (or a subclass or implementor thereof),
-     *              or if an unwrapping conversion fails.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#set
-     */
-    @CallerSensitive
-    public void setFloat(Object obj, float f)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        if (!override) {
-            if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
-                checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers);
-            }
-        }
-        getFieldAccessor(obj).setFloat(obj, f);
-    }
-
-    /**
-     * Sets the value of a field as a {@code double} on the specified object.
-     * This method is equivalent to
-     * {@code set(obj, dObj)},
-     * where {@code dObj} is a {@code Double} object and
-     * {@code dObj.doubleValue() == d}.
-     *
-     * @param obj the object whose field should be modified
-     * @param d   the new value for the field of {@code obj}
-     * being modified
-     *
-     * @exception IllegalAccessException    if this {@code Field} object
-     *              is enforcing Java language access control and the underlying
-     *              field is either inaccessible or final.
-     * @exception IllegalArgumentException  if the specified object is not an
-     *              instance of the class or interface declaring the underlying
-     *              field (or a subclass or implementor thereof),
-     *              or if an unwrapping conversion fails.
-     * @exception NullPointerException      if the specified object is null
-     *              and the field is an instance field.
-     * @exception ExceptionInInitializerError if the initialization provoked
-     *              by this method fails.
-     * @see       Field#set
-     */
-    @CallerSensitive
-    public void setDouble(Object obj, double d)
-        throws IllegalArgumentException, IllegalAccessException
-    {
-        if (!override) {
-            if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
-                checkAccess(Reflection.getCallerClass(), clazz, obj, modifiers);
-            }
-        }
-        getFieldAccessor(obj).setDouble(obj, d);
-    }
-
-    // security check is done before calling this method
-    private FieldAccessor getFieldAccessor(Object obj)
-        throws IllegalAccessException
-    {
-        boolean ov = override;
-        FieldAccessor a = (ov) ? overrideFieldAccessor : fieldAccessor;
-        return (a != null) ? a : acquireFieldAccessor(ov);
-    }
-
-    // NOTE that there is no synchronization used here. It is correct
-    // (though not efficient) to generate more than one FieldAccessor
-    // for a given Field. However, avoiding synchronization will
-    // probably make the implementation more scalable.
-    private FieldAccessor acquireFieldAccessor(boolean overrideFinalCheck) {
-        // First check to see if one has been created yet, and take it
-        // if so
-        FieldAccessor tmp = null;
-        if (root != null) tmp = root.getFieldAccessor(overrideFinalCheck);
-        if (tmp != null) {
-            if (overrideFinalCheck)
-                overrideFieldAccessor = tmp;
-            else
-                fieldAccessor = tmp;
-        } else {
-            // Otherwise fabricate one and propagate it up to the root
-            tmp = reflectionFactory.newFieldAccessor(this, overrideFinalCheck);
-            setFieldAccessor(tmp, overrideFinalCheck);
-        }
-
-        return tmp;
-    }
-
-    // Returns FieldAccessor for this Field object, not looking up
-    // the chain to the root
-    private FieldAccessor getFieldAccessor(boolean overrideFinalCheck) {
-        return (overrideFinalCheck)? overrideFieldAccessor : fieldAccessor;
-    }
-
-    // Sets the FieldAccessor for this Field object and
-    // (recursively) its root
-    private void setFieldAccessor(FieldAccessor accessor, boolean overrideFinalCheck) {
-        if (overrideFinalCheck)
-            overrideFieldAccessor = accessor;
-        else
-            fieldAccessor = accessor;
-        // Propagate up
-        if (root != null) {
-            root.setFieldAccessor(accessor, overrideFinalCheck);
-        }
-    }
-
-    /*
-     * Utility routine to paper over array type names
-     */
-    static String getTypeName(Class<?> type) {
-        if (type.isArray()) {
-            try {
-                Class<?> cl = type;
-                int dimensions = 0;
-                while (cl.isArray()) {
-                    dimensions++;
-                    cl = cl.getComponentType();
-                }
-                StringBuffer sb = new StringBuffer();
-                sb.append(cl.getName());
-                for (int i = 0; i < dimensions; i++) {
-                    sb.append("[]");
-                }
-                return sb.toString();
-            } catch (Throwable e) { /*FALLTHRU*/ }
-        }
-        return type.getName();
-    }
-
-    /**
-     * @throws NullPointerException {@inheritDoc}
-     * @since 1.5
-     */
-    public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
-        if (annotationClass == null)
-            throw new NullPointerException();
-
-        return (T) declaredAnnotations().get(annotationClass);
-    }
-
-    private static final Annotation[] EMPTY_ANNOTATION_ARRAY=new Annotation[0];
-
-    /**
-     * @since 1.5
-     */
-    public Annotation[] getDeclaredAnnotations()  {
-        return declaredAnnotations().values().toArray(EMPTY_ANNOTATION_ARRAY);
-    }
-
-    private transient Map<Class<? extends Annotation>, Annotation> declaredAnnotations;
-
-    private synchronized  Map<Class<? extends Annotation>, Annotation> declaredAnnotations() {
-        if (declaredAnnotations == null) {
-            declaredAnnotations = getDeclaredAnnotationsImpl();
-        }
-        return declaredAnnotations;
-    }
-    
-    private native Map<Class<? extends Annotation>, Annotation> getDeclaredAnnotationsImpl();
-}
diff --git a/openjdk/java/lang/reflect/Method.java b/openjdk/java/lang/reflect/Method.java
deleted file mode 100644
index dce789a4..00000000
--- a/openjdk/java/lang/reflect/Method.java
+++ /dev/null
@@ -1,749 +0,0 @@
-/*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.reflect;
-
-import ikvm.internal.CallerID;
-import sun.reflect.CallerSensitive;
-import sun.reflect.MethodAccessor;
-import sun.reflect.Reflection;
-import sun.reflect.generics.repository.MethodRepository;
-import sun.reflect.generics.factory.CoreReflectionFactory;
-import sun.reflect.generics.factory.GenericsFactory;
-import sun.reflect.generics.scope.MethodScope;
-import sun.reflect.annotation.AnnotationType;
-import sun.reflect.annotation.AnnotationParser;
-import java.lang.annotation.Annotation;
-import java.lang.annotation.AnnotationFormatError;
-import java.nio.ByteBuffer;
-import java.util.Map;
-
-/**
- * A {@code Method} provides information about, and access to, a single method
- * on a class or interface.  The reflected method may be a class method
- * or an instance method (including an abstract method).
- *
- * <p>A {@code Method} permits widening conversions to occur when matching the
- * actual parameters to invoke with the underlying method's formal
- * parameters, but it throws an {@code IllegalArgumentException} if a
- * narrowing conversion would occur.
- *
- * @see Member
- * @see java.lang.Class
- * @see java.lang.Class#getMethods()
- * @see java.lang.Class#getMethod(String, Class[])
- * @see java.lang.Class#getDeclaredMethods()
- * @see java.lang.Class#getDeclaredMethod(String, Class[])
- *
- * @author Kenneth Russell
- * @author Nakul Saraiya
- */
-public final
-    class Method extends AccessibleObject implements GenericDeclaration,
-                                                     Member {
-    private Class<?>            clazz;
-    private int                 slot;
-    // This is guaranteed to be interned by the VM in the 1.4
-    // reflection implementation
-    private String              name;
-    private Class<?>            returnType;
-    private Class<?>[]          parameterTypes;
-    private Class<?>[]          exceptionTypes;
-    private int                 modifiers;
-    // Generics and annotations support
-    private transient String              signature;
-    // generic info repository; lazily initialized
-    private transient MethodRepository genericInfo;
-    private volatile MethodAccessor methodAccessor;
-    // For sharing of MethodAccessors. This branching structure is
-    // currently only two levels deep (i.e., one root Method and
-    // potentially many Method objects pointing to it.)
-    private Method              root;
-
-   // Generics infrastructure
-
-    private String getGenericSignature() {return signature;}
-
-    // Accessor for factory
-    private GenericsFactory getFactory() {
-        // create scope and factory
-        return CoreReflectionFactory.make(this, MethodScope.make(this));
-    }
-
-    // Accessor for generic info repository
-    private MethodRepository getGenericInfo() {
-        // lazily initialize repository if necessary
-        if (genericInfo == null) {
-            // create and cache generic info repository
-            genericInfo = MethodRepository.make(getGenericSignature(),
-                                                getFactory());
-        }
-        return genericInfo; //return cached repository
-    }
-
-    /**
-     * Package-private constructor used by ReflectAccess to enable
-     * instantiation of these objects in Java code from the java.lang
-     * package via sun.reflect.LangReflectAccess.
-     */
-    Method(Class<?> declaringClass,
-           String name,
-           Class<?>[] parameterTypes,
-           Class<?> returnType,
-           Class<?>[] checkedExceptions,
-           int modifiers,
-           int slot,
-           String signature,
-           byte[] unused1,
-           byte[] unused2,
-           byte[] unused3)
-    {
-        this.clazz = declaringClass;
-        this.name = name;
-        this.parameterTypes = parameterTypes;
-        this.returnType = returnType;
-        this.exceptionTypes = checkedExceptions;
-        this.modifiers = modifiers;
-        this.slot = slot;
-        this.signature = signature;
-    }
-
-    /**
-     * Package-private routine (exposed to java.lang.Class via
-     * ReflectAccess) which returns a copy of this Method. The copy's
-     * "root" field points to this Method.
-     */
-    Method copy() {
-        // This routine enables sharing of MethodAccessor objects
-        // among Method objects which refer to the same underlying
-        // method in the VM. (All of this contortion is only necessary
-        // because of the "accessibility" bit in AccessibleObject,
-        // which implicitly requires that new java.lang.reflect
-        // objects be fabricated for each reflective call on Class
-        // objects.)
-        Method res = new Method(clazz, name, parameterTypes, returnType,
-                                exceptionTypes, modifiers, slot, signature,
-                                null, null, null);
-        res.root = this;
-        // Might as well eagerly propagate this if already present
-        res.methodAccessor = methodAccessor;
-        return res;
-    }
-
-    /**
-     * Returns the {@code Class} object representing the class or interface
-     * that declares the method represented by this {@code Method} object.
-     */
-    public Class<?> getDeclaringClass() {
-        return clazz;
-    }
-
-    /**
-     * Returns the name of the method represented by this {@code Method}
-     * object, as a {@code String}.
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Returns the Java language modifiers for the method represented
-     * by this {@code Method} object, as an integer. The {@code Modifier} class should
-     * be used to decode the modifiers.
-     *
-     * @see Modifier
-     */
-    public int getModifiers() {
-        return modifiers;
-    }
-
-    /**
-     * Returns an array of {@code TypeVariable} objects that represent the
-     * type variables declared by the generic declaration represented by this
-     * {@code GenericDeclaration} object, in declaration order.  Returns an
-     * array of length 0 if the underlying generic declaration declares no type
-     * variables.
-     *
-     * @return an array of {@code TypeVariable} objects that represent
-     *     the type variables declared by this generic declaration
-     * @throws GenericSignatureFormatError if the generic
-     *     signature of this generic declaration does not conform to
-     *     the format specified in
-     *     <cite>The Java&trade; Virtual Machine Specification</cite>
-     * @since 1.5
-     */
-    public TypeVariable<Method>[] getTypeParameters() {
-        if (getGenericSignature() != null)
-            return (TypeVariable<Method>[])getGenericInfo().getTypeParameters();
-        else
-            return (TypeVariable<Method>[])new TypeVariable[0];
-    }
-
-    /**
-     * Returns a {@code Class} object that represents the formal return type
-     * of the method represented by this {@code Method} object.
-     *
-     * @return the return type for the method this object represents
-     */
-    public Class<?> getReturnType() {
-        return returnType;
-    }
-
-    /**
-     * Returns a {@code Type} object that represents the formal return
-     * type of the method represented by this {@code Method} object.
-     *
-     * <p>If the return type is a parameterized type,
-     * the {@code Type} object returned must accurately reflect
-     * the actual type parameters used in the source code.
-     *
-     * <p>If the return type is a type variable or a parameterized type, it
-     * is created. Otherwise, it is resolved.
-     *
-     * @return  a {@code Type} object that represents the formal return
-     *     type of the underlying  method
-     * @throws GenericSignatureFormatError
-     *     if the generic method signature does not conform to the format
-     *     specified in
-     *     <cite>The Java&trade; Virtual Machine Specification</cite>
-     * @throws TypeNotPresentException if the underlying method's
-     *     return type refers to a non-existent type declaration
-     * @throws MalformedParameterizedTypeException if the
-     *     underlying method's return typed refers to a parameterized
-     *     type that cannot be instantiated for any reason
-     * @since 1.5
-     */
-    public Type getGenericReturnType() {
-      if (getGenericSignature() != null) {
-        return getGenericInfo().getReturnType();
-      } else { return getReturnType();}
-    }
-
-
-    /**
-     * Returns an array of {@code Class} objects that represent the formal
-     * parameter types, in declaration order, of the method
-     * represented by this {@code Method} object.  Returns an array of length
-     * 0 if the underlying method takes no parameters.
-     *
-     * @return the parameter types for the method this object
-     * represents
-     */
-    public Class<?>[] getParameterTypes() {
-        return (Class<?>[]) parameterTypes.clone();
-    }
-
-    /**
-     * Returns an array of {@code Type} objects that represent the formal
-     * parameter types, in declaration order, of the method represented by
-     * this {@code Method} object. Returns an array of length 0 if the
-     * underlying method takes no parameters.
-     *
-     * <p>If a formal parameter type is a parameterized type,
-     * the {@code Type} object returned for it must accurately reflect
-     * the actual type parameters used in the source code.
-     *
-     * <p>If a formal parameter type is a type variable or a parameterized
-     * type, it is created. Otherwise, it is resolved.
-     *
-     * @return an array of Types that represent the formal
-     *     parameter types of the underlying method, in declaration order
-     * @throws GenericSignatureFormatError
-     *     if the generic method signature does not conform to the format
-     *     specified in
-     *     <cite>The Java&trade; Virtual Machine Specification</cite>
-     * @throws TypeNotPresentException if any of the parameter
-     *     types of the underlying method refers to a non-existent type
-     *     declaration
-     * @throws MalformedParameterizedTypeException if any of
-     *     the underlying method's parameter types refer to a parameterized
-     *     type that cannot be instantiated for any reason
-     * @since 1.5
-     */
-    public Type[] getGenericParameterTypes() {
-        if (getGenericSignature() != null)
-            return getGenericInfo().getParameterTypes();
-        else
-            return getParameterTypes();
-    }
-
-
-    /**
-     * Returns an array of {@code Class} objects that represent
-     * the types of the exceptions declared to be thrown
-     * by the underlying method
-     * represented by this {@code Method} object.  Returns an array of length
-     * 0 if the method declares no exceptions in its {@code throws} clause.
-     *
-     * @return the exception types declared as being thrown by the
-     * method this object represents
-     */
-    public Class<?>[] getExceptionTypes() {
-        return (Class<?>[]) exceptionTypes.clone();
-    }
-
-    /**
-     * Returns an array of {@code Type} objects that represent the
-     * exceptions declared to be thrown by this {@code Method} object.
-     * Returns an array of length 0 if the underlying method declares
-     * no exceptions in its {@code throws} clause.
-     *
-     * <p>If an exception type is a type variable or a parameterized
-     * type, it is created. Otherwise, it is resolved.
-     *
-     * @return an array of Types that represent the exception types
-     *     thrown by the underlying method
-     * @throws GenericSignatureFormatError
-     *     if the generic method signature does not conform to the format
-     *     specified in
-     *     <cite>The Java&trade; Virtual Machine Specification</cite>
-     * @throws TypeNotPresentException if the underlying method's
-     *     {@code throws} clause refers to a non-existent type declaration
-     * @throws MalformedParameterizedTypeException if
-     *     the underlying method's {@code throws} clause refers to a
-     *     parameterized type that cannot be instantiated for any reason
-     * @since 1.5
-     */
-      public Type[] getGenericExceptionTypes() {
-          Type[] result;
-          if (getGenericSignature() != null &&
-              ((result = getGenericInfo().getExceptionTypes()).length > 0))
-              return result;
-          else
-              return getExceptionTypes();
-      }
-
-    /**
-     * Compares this {@code Method} against the specified object.  Returns
-     * true if the objects are the same.  Two {@code Methods} are the same if
-     * they were declared by the same class and have the same name
-     * and formal parameter types and return type.
-     */
-    public boolean equals(Object obj) {
-        if (obj != null && obj instanceof Method) {
-            Method other = (Method)obj;
-            if ((getDeclaringClass() == other.getDeclaringClass())
-                && (getName() == other.getName())) {
-                if (!returnType.equals(other.getReturnType()))
-                    return false;
-                /* Avoid unnecessary cloning */
-                Class<?>[] params1 = parameterTypes;
-                Class<?>[] params2 = other.parameterTypes;
-                if (params1.length == params2.length) {
-                    for (int i = 0; i < params1.length; i++) {
-                        if (params1[i] != params2[i])
-                            return false;
-                    }
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Returns a hashcode for this {@code Method}.  The hashcode is computed
-     * as the exclusive-or of the hashcodes for the underlying
-     * method's declaring class name and the method's name.
-     */
-    public int hashCode() {
-        return getDeclaringClass().getName().hashCode() ^ getName().hashCode();
-    }
-
-    /**
-     * Returns a string describing this {@code Method}.  The string is
-     * formatted as the method access modifiers, if any, followed by
-     * the method return type, followed by a space, followed by the
-     * class declaring the method, followed by a period, followed by
-     * the method name, followed by a parenthesized, comma-separated
-     * list of the method's formal parameter types. If the method
-     * throws checked exceptions, the parameter list is followed by a
-     * space, followed by the word throws followed by a
-     * comma-separated list of the thrown exception types.
-     * For example:
-     * <pre>
-     *    public boolean java.lang.Object.equals(java.lang.Object)
-     * </pre>
-     *
-     * <p>The access modifiers are placed in canonical order as
-     * specified by "The Java Language Specification".  This is
-     * {@code public}, {@code protected} or {@code private} first,
-     * and then other modifiers in the following order:
-     * {@code abstract}, {@code static}, {@code final},
-     * {@code synchronized}, {@code native}, {@code strictfp}.
-     */
-    public String toString() {
-        try {
-            StringBuilder sb = new StringBuilder();
-            int mod = getModifiers() & Modifier.methodModifiers();
-            if (mod != 0) {
-                sb.append(Modifier.toString(mod)).append(' ');
-            }
-            sb.append(Field.getTypeName(getReturnType())).append(' ');
-            sb.append(Field.getTypeName(getDeclaringClass())).append('.');
-            sb.append(getName()).append('(');
-            Class<?>[] params = parameterTypes; // avoid clone
-            for (int j = 0; j < params.length; j++) {
-                sb.append(Field.getTypeName(params[j]));
-                if (j < (params.length - 1))
-                    sb.append(',');
-            }
-            sb.append(')');
-            Class<?>[] exceptions = exceptionTypes; // avoid clone
-            if (exceptions.length > 0) {
-                sb.append(" throws ");
-                for (int k = 0; k < exceptions.length; k++) {
-                    sb.append(exceptions[k].getName());
-                    if (k < (exceptions.length - 1))
-                        sb.append(',');
-                }
-            }
-            return sb.toString();
-        } catch (Exception e) {
-            return "<" + e + ">";
-        }
-    }
-
-    /**
-     * Returns a string describing this {@code Method}, including
-     * type parameters.  The string is formatted as the method access
-     * modifiers, if any, followed by an angle-bracketed
-     * comma-separated list of the method's type parameters, if any,
-     * followed by the method's generic return type, followed by a
-     * space, followed by the class declaring the method, followed by
-     * a period, followed by the method name, followed by a
-     * parenthesized, comma-separated list of the method's generic
-     * formal parameter types.
-     *
-     * If this method was declared to take a variable number of
-     * arguments, instead of denoting the last parameter as
-     * "<tt><i>Type</i>[]</tt>", it is denoted as
-     * "<tt><i>Type</i>...</tt>".
-     *
-     * A space is used to separate access modifiers from one another
-     * and from the type parameters or return type.  If there are no
-     * type parameters, the type parameter list is elided; if the type
-     * parameter list is present, a space separates the list from the
-     * class name.  If the method is declared to throw exceptions, the
-     * parameter list is followed by a space, followed by the word
-     * throws followed by a comma-separated list of the generic thrown
-     * exception types.  If there are no type parameters, the type
-     * parameter list is elided.
-     *
-     * <p>The access modifiers are placed in canonical order as
-     * specified by "The Java Language Specification".  This is
-     * {@code public}, {@code protected} or {@code private} first,
-     * and then other modifiers in the following order:
-     * {@code abstract}, {@code static}, {@code final},
-     * {@code synchronized}, {@code native}, {@code strictfp}.
-     *
-     * @return a string describing this {@code Method},
-     * include type parameters
-     *
-     * @since 1.5
-     */
-    public String toGenericString() {
-        try {
-            StringBuilder sb = new StringBuilder();
-            int mod = getModifiers() & Modifier.methodModifiers();
-            if (mod != 0) {
-                sb.append(Modifier.toString(mod)).append(' ');
-            }
-            TypeVariable<?>[] typeparms = getTypeParameters();
-            if (typeparms.length > 0) {
-                boolean first = true;
-                sb.append('<');
-                for(TypeVariable<?> typeparm: typeparms) {
-                    if (!first)
-                        sb.append(',');
-                    // Class objects can't occur here; no need to test
-                    // and call Class.getName().
-                    sb.append(typeparm.toString());
-                    first = false;
-                }
-                sb.append("> ");
-            }
-
-            Type genRetType = getGenericReturnType();
-            sb.append( ((genRetType instanceof Class<?>)?
-                        Field.getTypeName((Class<?>)genRetType):genRetType.toString()))
-                    .append(' ');
-
-            sb.append(Field.getTypeName(getDeclaringClass())).append('.');
-            sb.append(getName()).append('(');
-            Type[] params = getGenericParameterTypes();
-            for (int j = 0; j < params.length; j++) {
-                String param = (params[j] instanceof Class)?
-                    Field.getTypeName((Class)params[j]):
-                    (params[j].toString());
-                if (isVarArgs() && (j == params.length - 1)) // replace T[] with T...
-                    param = param.replaceFirst("\\[\\]$", "...");
-                sb.append(param);
-                if (j < (params.length - 1))
-                    sb.append(',');
-            }
-            sb.append(')');
-            Type[] exceptions = getGenericExceptionTypes();
-            if (exceptions.length > 0) {
-                sb.append(" throws ");
-                for (int k = 0; k < exceptions.length; k++) {
-                    sb.append((exceptions[k] instanceof Class)?
-                              ((Class)exceptions[k]).getName():
-                              exceptions[k].toString());
-                    if (k < (exceptions.length - 1))
-                        sb.append(',');
-                }
-            }
-            return sb.toString();
-        } catch (Exception e) {
-            return "<" + e + ">";
-        }
-    }
-
-    /**
-     * Invokes the underlying method represented by this {@code Method}
-     * object, on the specified object with the specified parameters.
-     * Individual parameters are automatically unwrapped to match
-     * primitive formal parameters, and both primitive and reference
-     * parameters are subject to method invocation conversions as
-     * necessary.
-     *
-     * <p>If the underlying method is static, then the specified {@code obj}
-     * argument is ignored. It may be null.
-     *
-     * <p>If the number of formal parameters required by the underlying method is
-     * 0, the supplied {@code args} array may be of length 0 or null.
-     *
-     * <p>If the underlying method is an instance method, it is invoked
-     * using dynamic method lookup as documented in The Java Language
-     * Specification, Second Edition, section 15.12.4.4; in particular,
-     * overriding based on the runtime type of the target object will occur.
-     *
-     * <p>If the underlying method is static, the class that declared
-     * the method is initialized if it has not already been initialized.
-     *
-     * <p>If the method completes normally, the value it returns is
-     * returned to the caller of invoke; if the value has a primitive
-     * type, it is first appropriately wrapped in an object. However,
-     * if the value has the type of an array of a primitive type, the
-     * elements of the array are <i>not</i> wrapped in objects; in
-     * other words, an array of primitive type is returned.  If the
-     * underlying method return type is void, the invocation returns
-     * null.
-     *
-     * @param obj  the object the underlying method is invoked from
-     * @param args the arguments used for the method call
-     * @return the result of dispatching the method represented by
-     * this object on {@code obj} with parameters
-     * {@code args}
-     *
-     * @exception IllegalAccessException    if this {@code Method} object
-     *              is enforcing Java language access control and the underlying
-     *              method is inaccessible.
-     * @exception IllegalArgumentException  if the method is an
-     *              instance method and the specified object argument
-     *              is not an instance of the class or interface
-     *              declaring the underlying method (or of a subclass
-     *              or implementor thereof); if the number of actual
-     *              and formal parameters differ; if an unwrapping
-     *              conversion for primitive arguments fails; or if,
-     *              after possible unwrapping, a parameter value
-     *              cannot be converted to the corresponding formal
-     *              parameter type by a method invocation conversion.
-     * @exception InvocationTargetException if the underlying method
-     *              throws an exception.
-     * @exception NullPointerException      if the specified object is null
-     *              and the method is an instance method.
-     * @exception ExceptionInInitializerError if the initialization
-     * provoked by this method fails.
-     */
-    @CallerSensitive
-    public Object invoke(Object obj, Object... args)
-        throws IllegalAccessException, IllegalArgumentException,
-           InvocationTargetException
-    {
-        if (!override) {
-            if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
-                Class<?> caller = Reflection.getCallerClass();
-                checkAccess(caller, clazz, obj, modifiers);
-            }
-        }
-        MethodAccessor ma = methodAccessor;             // read volatile
-        if (ma == null) {
-            ma = acquireMethodAccessor();
-        }
-        return ma.invoke(obj, args, CallerID.getCallerID());
-    }
-
-    /**
-     * Returns {@code true} if this method is a bridge
-     * method; returns {@code false} otherwise.
-     *
-     * @return true if and only if this method is a bridge
-     * method as defined by the Java Language Specification.
-     * @since 1.5
-     */
-    public boolean isBridge() {
-        return (getModifiers() & Modifier.BRIDGE) != 0;
-    }
-
-    /**
-     * Returns {@code true} if this method was declared to take
-     * a variable number of arguments; returns {@code false}
-     * otherwise.
-     *
-     * @return {@code true} if an only if this method was declared to
-     * take a variable number of arguments.
-     * @since 1.5
-     */
-    public boolean isVarArgs() {
-        return (getModifiers() & Modifier.VARARGS) != 0;
-    }
-
-    /**
-     * Returns {@code true} if this method is a synthetic
-     * method; returns {@code false} otherwise.
-     *
-     * @return true if and only if this method is a synthetic
-     * method as defined by the Java Language Specification.
-     * @since 1.5
-     */
-    public boolean isSynthetic() {
-        return Modifier.isSynthetic(getModifiers());
-    }
-
-    // NOTE that there is no synchronization used here. It is correct
-    // (though not efficient) to generate more than one MethodAccessor
-    // for a given Method. However, avoiding synchronization will
-    // probably make the implementation more scalable.
-    private MethodAccessor acquireMethodAccessor() {
-        // First check to see if one has been created yet, and take it
-        // if so
-        MethodAccessor tmp = null;
-        if (root != null) tmp = root.getMethodAccessor();
-        if (tmp != null) {
-            methodAccessor = tmp;
-        } else {
-            // Otherwise fabricate one and propagate it up to the root
-            tmp = reflectionFactory.newMethodAccessor(this);
-            setMethodAccessor(tmp);
-        }
-
-        return tmp;
-    }
-
-    // Returns MethodAccessor for this Method object, not looking up
-    // the chain to the root
-    MethodAccessor getMethodAccessor() {
-        return methodAccessor;
-    }
-
-    // Sets the MethodAccessor for this Method object and
-    // (recursively) its root
-    void setMethodAccessor(MethodAccessor accessor) {
-        methodAccessor = accessor;
-        // Propagate up
-        if (root != null) {
-            root.setMethodAccessor(accessor);
-        }
-    }
-
-    /**
-     * @throws NullPointerException {@inheritDoc}
-     * @since 1.5
-     */
-    public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
-        if (annotationClass == null)
-            throw new NullPointerException();
-
-        return (T) declaredAnnotations().get(annotationClass);
-    }
-
-    private static final Annotation[] EMPTY_ANNOTATION_ARRAY=new Annotation[0];
-
-    /**
-     * @since 1.5
-     */
-    public Annotation[] getDeclaredAnnotations()  {
-        return declaredAnnotations().values().toArray(EMPTY_ANNOTATION_ARRAY);
-    }
-
-    private transient Map<Class<? extends Annotation>, Annotation> declaredAnnotations;
-
-    private synchronized  Map<Class<? extends Annotation>, Annotation> declaredAnnotations() {
-        if (declaredAnnotations == null) {
-            declaredAnnotations = getDeclaredAnnotationsImpl(this);
-        }
-        return declaredAnnotations;
-    }
-    
-    static native Map<Class<? extends Annotation>, Annotation> getDeclaredAnnotationsImpl(Object methodOrConstructor);
-
-    /**
-     * Returns the default value for the annotation member represented by
-     * this {@code Method} instance.  If the member is of a primitive type,
-     * an instance of the corresponding wrapper type is returned. Returns
-     * null if no default is associated with the member, or if the method
-     * instance does not represent a declared member of an annotation type.
-     *
-     * @return the default value for the annotation member represented
-     *     by this {@code Method} instance.
-     * @throws TypeNotPresentException if the annotation is of type
-     *     {@link Class} and no definition can be found for the
-     *     default class value.
-     * @since  1.5
-     */
-    public native Object getDefaultValue();
-
-    /**
-     * Returns an array of arrays that represent the annotations on the formal
-     * parameters, in declaration order, of the method represented by
-     * this {@code Method} object. (Returns an array of length zero if the
-     * underlying method is parameterless.  If the method has one or more
-     * parameters, a nested array of length zero is returned for each parameter
-     * with no annotations.) The annotation objects contained in the returned
-     * arrays are serializable.  The caller of this method is free to modify
-     * the returned arrays; it will have no effect on the arrays returned to
-     * other callers.
-     *
-     * @return an array of arrays that represent the annotations on the formal
-     *    parameters, in declaration order, of the method represented by this
-     *    Method object
-     * @since 1.5
-     */
-    public Annotation[][] getParameterAnnotations() {
-        Annotation[][] result = getParameterAnnotationsImpl(this);
-        int numParameters = parameterTypes.length;
-        if (result == null)
-            return new Annotation[numParameters][0];
-
-        if (result.length != numParameters)
-            throw new java.lang.annotation.AnnotationFormatError(
-                "Parameter annotations don't match number of parameters");
-        return result;
-    }
-
-    static native Annotation[][] getParameterAnnotationsImpl(Object methodOrConstructor);
-}
diff --git a/openjdk/java/lang/reflect/Proxy.java b/openjdk/java/lang/reflect/Proxy.java
deleted file mode 100644
index 3d9850e0..00000000
--- a/openjdk/java/lang/reflect/Proxy.java
+++ /dev/null
@@ -1,815 +0,0 @@
-/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.lang.reflect;
-
-import java.lang.ref.Reference;
-import java.lang.ref.WeakReference;
-import java.security.AccessController;
-import java.security.Permission;
-import java.security.PrivilegedAction;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.List;
-import java.util.WeakHashMap;
-import sun.misc.ProxyGenerator;
-import sun.reflect.CallerSensitive;
-import sun.reflect.Reflection;
-import sun.reflect.misc.ReflectUtil;
-import sun.security.util.SecurityConstants;
-
-/**
- * {@code Proxy} provides static methods for creating dynamic proxy
- * classes and instances, and it is also the superclass of all
- * dynamic proxy classes created by those methods.
- *
- * <p>To create a proxy for some interface {@code Foo}:
- * <pre>
- *     InvocationHandler handler = new MyInvocationHandler(...);
- *     Class proxyClass = Proxy.getProxyClass(
- *         Foo.class.getClassLoader(), new Class[] { Foo.class });
- *     Foo f = (Foo) proxyClass.
- *         getConstructor(new Class[] { InvocationHandler.class }).
- *         newInstance(new Object[] { handler });
- * </pre>
- * or more simply:
- * <pre>
- *     Foo f = (Foo) Proxy.newProxyInstance(Foo.class.getClassLoader(),
- *                                          new Class[] { Foo.class },
- *                                          handler);
- * </pre>
- *
- * <p>A <i>dynamic proxy class</i> (simply referred to as a <i>proxy
- * class</i> below) is a class that implements a list of interfaces
- * specified at runtime when the class is created, with behavior as
- * described below.
- *
- * A <i>proxy interface</i> is such an interface that is implemented
- * by a proxy class.
- *
- * A <i>proxy instance</i> is an instance of a proxy class.
- *
- * Each proxy instance has an associated <i>invocation handler</i>
- * object, which implements the interface {@link InvocationHandler}.
- * A method invocation on a proxy instance through one of its proxy
- * interfaces will be dispatched to the {@link InvocationHandler#invoke
- * invoke} method of the instance's invocation handler, passing the proxy
- * instance, a {@code java.lang.reflect.Method} object identifying
- * the method that was invoked, and an array of type {@code Object}
- * containing the arguments.  The invocation handler processes the
- * encoded method invocation as appropriate and the result that it
- * returns will be returned as the result of the method invocation on
- * the proxy instance.
- *
- * <p>A proxy class has the following properties:
- *
- * <ul>
- * <li>Proxy classes are public, final, and not abstract.
- *
- * <li>The unqualified name of a proxy class is unspecified.  The space
- * of class names that begin with the string {@code "$Proxy"}
- * should be, however, reserved for proxy classes.
- *
- * <li>A proxy class extends {@code java.lang.reflect.Proxy}.
- *
- * <li>A proxy class implements exactly the interfaces specified at its
- * creation, in the same order.
- *
- * <li>If a proxy class implements a non-public interface, then it will
- * be defined in the same package as that interface.  Otherwise, the
- * package of a proxy class is also unspecified.  Note that package
- * sealing will not prevent a proxy class from being successfully defined
- * in a particular package at runtime, and neither will classes already
- * defined by the same class loader and the same package with particular
- * signers.
- *
- * <li>Since a proxy class implements all of the interfaces specified at
- * its creation, invoking {@code getInterfaces} on its
- * {@code Class} object will return an array containing the same
- * list of interfaces (in the order specified at its creation), invoking
- * {@code getMethods} on its {@code Class} object will return
- * an array of {@code Method} objects that include all of the
- * methods in those interfaces, and invoking {@code getMethod} will
- * find methods in the proxy interfaces as would be expected.
- *
- * <li>The {@link Proxy#isProxyClass Proxy.isProxyClass} method will
- * return true if it is passed a proxy class-- a class returned by
- * {@code Proxy.getProxyClass} or the class of an object returned by
- * {@code Proxy.newProxyInstance}-- and false otherwise.
- *
- * <li>The {@code java.security.ProtectionDomain} of a proxy class
- * is the same as that of system classes loaded by the bootstrap class
- * loader, such as {@code java.lang.Object}, because the code for a
- * proxy class is generated by trusted system code.  This protection
- * domain will typically be granted
- * {@code java.security.AllPermission}.
- *
- * <li>Each proxy class has one public constructor that takes one argument,
- * an implementation of the interface {@link InvocationHandler}, to set
- * the invocation handler for a proxy instance.  Rather than having to use
- * the reflection API to access the public constructor, a proxy instance
- * can be also be created by calling the {@link Proxy#newProxyInstance
- * Proxy.newProxyInstance} method, which combines the actions of calling
- * {@link Proxy#getProxyClass Proxy.getProxyClass} with invoking the
- * constructor with an invocation handler.
- * </ul>
- *
- * <p>A proxy instance has the following properties:
- *
- * <ul>
- * <li>Given a proxy instance {@code proxy} and one of the
- * interfaces implemented by its proxy class {@code Foo}, the
- * following expression will return true:
- * <pre>
- *     {@code proxy instanceof Foo}
- * </pre>
- * and the following cast operation will succeed (rather than throwing
- * a {@code ClassCastException}):
- * <pre>
- *     {@code (Foo) proxy}
- * </pre>
- *
- * <li>Each proxy instance has an associated invocation handler, the one
- * that was passed to its constructor.  The static
- * {@link Proxy#getInvocationHandler Proxy.getInvocationHandler} method
- * will return the invocation handler associated with the proxy instance
- * passed as its argument.
- *
- * <li>An interface method invocation on a proxy instance will be
- * encoded and dispatched to the invocation handler's {@link
- * InvocationHandler#invoke invoke} method as described in the
- * documentation for that method.
- *
- * <li>An invocation of the {@code hashCode},
- * {@code equals}, or {@code toString} methods declared in
- * {@code java.lang.Object} on a proxy instance will be encoded and
- * dispatched to the invocation handler's {@code invoke} method in
- * the same manner as interface method invocations are encoded and
- * dispatched, as described above.  The declaring class of the
- * {@code Method} object passed to {@code invoke} will be
- * {@code java.lang.Object}.  Other public methods of a proxy
- * instance inherited from {@code java.lang.Object} are not
- * overridden by a proxy class, so invocations of those methods behave
- * like they do for instances of {@code java.lang.Object}.
- * </ul>
- *
- * <h3>Methods Duplicated in Multiple Proxy Interfaces</h3>
- *
- * <p>When two or more interfaces of a proxy class contain a method with
- * the same name and parameter signature, the order of the proxy class's
- * interfaces becomes significant.  When such a <i>duplicate method</i>
- * is invoked on a proxy instance, the {@code Method} object passed
- * to the invocation handler will not necessarily be the one whose
- * declaring class is assignable from the reference type of the interface
- * that the proxy's method was invoked through.  This limitation exists
- * because the corresponding method implementation in the generated proxy
- * class cannot determine which interface it was invoked through.
- * Therefore, when a duplicate method is invoked on a proxy instance,
- * the {@code Method} object for the method in the foremost interface
- * that contains the method (either directly or inherited through a
- * superinterface) in the proxy class's list of interfaces is passed to
- * the invocation handler's {@code invoke} method, regardless of the
- * reference type through which the method invocation occurred.
- *
- * <p>If a proxy interface contains a method with the same name and
- * parameter signature as the {@code hashCode}, {@code equals},
- * or {@code toString} methods of {@code java.lang.Object},
- * when such a method is invoked on a proxy instance, the
- * {@code Method} object passed to the invocation handler will have
- * {@code java.lang.Object} as its declaring class.  In other words,
- * the public, non-final methods of {@code java.lang.Object}
- * logically precede all of the proxy interfaces for the determination of
- * which {@code Method} object to pass to the invocation handler.
- *
- * <p>Note also that when a duplicate method is dispatched to an
- * invocation handler, the {@code invoke} method may only throw
- * checked exception types that are assignable to one of the exception
- * types in the {@code throws} clause of the method in <i>all</i> of
- * the proxy interfaces that it can be invoked through.  If the
- * {@code invoke} method throws a checked exception that is not
- * assignable to any of the exception types declared by the method in one
- * of the proxy interfaces that it can be invoked through, then an
- * unchecked {@code UndeclaredThrowableException} will be thrown by
- * the invocation on the proxy instance.  This restriction means that not
- * all of the exception types returned by invoking
- * {@code getExceptionTypes} on the {@code Method} object
- * passed to the {@code invoke} method can necessarily be thrown
- * successfully by the {@code invoke} method.
- *
- * @author      Peter Jones
- * @see         InvocationHandler
- * @since       1.3
- */
-public class Proxy implements java.io.Serializable {
-
-    private static final long serialVersionUID = -2222568056686623797L;
-
-    /** prefix for all proxy class names */
-    private final static String proxyClassNamePrefix = "$Proxy";
-
-    /** parameter types of a proxy class constructor */
-    private final static Class[] constructorParams =
-        { InvocationHandler.class };
-
-    /** maps a class loader to the proxy class cache for that loader */
-    private static Map<ClassLoader, Map<List<String>, Object>> loaderToCache
-        = new WeakHashMap<>();
-
-    /** marks that a particular proxy class is currently being generated */
-    private static Object pendingGenerationMarker = new Object();
-
-    /** next number to use for generation of unique proxy class names */
-    private static long nextUniqueNumber = 0;
-    private static Object nextUniqueNumberLock = new Object();
-
-    /** set of all generated proxy classes, for isProxyClass implementation */
-    private static Map<Class<?>, Void> proxyClasses =
-        Collections.synchronizedMap(new WeakHashMap<Class<?>, Void>());
-
-    /**
-     * the invocation handler for this proxy instance.
-     * @serial
-     */
-    protected InvocationHandler h;
-
-    /**
-     * Prohibits instantiation.
-     */
-    private Proxy() {
-    }
-
-    /**
-     * Constructs a new {@code Proxy} instance from a subclass
-     * (typically, a dynamic proxy class) with the specified value
-     * for its invocation handler.
-     *
-     * @param   h the invocation handler for this proxy instance
-     */
-    protected Proxy(InvocationHandler h) {
-        doNewInstanceCheck();
-        this.h = h;
-    }
-
-    private static class ProxyAccessHelper {
-        // The permission is implementation specific.
-        static final Permission PROXY_PERMISSION =
-            new ReflectPermission("proxyConstructorNewInstance");
-        // These system properties are defined to provide a short-term
-        // workaround if customers need to disable the new security checks.
-        static final boolean allowNewInstance;
-        static final boolean allowNullLoader;
-        static {
-            allowNewInstance = getBooleanProperty("sun.reflect.proxy.allowsNewInstance");
-            allowNullLoader = getBooleanProperty("sun.reflect.proxy.allowsNullLoader");
-        }
-
-        private static boolean getBooleanProperty(final String key) {
-            String s = AccessController.doPrivileged(new PrivilegedAction<String>() {
-                public String run() {
-                    return System.getProperty(key);
-                }
-            });
-            return Boolean.valueOf(s);
-        }
-
-        static boolean needsNewInstanceCheck(Class<?> proxyClass) {
-            if (!Proxy.isProxyClass(proxyClass) || allowNewInstance) {
-                return false;
-            }
-
-            if (ReflectUtil.isNonPublicProxyClass(proxyClass)) {
-                for (Class<?> intf : proxyClass.getInterfaces()) {
-                    if (!Modifier.isPublic(intf.getModifiers())) {
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-    }
-
-    /*
-     * Access check on a proxy class that implements any non-public interface.
-     *
-     * @throws  SecurityException if a security manager exists, and
-     *          the caller does not have the permission.
-     */
-    private void doNewInstanceCheck() {
-        SecurityManager sm = System.getSecurityManager();
-        Class<?> proxyClass = this.getClass();
-        if (sm != null && ProxyAccessHelper.needsNewInstanceCheck(proxyClass)) {
-            try {
-                sm.checkPermission(ProxyAccessHelper.PROXY_PERMISSION);
-            } catch (SecurityException e) {
-                throw new SecurityException("Not allowed to construct a Proxy "
-                        + "instance that implements a non-public interface", e);
-            }
-        }
-    }
-
-    /**
-     * Returns the {@code java.lang.Class} object for a proxy class
-     * given a class loader and an array of interfaces.  The proxy class
-     * will be defined by the specified class loader and will implement
-     * all of the supplied interfaces.  If a proxy class for the same
-     * permutation of interfaces has already been defined by the class
-     * loader, then the existing proxy class will be returned; otherwise,
-     * a proxy class for those interfaces will be generated dynamically
-     * and defined by the class loader.
-     *
-     * <p>There are several restrictions on the parameters that may be
-     * passed to {@code Proxy.getProxyClass}:
-     *
-     * <ul>
-     * <li>All of the {@code Class} objects in the
-     * {@code interfaces} array must represent interfaces, not
-     * classes or primitive types.
-     *
-     * <li>No two elements in the {@code interfaces} array may
-     * refer to identical {@code Class} objects.
-     *
-     * <li>All of the interface types must be visible by name through the
-     * specified class loader.  In other words, for class loader
-     * {@code cl} and every interface {@code i}, the following
-     * expression must be true:
-     * <pre>
-     *     Class.forName(i.getName(), false, cl) == i
-     * </pre>
-     *
-     * <li>All non-public interfaces must be in the same package;
-     * otherwise, it would not be possible for the proxy class to
-     * implement all of the interfaces, regardless of what package it is
-     * defined in.
-     *
-     * <li>For any set of member methods of the specified interfaces
-     * that have the same signature:
-     * <ul>
-     * <li>If the return type of any of the methods is a primitive
-     * type or void, then all of the methods must have that same
-     * return type.
-     * <li>Otherwise, one of the methods must have a return type that
-     * is assignable to all of the return types of the rest of the
-     * methods.
-     * </ul>
-     *
-     * <li>The resulting proxy class must not exceed any limits imposed
-     * on classes by the virtual machine.  For example, the VM may limit
-     * the number of interfaces that a class may implement to 65535; in
-     * that case, the size of the {@code interfaces} array must not
-     * exceed 65535.
-     * </ul>
-     *
-     * <p>If any of these restrictions are violated,
-     * {@code Proxy.getProxyClass} will throw an
-     * {@code IllegalArgumentException}.  If the {@code interfaces}
-     * array argument or any of its elements are {@code null}, a
-     * {@code NullPointerException} will be thrown.
-     *
-     * <p>Note that the order of the specified proxy interfaces is
-     * significant: two requests for a proxy class with the same combination
-     * of interfaces but in a different order will result in two distinct
-     * proxy classes.
-     *
-     * @param   loader the class loader to define the proxy class
-     * @param   interfaces the list of interfaces for the proxy class
-     *          to implement
-     * @return  a proxy class that is defined in the specified class loader
-     *          and that implements the specified interfaces
-     * @throws  IllegalArgumentException if any of the restrictions on the
-     *          parameters that may be passed to {@code getProxyClass}
-     *          are violated
-     * @throws  NullPointerException if the {@code interfaces} array
-     *          argument or any of its elements are {@code null}
-     */
-    @CallerSensitive
-    public static Class<?> getProxyClass(ClassLoader loader,
-                                         Class<?>... interfaces)
-        throws IllegalArgumentException
-    {
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            checkProxyAccess(Reflection.getCallerClass(), loader, interfaces);
-        }
-
-        return getProxyClass0(loader, interfaces);
-    }
-
-    /*
-     * Check permissions required to create a Proxy class.
-     *
-     * To define a proxy class, it performs the access checks as in
-     * Class.forName (VM will invoke ClassLoader.checkPackageAccess):
-     * 1. "getClassLoader" permission check if loader == null
-     * 2. checkPackageAccess on the interfaces it implements
-     *
-     * To get a constructor and new instance of a proxy class, it performs
-     * the package access check on the interfaces it implements
-     * as in Class.getConstructor.
-     *
-     * If an interface is non-public, the proxy class must be defined by
-     * the defining loader of the interface.  If the caller's class loader
-     * is not the same as the defining loader of the interface, the VM
-     * will throw IllegalAccessError when the generated proxy class is
-     * being defined via the defineClass0 method.
-     */
-    private static void checkProxyAccess(Class<?> caller,
-                                         ClassLoader loader,
-                                         Class<?>... interfaces)
-    {
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            ClassLoader ccl = caller.getClassLoader();
-            if (loader == null && ccl != null) {
-                if (!ProxyAccessHelper.allowNullLoader) {
-                    sm.checkPermission(SecurityConstants.GET_CLASSLOADER_PERMISSION);
-                }
-            }
-            ReflectUtil.checkProxyPackageAccess(ccl, interfaces);
-        }
-    }
-
-    /**
-     * Generate a proxy class.  Must call the checkProxyAccess method
-     * to perform permission checks before calling this.
-     */
-    private static Class<?> getProxyClass0(ClassLoader loader,
-                                           Class<?>... interfaces) {
-        if (interfaces.length > 65535) {
-            throw new IllegalArgumentException("interface limit exceeded");
-        }
-
-        Class<?> proxyClass = null;
-
-        /* collect interface names to use as key for proxy class cache */
-        String[] interfaceNames = new String[interfaces.length];
-
-        // for detecting duplicates
-        Set<Class<?>> interfaceSet = new HashSet<>();
-
-        for (int i = 0; i < interfaces.length; i++) {
-            /*
-             * Verify that the class loader resolves the name of this
-             * interface to the same Class object.
-             */
-            String interfaceName = interfaces[i].getName();
-            Class<?> interfaceClass = null;
-            try {
-                interfaceClass = Class.forName(interfaceName, false, loader);
-            } catch (ClassNotFoundException e) {
-            }
-            if (interfaceClass != interfaces[i]) {
-                throw new IllegalArgumentException(
-                    interfaces[i] + " is not visible from class loader");
-            }
-
-            /*
-             * Verify that the Class object actually represents an
-             * interface.
-             */
-            if (!interfaceClass.isInterface()) {
-                throw new IllegalArgumentException(
-                    interfaceClass.getName() + " is not an interface");
-            }
-
-            /*
-             * Verify that this interface is not a duplicate.
-             */
-            if (interfaceSet.contains(interfaceClass)) {
-                throw new IllegalArgumentException(
-                    "repeated interface: " + interfaceClass.getName());
-            }
-            interfaceSet.add(interfaceClass);
-
-            interfaceNames[i] = interfaceName;
-        }
-
-        /*
-         * Using string representations of the proxy interfaces as
-         * keys in the proxy class cache (instead of their Class
-         * objects) is sufficient because we require the proxy
-         * interfaces to be resolvable by name through the supplied
-         * class loader, and it has the advantage that using a string
-         * representation of a class makes for an implicit weak
-         * reference to the class.
-         */
-        List<String> key = Arrays.asList(interfaceNames);
-
-        /*
-         * Find or create the proxy class cache for the class loader.
-         */
-        Map<List<String>, Object> cache;
-        synchronized (loaderToCache) {
-            cache = loaderToCache.get(loader);
-            if (cache == null) {
-                cache = new HashMap<>();
-                loaderToCache.put(loader, cache);
-            }
-            /*
-             * This mapping will remain valid for the duration of this
-             * method, without further synchronization, because the mapping
-             * will only be removed if the class loader becomes unreachable.
-             */
-        }
-
-        /*
-         * Look up the list of interfaces in the proxy class cache using
-         * the key.  This lookup will result in one of three possible
-         * kinds of values:
-         *     null, if there is currently no proxy class for the list of
-         *         interfaces in the class loader,
-         *     the pendingGenerationMarker object, if a proxy class for the
-         *         list of interfaces is currently being generated,
-         *     or a weak reference to a Class object, if a proxy class for
-         *         the list of interfaces has already been generated.
-         */
-        synchronized (cache) {
-            /*
-             * Note that we need not worry about reaping the cache for
-             * entries with cleared weak references because if a proxy class
-             * has been garbage collected, its class loader will have been
-             * garbage collected as well, so the entire cache will be reaped
-             * from the loaderToCache map.
-             */
-            do {
-                Object value = cache.get(key);
-                if (value instanceof Reference) {
-                    proxyClass = (Class<?>) ((Reference) value).get();
-                }
-                if (proxyClass != null) {
-                    // proxy class already generated: return it
-                    return proxyClass;
-                } else if (value == pendingGenerationMarker) {
-                    // proxy class being generated: wait for it
-                    try {
-                        cache.wait();
-                    } catch (InterruptedException e) {
-                        /*
-                         * The class generation that we are waiting for should
-                         * take a small, bounded time, so we can safely ignore
-                         * thread interrupts here.
-                         */
-                    }
-                    continue;
-                } else {
-                    /*
-                     * No proxy class for this list of interfaces has been
-                     * generated or is being generated, so we will go and
-                     * generate it now.  Mark it as pending generation.
-                     */
-                    cache.put(key, pendingGenerationMarker);
-                    break;
-                }
-            } while (true);
-        }
-
-        try {
-            String proxyPkg = null;     // package to define proxy class in
-
-            /*
-             * Record the package of a non-public proxy interface so that the
-             * proxy class will be defined in the same package.  Verify that
-             * all non-public proxy interfaces are in the same package.
-             */
-            for (int i = 0; i < interfaces.length; i++) {
-                int flags = interfaces[i].getModifiers();
-                if (!Modifier.isPublic(flags)) {
-                    String name = interfaces[i].getName();
-                    int n = name.lastIndexOf('.');
-                    String pkg = ((n == -1) ? "" : name.substring(0, n + 1));
-                    if (proxyPkg == null) {
-                        proxyPkg = pkg;
-                    } else if (!pkg.equals(proxyPkg)) {
-                        throw new IllegalArgumentException(
-                            "non-public interfaces from different packages");
-                    }
-                }
-            }
-
-            if (proxyPkg == null) {
-                // if no non-public proxy interfaces, use com.sun.proxy package
-                proxyPkg = ReflectUtil.PROXY_PACKAGE + ".";
-            }
-
-generate:   do
-            {
-                /*
-                 * Choose a name for the proxy class to generate.
-                 */
-                long num;
-                synchronized (nextUniqueNumberLock) {
-                    num = nextUniqueNumber++;
-                }
-                String proxyName = proxyPkg + proxyClassNamePrefix + num;
-                /*
-                 * Verify that the class loader hasn't already
-                 * defined a class with the chosen name.
-                 */
-
-                proxyClass = getPrecompiledProxy(loader, proxyName, interfaces);
-                if (proxyClass != null)
-                    break generate;
-
-                /*
-                 * Generate the specified proxy class.
-                 */
-                byte[] proxyClassFile = ProxyGenerator.generateProxyClass(
-                    proxyName, interfaces);
-                try {
-                    proxyClass = defineClass0(loader, proxyName,
-                        proxyClassFile, 0, proxyClassFile.length);
-                } catch (ClassFormatError e) {
-                    /*
-                     * A ClassFormatError here means that (barring bugs in the
-                     * proxy class generation code) there was some other
-                     * invalid aspect of the arguments supplied to the proxy
-                     * class creation (such as virtual machine limitations
-                     * exceeded).
-                     */
-                    throw new IllegalArgumentException(e.toString());
-                }
-            }
-            while (false);
-            // add to set of all generated proxy classes, for isProxyClass
-            proxyClasses.put(proxyClass, null);
-
-        } finally {
-            /*
-             * We must clean up the "pending generation" state of the proxy
-             * class cache entry somehow.  If a proxy class was successfully
-             * generated, store it in the cache (with a weak reference);
-             * otherwise, remove the reserved entry.  In all cases, notify
-             * all waiters on reserved entries in this cache.
-             */
-            synchronized (cache) {
-                if (proxyClass != null) {
-                    cache.put(key, new WeakReference<Class<?>>(proxyClass));
-                } else {
-                    cache.remove(key);
-                }
-                cache.notifyAll();
-            }
-        }
-        return proxyClass;
-    }
-
-    /**
-     * Returns an instance of a proxy class for the specified interfaces
-     * that dispatches method invocations to the specified invocation
-     * handler.  This method is equivalent to:
-     * <pre>
-     *     Proxy.getProxyClass(loader, interfaces).
-     *         getConstructor(new Class[] { InvocationHandler.class }).
-     *         newInstance(new Object[] { handler });
-     * </pre>
-     *
-     * <p>{@code Proxy.newProxyInstance} throws
-     * {@code IllegalArgumentException} for the same reasons that
-     * {@code Proxy.getProxyClass} does.
-     *
-     * @param   loader the class loader to define the proxy class
-     * @param   interfaces the list of interfaces for the proxy class
-     *          to implement
-     * @param   h the invocation handler to dispatch method invocations to
-     * @return  a proxy instance with the specified invocation handler of a
-     *          proxy class that is defined by the specified class loader
-     *          and that implements the specified interfaces
-     * @throws  IllegalArgumentException if any of the restrictions on the
-     *          parameters that may be passed to {@code getProxyClass}
-     *          are violated
-     * @throws  NullPointerException if the {@code interfaces} array
-     *          argument or any of its elements are {@code null}, or
-     *          if the invocation handler, {@code h}, is
-     *          {@code null}
-     */
-    @CallerSensitive
-    public static Object newProxyInstance(ClassLoader loader,
-                                          Class<?>[] interfaces,
-                                          InvocationHandler h)
-        throws IllegalArgumentException
-    {
-        if (h == null) {
-            throw new NullPointerException();
-        }
-
-        final SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            checkProxyAccess(Reflection.getCallerClass(), loader, interfaces);
-        }
-
-        /*
-         * Look up or generate the designated proxy class.
-         */
-        Class<?> cl = getProxyClass0(loader, interfaces);
-
-        /*
-         * Invoke its constructor with the designated invocation handler.
-         */
-        try {
-            final Constructor<?> cons = cl.getConstructor(constructorParams);
-            final InvocationHandler ih = h;
-            if (sm != null && ProxyAccessHelper.needsNewInstanceCheck(cl)) {
-                // create proxy instance with doPrivilege as the proxy class may
-                // implement non-public interfaces that requires a special permission
-                return AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                    public Object run() {
-                        return newInstance(cons, ih);
-                    }
-                });
-            } else {
-                return newInstance(cons, ih);
-            }
-        } catch (NoSuchMethodException e) {
-            throw new InternalError(e.toString());
-        }
-    }
-
-    private static Object newInstance(Constructor<?> cons, InvocationHandler h) {
-        try {
-            return cons.newInstance(new Object[] {h} );
-        } catch (IllegalAccessException | InstantiationException e) {
-            throw new InternalError(e.toString());
-        } catch (InvocationTargetException e) {
-            Throwable t = e.getCause();
-            if (t instanceof RuntimeException) {
-                throw (RuntimeException) t;
-            } else {
-                throw new InternalError(t.toString());
-            }
-        }
-    }
-
-    /**
-     * Returns true if and only if the specified class was dynamically
-     * generated to be a proxy class using the {@code getProxyClass}
-     * method or the {@code newProxyInstance} method.
-     *
-     * <p>The reliability of this method is important for the ability
-     * to use it to make security decisions, so its implementation should
-     * not just test if the class in question extends {@code Proxy}.
-     *
-     * @param   cl the class to test
-     * @return  {@code true} if the class is a proxy class and
-     *          {@code false} otherwise
-     * @throws  NullPointerException if {@code cl} is {@code null}
-     */
-    public static boolean isProxyClass(Class<?> cl) {
-        if (cl == null) {
-            throw new NullPointerException();
-        }
-
-        return proxyClasses.containsKey(cl);
-    }
-
-    /**
-     * Returns the invocation handler for the specified proxy instance.
-     *
-     * @param   proxy the proxy instance to return the invocation handler for
-     * @return  the invocation handler for the proxy instance
-     * @throws  IllegalArgumentException if the argument is not a
-     *          proxy instance
-     */
-    public static InvocationHandler getInvocationHandler(Object proxy)
-        throws IllegalArgumentException
-    {
-        /*
-         * Verify that the object is actually a proxy instance.
-         */
-        if (!isProxyClass(proxy.getClass())) {
-            throw new IllegalArgumentException("not a proxy instance");
-        }
-
-        Proxy p = (Proxy) proxy;
-        return p.h;
-    }
-
-    private static native Class defineClass0(ClassLoader loader, String name,
-                                             byte[] b, int off, int len);
-
-    private static native Class<?> getPrecompiledProxy(ClassLoader loader, String proxyName, Class[] interfaces);
-}
diff --git a/openjdk/java/lang/reflect/ReflectHelper.java b/openjdk/java/lang/reflect/ReflectHelper.java
deleted file mode 100644
index e0eb38cb..00000000
--- a/openjdk/java/lang/reflect/ReflectHelper.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-  Copyright (C) 2007-2012 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-
-package java.lang.reflect;
-
-@ikvm.lang.Internal
-public final class ReflectHelper
-{
-    private ReflectHelper() {}
-
-    public static Field copyFieldAndMakeAccessible(Field field)
-    {
-        field = field.copy();
-        field.override = true;
-        return field;
-    }
-
-    public static Field createFieldAndMakeAccessible(Class c, String name)
-    {
-        // we pass in ReflectHelper.class as the field type (which isn't used)
-        // to make Field.toString() return something "meaningful" instead of crash
-        Field field = new Field(c, name, ReflectHelper.class, 0, -1, null, null);
-        field.override = true;
-        return field;
-    }
-}
diff --git a/openjdk/java/net/DefaultDatagramSocketImplFactory.java b/openjdk/java/net/DefaultDatagramSocketImplFactory.java
deleted file mode 100644
index 7d4f8edb..00000000
--- a/openjdk/java/net/DefaultDatagramSocketImplFactory.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.net;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-/**
- * This class defines a factory for creating DatagramSocketImpls. It defaults
- * to creating plain DatagramSocketImpls, but may create other DatagramSocketImpls
- * by setting the impl.prefix system property.
- *
- * For Windows versions lower than Windows Vista a TwoStacksPlainDatagramSocketImpl
- * is always created. This impl supports IPv6 on these platform where available.
- *
- * On Windows platforms greater than Vista that support a dual layer TCP/IP stack
- * a DualStackPlainDatagramSocketImpl is created for DatagramSockets. For MulticastSockets
- * a TwoStacksPlainDatagramSocketImpl is always created. This is to overcome the lack
- * of behavior defined for multicasting over a dual layer socket by the RFC.
- *
- * @author Chris Hegarty
- */
-
-class DefaultDatagramSocketImplFactory
-{
-    static Class prefixImplClass = null;
-
-    /* the windows version. */
-    private static float version;
-
-    /* java.net.preferIPv4Stack */
-    private static boolean preferIPv4Stack = false;
-
-    /* If the version supports a dual stack TCP implementation */
-    private static boolean useDualStackImpl = false;
-
-    /* sun.net.useExclusiveBind */
-    private static String exclBindProp;
-
-    /* True if exclusive binding is on for Windows */
-    private static boolean exclusiveBind = true;
-
-
-    static {
-        // Determine Windows Version.
-        java.security.AccessController.doPrivileged(
-                new PrivilegedAction<Object>() {
-                    public Object run() {
-                        version = 0;
-                        try {
-                            version = Float.parseFloat(System.getProperties()
-                                    .getProperty("os.version"));
-                            preferIPv4Stack = Boolean.parseBoolean(
-                                              System.getProperties()
-                                              .getProperty(
-                                                   "java.net.preferIPv4Stack"));
-                            exclBindProp = System.getProperty(
-                                    "sun.net.useExclusiveBind");
-                        } catch (NumberFormatException e ) {
-                            assert false : e;
-                        }
-                        return null; // nothing to return
-                    }
-                });
-
-        String ipv6 = ikvm.internal.Util.SafeGetEnvironmentVariable("IKVM_IPV6");
-        if (ipv6 != null) {
-            try {
-                if ((Integer.parseInt(ipv6) & 4) == 0) {
-                    preferIPv4Stack = true;
-                } else {
-                    useDualStackImpl = true;
-                }
-            } catch (NumberFormatException _) {
-            }
-        } else if (!InetAddressImplFactory.isIPv6Supported()) {
-            preferIPv4Stack = true;
-        }
-
-        // (version >= 6.0) implies Vista or greater.
-        if (version >= 6.0 && !preferIPv4Stack) {
-                useDualStackImpl = true;
-        }
-        if (exclBindProp != null) {
-            // sun.net.useExclusiveBind is true
-            exclusiveBind = exclBindProp.length() == 0 ? true
-                    : Boolean.parseBoolean(exclBindProp);
-        } else if (version < 6.0) {
-            exclusiveBind = false;
-        }
-
-        // impl.prefix
-        String prefix = null;
-        try {
-            prefix = AccessController.doPrivileged(
-                new sun.security.action.GetPropertyAction("impl.prefix", null));
-            if (prefix != null)
-                prefixImplClass = Class.forName("java.net."+prefix+"DatagramSocketImpl");
-        } catch (Exception e) {
-            System.err.println("Can't find class: java.net." +
-                                prefix +
-                                "DatagramSocketImpl: check impl.prefix property");
-        }
-    }
-
-    /**
-     * Creates a new <code>DatagramSocketImpl</code> instance.
-     *
-     * @param   isMulticast true if this impl is to be used for a MutlicastSocket
-     * @return  a new instance of <code>PlainDatagramSocketImpl</code>.
-     */
-    static DatagramSocketImpl createDatagramSocketImpl(boolean isMulticast)
-        throws SocketException {
-        if (prefixImplClass != null) {
-            try {
-                return (DatagramSocketImpl) prefixImplClass.newInstance();
-            } catch (Exception e) {
-                throw new SocketException("can't instantiate DatagramSocketImpl");
-            }
-        } else {
-            if (isMulticast)
-                exclusiveBind = false;
-            if (useDualStackImpl && !isMulticast)
-                return new DualStackPlainDatagramSocketImpl(exclusiveBind);
-            else
-                return new TwoStacksPlainDatagramSocketImpl(exclusiveBind);
-        }
-    }
-}
diff --git a/openjdk/java/net/DualStackPlainDatagramSocketImpl.java b/openjdk/java/net/DualStackPlainDatagramSocketImpl.java
deleted file mode 100644
index 1d74e28c..00000000
--- a/openjdk/java/net/DualStackPlainDatagramSocketImpl.java
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.net;
-
-import java.io.IOException;
-
-/**
- * This class defines the plain DatagramSocketImpl that is used on
- * Windows platforms greater than or equal to Windows Vista. These
- * platforms have a dual layer TCP/IP stack and can handle both IPv4
- * and IPV6 through a single file descriptor.
- * <p>
- * Note: Multicasting on a dual layer TCP/IP stack is always done with
- * TwoStacksPlainDatagramSocketImpl. This is to overcome the lack
- * of behavior defined for multicasting over a dual layer socket by the RFC.
- *
- * @author Chris Hegarty
- */
-
-class DualStackPlainDatagramSocketImpl extends AbstractPlainDatagramSocketImpl
-{
-
-    // true if this socket is exclusively bound
-    private final boolean exclusiveBind;
-
-    /*
-     * Set to true if SO_REUSEADDR is set after the socket is bound to
-     * indicate SO_REUSEADDR is being emulated
-     */
-    private boolean reuseAddressEmulated;
-
-    // emulates SO_REUSEADDR when exclusiveBind is true and socket is bound
-    private boolean isReuseAddress;
-
-    DualStackPlainDatagramSocketImpl(boolean exclBind) {
-        exclusiveBind = exclBind;
-    }
-
-    protected void datagramSocketCreate() throws SocketException {
-        if (fd == null)
-            throw new SocketException("Socket closed");
-
-        cli.System.Net.Sockets.Socket newfd = socketCreate(false /* v6Only */);
-
-        fd.setSocket(newfd);
-    }
-
-    protected synchronized void bind0(int lport, InetAddress laddr)
-        throws SocketException {
-        cli.System.Net.Sockets.Socket nativefd = checkAndReturnNativeFD();
-
-        if (laddr == null)
-            throw new NullPointerException("argument address");
-
-        socketBind(nativefd, laddr, lport, exclusiveBind);
-        if (lport == 0) {
-            localPort = socketLocalPort(nativefd);
-        } else {
-            localPort = lport;
-        }
-    }
-
-    protected synchronized int peek(InetAddress address) throws IOException {
-        cli.System.Net.Sockets.Socket nativefd = checkAndReturnNativeFD();
-
-        if (address == null)
-            throw new NullPointerException("Null address in peek()");
-
-        // Use peekData()
-        DatagramPacket peekPacket = new DatagramPacket(new byte[1], 1);
-        int peekPort = peekData(peekPacket);
-        address = peekPacket.getAddress();
-        return peekPort;
-    }
-
-    protected synchronized int peekData(DatagramPacket p) throws IOException {
-        cli.System.Net.Sockets.Socket nativefd = checkAndReturnNativeFD();
-
-        if (p == null)
-            throw new NullPointerException("packet");
-        if (p.getData() == null)
-            throw new NullPointerException("packet buffer");
-
-        return socketReceiveOrPeekData(nativefd, p, timeout, connected, true /*peek*/);
-    }
-
-    protected synchronized void receive0(DatagramPacket p) throws IOException {
-        cli.System.Net.Sockets.Socket nativefd = checkAndReturnNativeFD();
-
-        if (p == null)
-            throw new NullPointerException("packet");
-        if (p.getData() == null)
-            throw new NullPointerException("packet buffer");
-
-        socketReceiveOrPeekData(nativefd, p, timeout, connected, false /*receive*/);
-    }
-
-    protected void send(DatagramPacket p) throws IOException {
-        cli.System.Net.Sockets.Socket nativefd = checkAndReturnNativeFD();
-
-        if (p == null)
-            throw new NullPointerException("null packet");
-
-        if (p.getAddress() == null ||p.getData() ==null)
-            throw new NullPointerException("null address || null buffer");
-
-        socketSend(nativefd, p.getData(), p.getOffset(), p.getLength(),
-                   p.getAddress(), p.getPort(), connected);
-    }
-
-    protected void connect0(InetAddress address, int port) throws SocketException {
-        cli.System.Net.Sockets.Socket nativefd = checkAndReturnNativeFD();
-
-        if (address == null)
-            throw new NullPointerException("address");
-
-        socketConnect(nativefd, address, port);
-    }
-
-    protected void disconnect0(int family /*unused*/) {
-        if (fd == null || !fd.valid())
-            return;   // disconnect doesn't throw any exceptions
-
-        socketDisconnect(fd.getSocket());
-    }
-
-    protected void datagramSocketClose() {
-        if (fd == null || !fd.valid())
-            return;   // close doesn't throw any exceptions
-
-        socketClose(fd.getSocket());
-        fd.setSocket(null);
-    }
-
-    @SuppressWarnings("fallthrough")
-    protected void socketSetOption(int opt, Object val) throws SocketException {
-        cli.System.Net.Sockets.Socket nativefd = checkAndReturnNativeFD();
-
-        int optionValue = 0;
-
-        switch(opt) {
-            case IP_TOS :
-            case SO_RCVBUF :
-            case SO_SNDBUF :
-                optionValue = ((Integer)val).intValue();
-                break;
-            case SO_REUSEADDR :
-                if (exclusiveBind && localPort != 0)  {
-                    // socket already bound, emulate SO_REUSEADDR
-                    reuseAddressEmulated = true;
-                    isReuseAddress = (Boolean)val;
-                    return;
-                }
-                //Intentional fallthrough
-            case SO_BROADCAST :
-                optionValue = ((Boolean)val).booleanValue() ? 1 : 0;
-                break;
-            default: /* shouldn't get here */
-                throw new SocketException("Option not supported");
-        }
-
-        socketSetIntOption(nativefd, opt, optionValue);
-    }
-
-    protected Object socketGetOption(int opt) throws SocketException {
-        cli.System.Net.Sockets.Socket nativefd = checkAndReturnNativeFD();
-
-         // SO_BINDADDR is not a socket option.
-        if (opt == SO_BINDADDR) {
-            return socketLocalAddress(nativefd);
-        }
-        if (opt == SO_REUSEADDR && reuseAddressEmulated)
-            return isReuseAddress;
-
-        int value = socketGetIntOption(nativefd, opt);
-        Object returnValue = null;
-
-        switch (opt) {
-            case SO_REUSEADDR :
-            case SO_BROADCAST :
-                returnValue =  (value == 0) ? Boolean.FALSE : Boolean.TRUE;
-                break;
-            case IP_TOS :
-            case SO_RCVBUF :
-            case SO_SNDBUF :
-                returnValue = new Integer(value);
-                break;
-            default: /* shouldn't get here */
-                throw new SocketException("Option not supported");
-        }
-
-        return returnValue;
-    }
-
-    /* Multicast specific methods.
-     * Multicasting on a dual layer TCP/IP stack is always done with
-     * TwoStacksPlainDatagramSocketImpl. This is to overcome the lack
-     * of behavior defined for multicasting over a dual layer socket by the RFC.
-     */
-    protected void join(InetAddress inetaddr, NetworkInterface netIf)
-        throws IOException {
-        throw new IOException("Method not implemented!");
-    }
-
-    protected void leave(InetAddress inetaddr, NetworkInterface netIf)
-        throws IOException {
-        throw new IOException("Method not implemented!");
-    }
-
-    protected void setTimeToLive(int ttl) throws IOException {
-        throw new IOException("Method not implemented!");
-    }
-
-    protected int getTimeToLive() throws IOException {
-        throw new IOException("Method not implemented!");
-    }
-
-
-    protected void setTTL(byte ttl) throws IOException {
-        throw new IOException("Method not implemented!");
-    }
-
-    protected byte getTTL() throws IOException {
-        throw new IOException("Method not implemented!");
-    }
-    /* END Multicast specific methods */
-
-    private cli.System.Net.Sockets.Socket checkAndReturnNativeFD() throws SocketException {
-        if (fd == null || !fd.valid())
-            throw new SocketException("Socket closed");
-
-        return fd.getSocket();
-    }
-
-    /* Native methods */
-
-    private static cli.System.Net.Sockets.Socket socketCreate(boolean v6Only) {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        cli.System.Net.Sockets.Socket ret = DualStackPlainDatagramSocketImpl_c.socketCreate(env, v6Only);
-        env.ThrowPendingException();
-        return ret;
-    }
-
-    private static void socketBind(cli.System.Net.Sockets.Socket fd, InetAddress localAddress,
-            int localport, boolean exclBind) throws SocketException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        DualStackPlainDatagramSocketImpl_c.socketBind(env, fd, localAddress, localport, exclBind);
-        env.ThrowPendingException();
-    }
-
-    private static void socketConnect(cli.System.Net.Sockets.Socket fd, InetAddress address, int port)
-        throws SocketException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        DualStackPlainDatagramSocketImpl_c.socketConnect(env, fd, address, port);
-        env.ThrowPendingException();
-    }
-
-    private static void socketDisconnect(cli.System.Net.Sockets.Socket fd) {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        DualStackPlainDatagramSocketImpl_c.socketDisconnect(env, fd);
-        env.ThrowPendingException();
-    }
-
-    private static void socketClose(cli.System.Net.Sockets.Socket fd) {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        DualStackPlainDatagramSocketImpl_c.socketClose(env, fd);
-        env.ThrowPendingException();
-    }
-
-    private static int socketLocalPort(cli.System.Net.Sockets.Socket fd) throws SocketException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        int ret = DualStackPlainDatagramSocketImpl_c.socketLocalPort(env, fd);
-        env.ThrowPendingException();
-        return ret;
-    }
-
-    private static Object socketLocalAddress(cli.System.Net.Sockets.Socket fd) throws SocketException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        Object ret = DualStackPlainDatagramSocketImpl_c.socketLocalAddress(env, fd);
-        env.ThrowPendingException();
-        return ret;
-    }
-
-    private static int socketReceiveOrPeekData(cli.System.Net.Sockets.Socket fd, DatagramPacket packet,
-        int timeout, boolean connected, boolean peek) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        int ret = DualStackPlainDatagramSocketImpl_c.socketReceiveOrPeekData(env, fd, packet, timeout, connected, peek);
-        env.ThrowPendingException();
-        return ret;
-    }
-
-    private static void socketSend(cli.System.Net.Sockets.Socket fd, byte[] data, int offset, int length,
-        InetAddress address, int port, boolean connected) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        DualStackPlainDatagramSocketImpl_c.socketSend(env, fd, data, offset, length, address, port, connected);
-        env.ThrowPendingException();
-    }
-
-    private static void socketSetIntOption(cli.System.Net.Sockets.Socket fd, int cmd,
-        int optionValue) throws SocketException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        DualStackPlainDatagramSocketImpl_c.socketSetIntOption(env, fd, cmd, optionValue);
-        env.ThrowPendingException();
-    }
-
-    private static int socketGetIntOption(cli.System.Net.Sockets.Socket fd, int cmd) throws SocketException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        int ret = DualStackPlainDatagramSocketImpl_c.socketGetIntOption(env, fd, cmd);
-        env.ThrowPendingException();
-        return ret;
-    }
-}
diff --git a/openjdk/java/net/DualStackPlainDatagramSocketImpl_c.java b/openjdk/java/net/DualStackPlainDatagramSocketImpl_c.java
deleted file mode 100644
index 1f4ed69b..00000000
--- a/openjdk/java/net/DualStackPlainDatagramSocketImpl_c.java
+++ /dev/null
@@ -1,488 +0,0 @@
-/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.net;
-
-import java.io.FileDescriptor;
-import static ikvm.internal.JNI.*;
-import static ikvm.internal.Winsock.*;
-import static java.net.net_util_md.*;
-
-final class DualStackPlainDatagramSocketImpl_c
-{
-static final int TRUE = 1;
-static final int FALSE = 0;
-
-static final int JVM_IO_ERR = -1;
-static final int JVM_IO_INTR = -2;
-
-/*
-#include <windows.h>
-#include <winsock2.h>
-#include "jni.h"
-#include "net_util.h"
-#include "java_net_DualStackPlainDatagramSocketImpl.h"
-
-/*
- * This function "purges" all outstanding ICMP port unreachable packets
- * outstanding on a socket and returns JNI_TRUE if any ICMP messages
- * have been purged. The rational for purging is to emulate normal BSD
- * behaviour whereby receiving a "connection reset" status resets the
- * socket.
- */
-static boolean purgeOutstandingICMP(JNIEnv env, cli.System.Net.Sockets.Socket fd)
-{
-    boolean got_icmp = false;
-    byte[] buf = new byte[1];
-    fd_set tbl = new fd_set();
-    timeval t = new timeval();
-    SOCKETADDRESS rmtaddr = null;
-
-    /*
-     * Peek at the queue to see if there is an ICMP port unreachable. If there
-     * is then receive it.
-     */
-    FD_ZERO(tbl);
-    FD_SET(fd, tbl);
-    while(true) {
-        if (select(tbl, null, null, t) <= 0) {
-            break;
-        }
-        if (recvfrom(fd, buf, 1, MSG_PEEK,
-                         rmtaddr) != JVM_IO_ERR) {
-            break;
-        }
-        if (WSAGetLastError() != WSAECONNRESET) {
-            /* some other error - we don't care here */
-            break;
-        }
-
-        recvfrom(fd, buf, 1, 0, rmtaddr);
-        got_icmp = JNI_TRUE;
-    }
-
-    return got_icmp;
-}
-
-/*
- * Class:     java_net_DualStackPlainDatagramSocketImpl
- * Method:    socketCreate
- * Signature: (Z)I
- */
-static cli.System.Net.Sockets.Socket socketCreate
-  (JNIEnv env, boolean v6Only /*unused*/) {
-    cli.System.Net.Sockets.Socket fd;
-    int rv, opt=0, t=TRUE;
-
-    fd = socket(AF_INET6, SOCK_DGRAM, 0);
-    if (fd == INVALID_SOCKET) {
-        NET_ThrowNew(env, WSAGetLastError(), "Socket creation failed");
-        return null;
-    }
-
-    rv = setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, opt);
-    if (rv == SOCKET_ERROR) {
-        NET_ThrowNew(env, WSAGetLastError(), "Socket creation failed");
-        return null;
-    }
-
-    //SetHandleInformation((HANDLE)(UINT_PTR)fd, HANDLE_FLAG_INHERIT, FALSE);
-    NET_SetSockOpt(fd, SOL_SOCKET, SO_BROADCAST, t);
-
-    /* SIO_UDP_CONNRESET fixes a "bug" introduced in Windows 2000, which
-     * returns connection reset errors on unconnected UDP sockets (as well
-     * as connected sockets). The solution is to only enable this feature
-     * when the socket is connected.
-     */
-    t = FALSE;
-    WSAIoctl(fd ,SIO_UDP_CONNRESET ,false);
-
-    return fd;
-}
-
-/*
- * Class:     java_net_DualStackPlainDatagramSocketImpl
- * Method:    socketBind
- * Signature: (ILjava/net/InetAddress;I)V
- */
-static void socketBind
-  (JNIEnv env, cli.System.Net.Sockets.Socket fd, InetAddress iaObj, int port, boolean exclBind) {
-    SOCKETADDRESS sa;
-    sa = new SOCKETADDRESS();
-    int rv;
-
-    if (NET_InetAddressToSockaddr(env, iaObj, port, sa,
-                                 JNI_TRUE) != 0) {
-        return;
-    }
-    rv = NET_WinBind(fd, sa, exclBind);
-
-    if (rv == SOCKET_ERROR) {
-        if (WSAGetLastError() == WSAEACCES) {
-            WSASetLastError(WSAEADDRINUSE);
-        }
-        NET_ThrowNew(env, WSAGetLastError(), "Cannot bind");
-    }
-}
-
-/*
- * Class:     java_net_DualStackPlainDatagramSocketImpl
- * Method:    socketConnect
- * Signature: (ILjava/net/InetAddress;I)V
- */
-static void socketConnect
-  (JNIEnv env, cli.System.Net.Sockets.Socket fd, InetAddress iaObj, int port) {
-    SOCKETADDRESS sa;
-    sa = new SOCKETADDRESS();
-    int rv;
-    int t = TRUE;
-
-    if (NET_InetAddressToSockaddr(env, iaObj, port, sa,
-                                   JNI_TRUE) != 0) {
-        return;
-    }
-
-    rv = connect(fd, sa);
-    if (rv == SOCKET_ERROR) {
-        NET_ThrowNew(env, WSAGetLastError(), "connect");
-        return;
-    }
-
-    /* see comment in socketCreate */
-    WSAIoctl(fd, SIO_UDP_CONNRESET, true);
-}
-
-/*
- * Class:     java_net_DualStackPlainDatagramSocketImpl
- * Method:    socketDisconnect
- * Signature: (I)V
- */
-static void socketDisconnect
-  (JNIEnv env, cli.System.Net.Sockets.Socket fd ) {
-    SOCKETADDRESS sa;
-    sa = new SOCKETADDRESS();
-
-    connect(fd, sa);
-
-    /* see comment in socketCreate */
-    WSAIoctl(fd, SIO_UDP_CONNRESET, false);
-}
-
-/*
- * Class:     java_net_DualStackPlainDatagramSocketImpl
- * Method:    socketClose
- * Signature: (I)V
- */
-static void socketClose
-  (JNIEnv env, cli.System.Net.Sockets.Socket fd) {
-    NET_SocketClose(fd);
-}
-
-
-/*
- * Class:     java_net_DualStackPlainDatagramSocketImpl
- * Method:    socketLocalPort
- * Signature: (I)I
- */
-static int socketLocalPort
-  (JNIEnv env, cli.System.Net.Sockets.Socket fd) {
-    SOCKETADDRESS sa;
-    sa = new SOCKETADDRESS();
-
-    if (getsockname(fd, sa) == SOCKET_ERROR) {
-        NET_ThrowNew(env, WSAGetLastError(), "JVM_GetSockName");
-        return -1;
-    }
-    return ntohs(GET_PORT(sa));
-}
-
-/*
- * Class:     java_net_DualStackPlainDatagramSocketImpl
- * Method:    socketLocalAddress
- * Signature: (I)Ljava/lang/Object;
- */
-static InetAddress socketLocalAddress
-  (JNIEnv env , cli.System.Net.Sockets.Socket fd) {
-    SOCKETADDRESS sa;
-    sa = new SOCKETADDRESS();
-    InetAddress iaObj;
-    int[] port = { 0 };
-
-    if (getsockname(fd, sa) == SOCKET_ERROR) {
-        NET_ThrowNew(env, WSAGetLastError(), "Error getting socket name");
-        return null;
-    }
-
-    iaObj = NET_SockaddrToInetAddress(env, sa, port);
-    return iaObj;
-}
-
-/*
- * Class:     java_net_DualStackPlainDatagramSocketImpl
- * Method:    socketReceiveOrPeekData
- * Signature: (ILjava/net/DatagramPacket;IZZ)I
- */
-static int socketReceiveOrPeekData
-  (JNIEnv env, cli.System.Net.Sockets.Socket fd, DatagramPacket dpObj,
-   int timeout, boolean connected, boolean peek) {
-    SOCKETADDRESS sa;
-    sa = new SOCKETADDRESS();
-    int port, rv, flags=0;
-    boolean retry;
-    long prevTime = 0;
-
-    int packetBufferOffset, packetBufferLen;
-    byte[] packetBuffer;
-
-    /* if we are only peeking. Called from peekData */
-    if (peek) {
-        flags = MSG_PEEK;
-    }
-
-    packetBuffer = dpObj.buf;
-    packetBufferOffset = dpObj.offset;
-    packetBufferLen = dpObj.bufLength;
-
-    /*
-    if (packetBufferLen > MAX_BUFFER_LEN) {
-        /* Note: the buffer needn't be greater than 65,536 (0xFFFF)
-         * the max size of an IP packet. Anything bigger is truncated anyway.
-         *-/
-        if (packetBufferLen > MAX_PACKET_LEN) {
-            packetBufferLen = MAX_PACKET_LEN;
-        }
-        fullPacket = (char *)malloc(packetBufferLen);
-        if (!fullPacket) {
-            JNU_ThrowOutOfMemoryError(env, "Native heap allocation failed");
-            return -1;
-        }
-    } else {
-        fullPacket = &(BUF[0]);
-    }
-    */
-
-    do {
-        retry = false;
-
-        if (timeout != 0) {
-            if (prevTime == 0) {
-                prevTime = JVM_CurrentTimeMillis(env, 0);
-            }
-            rv = NET_Timeout(fd, timeout);
-            if (rv <= 0) {
-                if (rv == 0) {
-                    JNU_ThrowByName(env,JNU_JAVANETPKG+"SocketTimeoutException",
-                                    "Receive timed out");
-                } else if (rv == JVM_IO_ERR) {
-                    JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                                    "Socket closed");
-                } else if (rv == JVM_IO_INTR) {
-                    JNU_ThrowByName(env, JNU_JAVAIOPKG+"InterruptedIOException",
-                                    "operation interrupted");
-                }
-                return -1;
-            }
-        }
-
-        /* receive the packet */
-        rv = recvfrom(fd, packetBuffer, packetBufferOffset, packetBufferLen, flags,
-                    sa);
-
-        if (rv == SOCKET_ERROR && (WSAGetLastError() == WSAECONNRESET)) {
-            /* An icmp port unreachable - we must receive this as Windows
-             * does not reset the state of the socket until this has been
-             * received.
-             */
-            purgeOutstandingICMP(env, fd);
-
-            if (connected) {
-                JNU_ThrowByName(env, JNU_JAVANETPKG+"PortUnreachableException",
-                                "ICMP Port Unreachable");
-                return -1;
-            } else if (timeout != 0) {
-                /* Adjust timeout */
-                long newTime = JVM_CurrentTimeMillis(env, 0);
-                timeout -= (int)(newTime - prevTime);
-                if (timeout <= 0) {
-                    JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketTimeoutException",
-                                    "Receive timed out");
-                    return -1;
-                }
-                prevTime = newTime;
-            }
-            retry = true;
-        }
-    } while (retry);
-
-    port = ntohs (GET_PORT(sa));
-
-    /* truncate the data if the packet's length is too small */
-    if (rv > packetBufferLen) {
-        rv = packetBufferLen;
-    }
-    if (rv < 0) {
-        if (WSAGetLastError() == WSAEMSGSIZE) {
-            /* it is because the buffer is too small. It's UDP, it's
-             * unreliable, it's all good. discard the rest of the
-             * data..
-             */
-            rv = packetBufferLen;
-        } else {
-            /* failure */
-            dpObj.length = 0;
-        }
-    }
-
-    if (rv == -1) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException", "socket closed");
-    } else if (rv == -2) {
-        JNU_ThrowByName(env, JNU_JAVAIOPKG+"InterruptedIOException",
-                        "operation interrupted");
-    } else if (rv < 0) {
-        NET_ThrowCurrent(env, "Datagram receive failed");
-    } else {
-        InetAddress packetAddress;
-        /*
-         * Check if there is an InetAddress already associated with this
-         * packet. If so, we check if it is the same source address. We
-         * can't update any existing InetAddress because it is immutable
-         */
-        packetAddress = dpObj.address;
-        if (packetAddress != NULL) {
-            if (!NET_SockaddrEqualsInetAddress(sa,
-                                               packetAddress)) {
-                /* force a new InetAddress to be created */
-                packetAddress = null;
-            }
-        }
-        if (packetAddress == NULL) {
-            int[] tmp = { port };
-            packetAddress = NET_SockaddrToInetAddress(sa, tmp);
-            port = tmp[0];
-            /* stuff the new Inetaddress into the packet */
-            dpObj.address = packetAddress;
-        }
-
-        /* populate the packet */
-        dpObj.port = port;
-        dpObj.length = rv;
-    }
-
-    return port;
-}
-
-/*
- * Class:     java_net_DualStackPlainDatagramSocketImpl
- * Method:    socketSend
- * Signature: (I[BIILjava/net/InetAddress;IZ)V
- */
-static void socketSend
-  (JNIEnv env, cli.System.Net.Sockets.Socket fd, byte[] data, int offset, int length,
-     InetAddress iaObj, int port, boolean connected) {
-    SOCKETADDRESS sa;
-    int rv;
-
-    if (connected) {
-        sa = null; /* arg to JVM_Sendto () null in this case */
-    } else {
-        sa = new SOCKETADDRESS();
-        if (NET_InetAddressToSockaddr(env, iaObj, port, sa,
-                                       JNI_TRUE) != 0) {
-            return;
-        }
-    }
-
-    /*
-    if (length > MAX_BUFFER_LEN) {
-        /* Note: the buffer needn't be greater than 65,536 (0xFFFF)
-         * the max size of an IP packet. Anything bigger is truncated anyway.
-         *-/
-        if (length > MAX_PACKET_LEN) {
-            length = MAX_PACKET_LEN;
-        }
-        fullPacket = (char *)malloc(length);
-        if (!fullPacket) {
-            JNU_ThrowOutOfMemoryError(env, "Native heap allocation failed");
-            return;
-        }
-    } else {
-        fullPacket = &(BUF[0]);
-    }
-    */
-
-    rv = sendto(fd, data, offset, length, 0, sa);
-    if (rv == SOCKET_ERROR) {
-        if (rv == JVM_IO_ERR) {
-            NET_ThrowNew(env, WSAGetLastError(), "Datagram send failed");
-        } else if (rv == JVM_IO_INTR) {
-            JNU_ThrowByName(env, JNU_JAVAIOPKG+"InterruptedIOException",
-                            "operation interrupted");
-        }
-    }
-
-}
-
-/*
- * Class:     java_net_DualStackPlainDatagramSocketImpl
- * Method:    socketSetIntOption
- * Signature: (III)V
- */
-static void socketSetIntOption
-  (JNIEnv env, cli.System.Net.Sockets.Socket fd , int cmd, int value) {
-    int[] level = { 0 }, opt = { 0 };
-
-    if (NET_MapSocketOption(cmd, level, opt) < 0) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                                     "Invalid option");
-        return;
-    }
-
-    if (NET_SetSockOpt(fd, level[0], opt[0], value) < 0) {
-        NET_ThrowNew(env, WSAGetLastError(), "setsockopt");
-    }
-}
-
-/*
- * Class:     java_net_DualStackPlainDatagramSocketImpl
- * Method:    socketGetIntOption
- * Signature: (II)I
- */
-static int socketGetIntOption
-  (JNIEnv env, cli.System.Net.Sockets.Socket fd, int cmd) {
-    int[] level = { 0 }, opt = { 0 }, result = { 0 };
-
-    if (NET_MapSocketOption(cmd, level, opt) < 0) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                                     "Invalid option");
-        return -1;
-    }
-
-    if (NET_GetSockOpt(fd, level[0], opt[0], result) < 0) {
-        NET_ThrowNew(env, WSAGetLastError(), "getsockopt");
-        return -1;
-    }
-
-    return result[0];
-}
-}
diff --git a/openjdk/java/net/DualStackPlainSocketImpl.java b/openjdk/java/net/DualStackPlainSocketImpl.java
deleted file mode 100644
index a3584d86..00000000
--- a/openjdk/java/net/DualStackPlainSocketImpl.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.net;
-
-import java.io.IOException;
-import java.io.FileDescriptor;
-
-/**
- * This class defines the plain SocketImpl that is used on Windows platforms
- * greater or equal to Windows Vista. These platforms have a dual
- * layer TCP/IP stack and can handle both IPv4 and IPV6 through a
- * single file descriptor.
- *
- * @author Chris Hegarty
- */
-
-class DualStackPlainSocketImpl extends AbstractPlainSocketImpl
-{
-
-
-    // true if this socket is exclusively bound
-    private final boolean exclusiveBind;
-
-    // emulates SO_REUSEADDR when exclusiveBind is true
-    private boolean isReuseAddress;
-
-    public DualStackPlainSocketImpl(boolean exclBind) {
-        exclusiveBind = exclBind;
-    }
-
-    public DualStackPlainSocketImpl(FileDescriptor fd, boolean exclBind) {
-        this.fd = fd;
-        exclusiveBind = exclBind;
-    }
-
-    void socketCreate(boolean stream) throws IOException {
-        if (fd == null)
-            throw new SocketException("Socket closed");
-
-        cli.System.Net.Sockets.Socket newfd = socket0(stream, false /*v6 Only*/);
-
-        fd.setSocket(newfd);
-    }
-
-    void socketConnect(InetAddress address, int port, int timeout)
-        throws IOException {
-        cli.System.Net.Sockets.Socket nativefd = checkAndReturnNativeFD();
-
-        if (address == null)
-            throw new NullPointerException("inet address argument is null.");
-
-        int connectResult;
-        if (timeout <= 0) {
-            connectResult = connect0(nativefd, address, port);
-        } else {
-            configureBlocking(nativefd, false);
-            try {
-                connectResult = connect0(nativefd, address, port);
-                if (connectResult == WOULDBLOCK) {
-                    waitForConnect(nativefd, timeout);
-                }
-            } finally {
-                configureBlocking(nativefd, true);
-            }
-        }
-        /*
-         * We need to set the local port field. If bind was called
-         * previous to the connect (by the client) then localport field
-         * will already be set.
-         */
-        if (localport == 0)
-            localport = localPort0(nativefd);
-    }
-
-    void socketBind(InetAddress address, int port) throws IOException {
-        cli.System.Net.Sockets.Socket nativefd = checkAndReturnNativeFD();
-
-        if (address == null)
-            throw new NullPointerException("inet address argument is null.");
-
-        bind0(nativefd, address, port, exclusiveBind);
-        if (port == 0) {
-            localport = localPort0(nativefd);
-        } else {
-            localport = port;
-        }
-
-        this.address = address;
-    }
-
-    void socketListen(int backlog) throws IOException {
-        cli.System.Net.Sockets.Socket nativefd = checkAndReturnNativeFD();
-
-        listen0(nativefd, backlog);
-    }
-
-    void socketAccept(SocketImpl s) throws IOException {
-        cli.System.Net.Sockets.Socket nativefd = checkAndReturnNativeFD();
-
-        if (s == null)
-            throw new NullPointerException("socket is null");
-
-        cli.System.Net.Sockets.Socket newfd = null;
-        InetSocketAddress[] isaa = new InetSocketAddress[1];
-        if (timeout <= 0) {
-            newfd = accept0(nativefd, isaa);
-        } else {
-            configureBlocking(nativefd, false);
-            try {
-                waitForNewConnection(nativefd, timeout);
-                newfd = accept0(nativefd, isaa);
-                if (newfd != null) {
-                    configureBlocking(newfd, true);
-                }
-            } finally {
-                configureBlocking(nativefd, true);
-            }
-        }
-        /* Update (SocketImpl)s' fd */
-        s.fd.setSocket(newfd);
-        /* Update socketImpls remote port, address and localport */
-        InetSocketAddress isa = isaa[0];
-        s.port = isa.getPort();
-        s.address = isa.getAddress();
-        s.localport = localport;
-    }
-
-    int socketAvailable() throws IOException {
-        cli.System.Net.Sockets.Socket nativefd = checkAndReturnNativeFD();
-        return available0(nativefd);
-    }
-
-    void socketClose0(boolean useDeferredClose/*unused*/) throws IOException {
-        if (fd == null)
-            throw new SocketException("Socket closed");
-
-        if (!fd.valid())
-            return;
-
-        close0(fd.getSocket());
-        fd.setSocket(null);
-    }
-
-    void socketShutdown(int howto) throws IOException {
-        cli.System.Net.Sockets.Socket nativefd = checkAndReturnNativeFD();
-        shutdown0(nativefd, howto);
-    }
-
-    // Intentional fallthrough after SO_REUSEADDR
-    @SuppressWarnings("fallthrough")
-    void socketSetOption(int opt, boolean on, Object value)
-        throws SocketException {
-        cli.System.Net.Sockets.Socket nativefd = checkAndReturnNativeFD();
-
-        if (opt == SO_TIMEOUT) {  // timeout implemented through select.
-            return;
-        }
-
-        int optionValue = 0;
-
-        switch(opt) {
-            case SO_REUSEADDR :
-                if (exclusiveBind) {
-                    // SO_REUSEADDR emulated when using exclusive bind
-                    isReuseAddress = on;
-                    return;
-                }
-                // intentional fallthrough
-            case TCP_NODELAY :
-            case SO_OOBINLINE :
-            case SO_KEEPALIVE :
-                optionValue = on ? 1 : 0;
-                break;
-            case SO_SNDBUF :
-            case SO_RCVBUF :
-            case IP_TOS :
-                optionValue = ((Integer)value).intValue();
-                break;
-            case SO_LINGER :
-                if (on) {
-                    optionValue =  ((Integer)value).intValue();
-                } else {
-                    optionValue = -1;
-                }
-                break;
-            default :/* shouldn't get here */
-                throw new SocketException("Option not supported");
-        }
-
-        setIntOption(nativefd, opt, optionValue);
-    }
-
-    int socketGetOption(int opt, Object iaContainerObj) throws SocketException {
-        cli.System.Net.Sockets.Socket nativefd = checkAndReturnNativeFD();
-
-        // SO_BINDADDR is not a socket option.
-        if (opt == SO_BINDADDR) {
-            localAddress(nativefd, (InetAddressContainer)iaContainerObj);
-            return 0;  // return value doesn't matter.
-        }
-
-        // SO_REUSEADDR emulated when using exclusive bind
-        if (opt == SO_REUSEADDR && exclusiveBind)
-            return isReuseAddress? 1 : -1;
-
-        int value = getIntOption(nativefd, opt);
-
-        switch (opt) {
-            case TCP_NODELAY :
-            case SO_OOBINLINE :
-            case SO_KEEPALIVE :
-            case SO_REUSEADDR :
-                return (value == 0) ? -1 : 1;
-        }
-        return value;
-    }
-
-    void socketSendUrgentData(int data) throws IOException {
-        cli.System.Net.Sockets.Socket nativefd = checkAndReturnNativeFD();
-        sendOOB(nativefd, data);
-    }
-
-    private cli.System.Net.Sockets.Socket checkAndReturnNativeFD() throws SocketException {
-        if (fd == null || !fd.valid())
-            throw new SocketException("Socket closed");
-
-        return fd.getSocket();
-    }
-
-    static final int WOULDBLOCK = -2;       // Nothing available (non-blocking)
-
-    /* Native methods */
-
-    static cli.System.Net.Sockets.Socket socket0(boolean stream, boolean v6Only) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        cli.System.Net.Sockets.Socket ret = DualStackPlainSocketImpl_c.socket0(env, stream, v6Only);
-        env.ThrowPendingException();
-        return ret;
-    }
-
-    static void bind0(cli.System.Net.Sockets.Socket fd, InetAddress localAddress, int localport,
-                             boolean exclBind)
-        throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        DualStackPlainSocketImpl_c.bind0(env, fd, localAddress, localport, exclBind);
-        env.ThrowPendingException();
-    }
-
-    static int connect0(cli.System.Net.Sockets.Socket fd, InetAddress remote, int remotePort)
-        throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        int ret = DualStackPlainSocketImpl_c.connect0(env, fd, remote, remotePort);
-        env.ThrowPendingException();
-        return ret;
-    }
-
-    static void waitForConnect(cli.System.Net.Sockets.Socket fd, int timeout) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        DualStackPlainSocketImpl_c.waitForConnect(env, fd, timeout);
-        env.ThrowPendingException();
-    }
-
-    static int localPort0(cli.System.Net.Sockets.Socket fd) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        int ret = DualStackPlainSocketImpl_c.localPort0(env, fd);
-        env.ThrowPendingException();
-        return ret;
-    }
-
-    static void localAddress(cli.System.Net.Sockets.Socket fd, InetAddressContainer in) throws SocketException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        DualStackPlainSocketImpl_c.localAddress(env, fd, in);
-        env.ThrowPendingException();
-    }
-
-    static void listen0(cli.System.Net.Sockets.Socket fd, int backlog) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        DualStackPlainSocketImpl_c.listen0(env, fd, backlog);
-        env.ThrowPendingException();
-    }
-
-    static cli.System.Net.Sockets.Socket accept0(cli.System.Net.Sockets.Socket fd, InetSocketAddress[] isaa) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        cli.System.Net.Sockets.Socket ret = DualStackPlainSocketImpl_c.accept0(env, fd, isaa);
-        env.ThrowPendingException();
-        return ret;
-    }
-
-    static void waitForNewConnection(cli.System.Net.Sockets.Socket fd, int timeout) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        DualStackPlainSocketImpl_c.waitForNewConnection(env, fd, timeout);
-        env.ThrowPendingException();
-    }
-
-    static int available0(cli.System.Net.Sockets.Socket fd) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        int ret = DualStackPlainSocketImpl_c.available0(env, fd);
-        env.ThrowPendingException();
-        return ret;
-    }
-
-    static void close0(cli.System.Net.Sockets.Socket fd) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        DualStackPlainSocketImpl_c.close0(env, fd);
-        env.ThrowPendingException();
-    }
-
-    static void shutdown0(cli.System.Net.Sockets.Socket fd, int howto) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        DualStackPlainSocketImpl_c.shutdown0(env, fd, howto);
-        env.ThrowPendingException();
-    }
-
-    static void setIntOption(cli.System.Net.Sockets.Socket fd, int cmd, int optionValue) throws SocketException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        DualStackPlainSocketImpl_c.setIntOption(env, fd, cmd, optionValue);
-        env.ThrowPendingException();
-    }
-
-    static int getIntOption(cli.System.Net.Sockets.Socket fd, int cmd) throws SocketException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        int ret = DualStackPlainSocketImpl_c.getIntOption(env, fd, cmd);
-        env.ThrowPendingException();
-        return ret;
-    }
-
-    static void sendOOB(cli.System.Net.Sockets.Socket fd, int data) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        DualStackPlainSocketImpl_c.sendOOB(env, fd, data);
-        env.ThrowPendingException();
-    }
-
-    static void configureBlocking(cli.System.Net.Sockets.Socket fd, boolean blocking) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        DualStackPlainSocketImpl_c.configureBlocking(env, fd, blocking);
-        env.ThrowPendingException();
-    }
-}
diff --git a/openjdk/java/net/DualStackPlainSocketImpl_c.java b/openjdk/java/net/DualStackPlainSocketImpl_c.java
deleted file mode 100644
index 15c2a184..00000000
--- a/openjdk/java/net/DualStackPlainSocketImpl_c.java
+++ /dev/null
@@ -1,490 +0,0 @@
-/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.net;
-
-import java.io.FileDescriptor;
-import static ikvm.internal.JNI.*;
-import static ikvm.internal.Winsock.*;
-import static java.net.net_util_md.*;
-
-final class DualStackPlainSocketImpl_c
-{
-private static final int JVM_IO_ERR = -1;
-private static final int JVM_IO_INTR = -2;
-
-private static final int SET_BLOCKING = 0;
-private static final int SET_NONBLOCKING = 1;
-/*
-#include <windows.h>
-#include <winsock2.h>
-#include "jni.h"
-#include "net_util.h"
-#include "java_net_DualStackPlainSocketImpl.h"
-
-#define SET_BLOCKING 0
-#define SET_NONBLOCKING 1
-
-static jclass isa_class;        /* java.net.InetSocketAddress *-/
-static jmethodID isa_ctorID;    /* InetSocketAddress(InetAddress, int) *-/
-
-/*
- * Class:     java_net_DualStackPlainSocketImpl
- * Method:    initIDs
- * Signature: ()V
- *-/
-JNIEXPORT void JNICALL Java_java_net_DualStackPlainSocketImpl_initIDs
-  (JNIEnv *env, jclass clazz) {
-
-    jclass cls = (*env)->FindClass(env, "java/net/InetSocketAddress");
-    isa_class = (*env)->NewGlobalRef(env, cls);
-    isa_ctorID = (*env)->GetMethodID(env, cls, "<init>",
-                                     "(Ljava/net/InetAddress;I)V");
-
-    // implement read timeout with select.
-    isRcvTimeoutSupported = 0;
-}
-
-/*
- * Class:     java_net_DualStackPlainSocketImpl
- * Method:    socket0
- * Signature: (ZZ)I
- */
-static cli.System.Net.Sockets.Socket socket0
-  (JNIEnv env, boolean stream, boolean v6Only /*unused*/) {
-    cli.System.Net.Sockets.Socket fd;
-    int rv, opt=0;
-
-    fd = NET_Socket(AF_INET6, (stream ? SOCK_STREAM : SOCK_DGRAM), 0);
-    if (fd == INVALID_SOCKET) {
-        NET_ThrowNew(env, WSAGetLastError(), "create");
-        return null;
-    }
-
-    rv = setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, opt);
-    if (rv == SOCKET_ERROR) {
-        NET_ThrowNew(env, WSAGetLastError(), "create");
-    }
-
-
-    return fd;
-}
-
-/*
- * Class:     java_net_DualStackPlainSocketImpl
- * Method:    bind0
- * Signature: (ILjava/net/InetAddress;I)V
- */
-static void bind0
-  (JNIEnv env, cli.System.Net.Sockets.Socket fd, InetAddress iaObj, int port,
-   boolean exclBind)
-{
-    SOCKETADDRESS sa;
-    sa = new SOCKETADDRESS();
-    int rv;
-
-    if (NET_InetAddressToSockaddr(env, iaObj, port, sa,
-                                 JNI_TRUE) != 0) {
-      return;
-    }
-
-    rv = NET_WinBind(fd, sa, exclBind);
-
-    if (rv == SOCKET_ERROR)
-        NET_ThrowNew(env, WSAGetLastError(), "JVM_Bind");
-}
-
-/*
- * Class:     java_net_DualStackPlainSocketImpl
- * Method:    connect0
- * Signature: (ILjava/net/InetAddress;I)I
- */
-static int connect0
-  (JNIEnv env, cli.System.Net.Sockets.Socket fd, InetAddress iaObj, int port) {
-    SOCKETADDRESS sa;
-    sa = new SOCKETADDRESS();
-    int rv;
-
-    if (NET_InetAddressToSockaddr(env, iaObj, port, sa,
-                                 JNI_TRUE) != 0) {
-      return -1;
-    }
-
-    rv = connect(fd, sa);
-    if (rv == SOCKET_ERROR) {
-        int err = WSAGetLastError();
-        if (err == WSAEWOULDBLOCK) {
-            return java.net.DualStackPlainSocketImpl.WOULDBLOCK;
-        } else if (err == WSAEADDRNOTAVAIL) {
-            JNU_ThrowByName(env, JNU_JAVANETPKG+"ConnectException",
-                "connect: Address is invalid on local machine, or port is not valid on remote machine");
-        } else {
-            NET_ThrowNew(env, err, "connect");
-        }
-        return -1;  // return value not important.
-    }
-    return rv;
-}
-
-/*
- * Class:     java_net_DualStackPlainSocketImpl
- * Method:    waitForConnect
- * Signature: (II)V
- */
-static void waitForConnect
-  (JNIEnv env, cli.System.Net.Sockets.Socket fd, int timeout) {
-    int rv, retry;
-    fd_set wr, ex;
-    wr = new fd_set(); ex = new fd_set();
-    timeval t = new timeval();
-
-    FD_ZERO(wr);
-    FD_ZERO(ex);
-    FD_SET(fd, wr);
-    FD_SET(fd, ex);
-    t.tv_sec = timeout / 1000;
-    t.tv_usec = (timeout % 1000) * 1000;
-
-    /*
-     * Wait for timeout, connection established or
-     * connection failed.
-     */
-    rv = select(null, wr, ex, t);
-
-    /*
-     * Timeout before connection is established/failed so
-     * we throw exception and shutdown input/output to prevent
-     * socket from being used.
-     * The socket should be closed immediately by the caller.
-     */
-    if (rv == 0) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketTimeoutException",
-                        "connect timed out");
-        shutdown( fd, SD_BOTH );
-        return;
-    }
-
-    /*
-     * Socket is writable or error occured. On some Windows editions
-     * the socket will appear writable when the connect fails so we
-     * check for error rather than writable.
-     */
-    if (!FD_ISSET(fd, ex)) {
-        return;         /* connection established */
-    }
-
-    /*
-     * Connection failed. The logic here is designed to work around
-     * bug on Windows NT whereby using getsockopt to obtain the
-     * last error (SO_ERROR) indicates there is no error. The workaround
-     * on NT is to allow winsock to be scheduled and this is done by
-     * yielding and retrying. As yielding is problematic in heavy
-     * load conditions we attempt up to 3 times to get the error reason.
-     */
-    for (retry=0; retry<3; retry++) {
-        int[] tmp = { 0 };
-        NET_GetSockOpt(fd, SOL_SOCKET, SO_ERROR,
-                       tmp);
-        rv = tmp[0];
-        if (rv != 0) {
-            break;
-        }
-        Sleep(0);
-    }
-
-    if (rv == 0) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                        "Unable to establish connection");
-    } else {
-        NET_ThrowNew(env, rv, "connect");
-    }
-}
-
-/*
- * Class:     java_net_DualStackPlainSocketImpl
- * Method:    localPort0
- * Signature: (I)I
- */
-static int localPort0
-  (JNIEnv env, cli.System.Net.Sockets.Socket fd) {
-    SOCKETADDRESS sa;
-    sa = new SOCKETADDRESS();
-
-    if (getsockname(fd, sa) == SOCKET_ERROR) {
-        if (WSAGetLastError() == WSAENOTSOCK) {
-            JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                    "Socket closed");
-        } else {
-            NET_ThrowNew(env, WSAGetLastError(), "getsockname failed");
-        }
-        return -1;
-    }
-    return ntohs(GET_PORT(sa));
-}
-
-/*
- * Class:     java_net_DualStackPlainSocketImpl
- * Method:    localAddress
- * Signature: (ILjava/net/InetAddressContainer;)V
- */
-static void localAddress
-  (JNIEnv env, cli.System.Net.Sockets.Socket fd, InetAddressContainer iaContainerObj) {
-    int[] port = { 0 };
-    SOCKETADDRESS sa;
-    sa = new SOCKETADDRESS();
-    InetAddress iaObj;
-
-    if (getsockname(fd, sa) == SOCKET_ERROR) {
-        NET_ThrowNew(env, WSAGetLastError(), "Error getting socket name");
-        return;
-    }
-    iaObj = NET_SockaddrToInetAddress(env, sa, port);
-
-    iaContainerObj.addr = iaObj;
-}
-
-
-/*
- * Class:     java_net_DualStackPlainSocketImpl
- * Method:    listen0
- * Signature: (II)V
- */
-static void listen0
-  (JNIEnv env, cli.System.Net.Sockets.Socket fd, int backlog) {
-    if (listen(fd, backlog) == SOCKET_ERROR) {
-        NET_ThrowNew(env, WSAGetLastError(), "listen failed");
-    }
-}
-
-/*
- * Class:     java_net_DualStackPlainSocketImpl
- * Method:    accept0
- * Signature: (I[Ljava/net/InetSocketAddress;)I
- */
-static cli.System.Net.Sockets.Socket accept0
-  (JNIEnv env, cli.System.Net.Sockets.Socket fd, InetSocketAddress[] isaa) {
-    cli.System.Net.Sockets.Socket newfd;
-    int[] port = { 0 };
-    InetSocketAddress isa;
-    InetAddress ia;
-    SOCKETADDRESS sa;
-    sa = new SOCKETADDRESS();
-
-    newfd = accept(fd, sa);
-
-    if (newfd == INVALID_SOCKET) {
-        if (WSAGetLastError() == -2) {
-            JNU_ThrowByName(env, JNU_JAVAIOPKG+"InterruptedIOException",
-                            "operation interrupted");
-        } else {
-            JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                            "socket closed");
-        }
-        return null;
-    }
-
-    ia = NET_SockaddrToInetAddress(env, sa, port);
-    isa = new InetSocketAddress(ia, port[0]);
-    isaa[0] = isa;
-
-    return newfd;
-}
-
-/*
- * Class:     java_net_DualStackPlainSocketImpl
- * Method:    waitForNewConnection
- * Signature: (II)V
- */
-static void waitForNewConnection
-  (JNIEnv env, cli.System.Net.Sockets.Socket fd, int timeout) {
-    int rv;
-
-    rv = NET_Timeout(fd, timeout);
-    if (rv == 0) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketTimeoutException",
-                        "Accept timed out");
-    } else if (rv == -1) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException", "socket closed");
-    } else if (rv == -2) {
-        JNU_ThrowByName(env, JNU_JAVAIOPKG+"InterruptedIOException",
-                        "operation interrupted");
-    }
-}
-
-/*
- * Class:     java_net_DualStackPlainSocketImpl
- * Method:    available0
- * Signature: (I)I
- */
-static int available0
-  (JNIEnv env, cli.System.Net.Sockets.Socket fd) {
-    int[] available = { -1 };
-
-    if ((ioctlsocket(fd, FIONREAD, available)) == SOCKET_ERROR) {
-        NET_ThrowNew(env, WSAGetLastError(), "socket available");
-    }
-
-    return available[0];
-}
-
-/*
- * Class:     java_net_DualStackPlainSocketImpl
- * Method:    close0
- * Signature: (I)V
- */
-static void close0
-  (JNIEnv env, cli.System.Net.Sockets.Socket fd) {
-     NET_SocketClose(fd);
-}
-
-/*
- * Class:     java_net_DualStackPlainSocketImpl
- * Method:    shutdown0
- * Signature: (II)V
- */
-static void shutdown0
-  (JNIEnv env, cli.System.Net.Sockets.Socket fd, int howto) {
-    shutdown(fd, howto);
-}
-
-
-/*
- * Class:     java_net_DualStackPlainSocketImpl
- * Method:    setIntOption
- * Signature: (III)V
- */
-static void setIntOption
-  (JNIEnv env, cli.System.Net.Sockets.Socket fd, int cmd, int value) {
-
-    int[] level = { 0 };
-    int[] opt = { 0 };
-    linger linger;
-    Object optval;
-
-    if (NET_MapSocketOption(cmd, level, opt) < 0) {
-        JNU_ThrowByName(env,
-                                     JNU_JAVANETPKG+"SocketException",
-                                     "Invalid option");
-        return;
-    }
-
-    if (opt[0] == java.net.SocketOptions.SO_LINGER) {
-        linger = new linger();
-        if (value >= 0) {
-            linger.l_onoff = 1;
-            linger.l_linger = value & 0xFFFF;
-        } else {
-            linger.l_onoff = 0;
-            linger.l_linger = 0;
-        }
-        optval = linger;
-    } else {
-        optval = value;
-    }
-
-    if (NET_SetSockOpt(fd, level[0], opt[0], optval) < 0) {
-        NET_ThrowNew(env, WSAGetLastError(), "setsockopt");
-    }
-}
-
-/*
- * Class:     java_net_DualStackPlainSocketImpl
- * Method:    getIntOption
- * Signature: (II)I
- */
-static int getIntOption
-  (JNIEnv env, cli.System.Net.Sockets.Socket fd, int cmd) {
-
-    int[] level = { 0 };
-    int[] opt = { 0 };
-    int[] result = { 0 };
-    linger linger;
-    Object optval;
-
-    if (NET_MapSocketOption(cmd, level, opt) < 0) {
-        JNU_ThrowByName(env,
-                                     JNU_JAVANETPKG+"SocketException",
-                                     "Unsupported socket option");
-        return -1;
-    }
-
-    if (opt[0] == java.net.SocketOptions.SO_LINGER) {
-        linger = new linger();
-        optval = linger;
-    } else {
-        linger = null;
-        optval = result;
-    }
-
-    if (NET_GetSockOpt(fd, level[0], opt[0], optval) < 0) {
-        NET_ThrowNew(env, WSAGetLastError(), "getsockopt");
-        return -1;
-    }
-
-    if (opt[0] == java.net.SocketOptions.SO_LINGER)
-        return linger.l_onoff != 0 ? linger.l_linger : -1;
-    else
-        return result[0];
-}
-
-
-/*
- * Class:     java_net_DualStackPlainSocketImpl
- * Method:    sendOOB
- * Signature: (II)V
- */
-static void sendOOB
-  (JNIEnv env, cli.System.Net.Sockets.Socket fd, int data) {
-    int n;
-
-    n = send(fd, new byte[] { (byte)data }, 1, MSG_OOB);
-    if (n == JVM_IO_ERR) {
-        NET_ThrowNew(env, WSAGetLastError(), "send");
-    } else if (n == JVM_IO_INTR) {
-        JNU_ThrowByName(env, "java.io.InterruptedIOException", null);
-    }
-}
-
-/*
- * Class:     java_net_DualStackPlainSocketImpl
- * Method:    configureBlocking
- * Signature: (IZ)V
- */
-static void configureBlocking
-  (JNIEnv env, cli.System.Net.Sockets.Socket fd, boolean blocking) {
-    int arg;
-    int result;
-
-    if (blocking == JNI_TRUE) {
-        arg = SET_BLOCKING;    // 0
-    } else {
-        arg = SET_NONBLOCKING;   // 1
-    }
-
-    result = ioctlsocket(fd, FIONBIO, arg);
-    if (result == SOCKET_ERROR) {
-        NET_ThrowNew(env, WSAGetLastError(), "configureBlocking");
-    }
-}
-}
diff --git a/openjdk/java/net/PlainSocketImpl.java b/openjdk/java/net/PlainSocketImpl.java
deleted file mode 100644
index 5b7f850d..00000000
--- a/openjdk/java/net/PlainSocketImpl.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.net;
-
-import java.io.*;
-import java.security.PrivilegedAction;
-
-/*
- * This class PlainSocketImpl simply delegates to the appropriate real
- * SocketImpl. We do this because PlainSocketImpl is already extended
- * by SocksSocketImpl.
- * <p>
- * There are two possibilities for the real SocketImpl,
- * TwoStacksPlainSocketImpl or DualStackPlainSocketImpl. We use
- * DualStackPlainSocketImpl on systems that have a dual stack
- * TCP implementation. Otherwise we create an instance of
- * TwoStacksPlainSocketImpl and delegate to it.
- *
- * @author Chris Hegarty
- */
-
-class PlainSocketImpl extends AbstractPlainSocketImpl
-{
-    private AbstractPlainSocketImpl impl;
-
-    /* the windows version. */
-    private static float version;
-
-    /* java.net.preferIPv4Stack */
-    private static boolean preferIPv4Stack = false;
-
-    /* If the version supports a dual stack TCP implementation */
-    private static boolean useDualStackImpl = false;
-
-    /* sun.net.useExclusiveBind */
-    private static String exclBindProp;
-
-    /* True if exclusive binding is on for Windows */
-    private static boolean exclusiveBind = true;
-
-    static {
-        java.security.AccessController.doPrivileged( new PrivilegedAction<Object>() {
-                public Object run() {
-                    version = 0;
-                    try {
-                        version = Float.parseFloat(System.getProperties().getProperty("os.version"));
-                        preferIPv4Stack = Boolean.parseBoolean(
-                                          System.getProperties().getProperty("java.net.preferIPv4Stack"));
-                        exclBindProp = System.getProperty("sun.net.useExclusiveBind");
-                    } catch (NumberFormatException e ) {
-                        assert false : e;
-                    }
-                    return null; // nothing to return
-                } });
-
-        String ipv6 = ikvm.internal.Util.SafeGetEnvironmentVariable("IKVM_IPV6");
-        if (ipv6 != null) {
-            try {
-                if ((Integer.parseInt(ipv6) & 4) == 0) {
-                    preferIPv4Stack = true;
-                } else {
-                    useDualStackImpl = true;
-                }
-            } catch (NumberFormatException _) {
-            }
-        } else if (!InetAddressImplFactory.isIPv6Supported()) {
-            preferIPv4Stack = true;
-        }
-
-        // (version >= 6.0) implies Vista or greater.
-        if (version >= 6.0 && !preferIPv4Stack) {
-                useDualStackImpl = true;
-        }
-
-        if (exclBindProp != null) {
-            // sun.net.useExclusiveBind is true
-            exclusiveBind = exclBindProp.length() == 0 ? true
-                    : Boolean.parseBoolean(exclBindProp);
-        } else if (version < 6.0) {
-            exclusiveBind = false;
-        }
-    }
-
-    /**
-     * Constructs an empty instance.
-     */
-    PlainSocketImpl() {
-        if (useDualStackImpl) {
-            impl = new DualStackPlainSocketImpl(exclusiveBind);
-        } else {
-            impl = new TwoStacksPlainSocketImpl(exclusiveBind);
-        }
-    }
-
-    /**
-     * Constructs an instance with the given file descriptor.
-     */
-    PlainSocketImpl(FileDescriptor fd) {
-        if (useDualStackImpl) {
-            impl = new DualStackPlainSocketImpl(fd, exclusiveBind);
-        } else {
-            impl = new TwoStacksPlainSocketImpl(fd, exclusiveBind);
-        }
-    }
-
-    // Override methods in SocketImpl that access impl's fields.
-
-    protected FileDescriptor getFileDescriptor() {
-        return impl.getFileDescriptor();
-    }
-
-    protected InetAddress getInetAddress() {
-        return impl.getInetAddress();
-    }
-
-    protected int getPort() {
-        return impl.getPort();
-    }
-
-    protected int getLocalPort() {
-        return impl.getLocalPort();
-    }
-
-    void setSocket(Socket soc) {
-        impl.setSocket(soc);
-    }
-
-    Socket getSocket() {
-        return impl.getSocket();
-    }
-
-    void setServerSocket(ServerSocket soc) {
-        impl.setServerSocket(soc);
-    }
-
-    ServerSocket getServerSocket() {
-        return impl.getServerSocket();
-    }
-
-    public String toString() {
-        return impl.toString();
-    }
-
-    // Override methods in AbstractPlainSocketImpl that access impl's fields.
-
-    protected synchronized void create(boolean stream) throws IOException {
-        impl.create(stream);
-
-        // set fd to delegate's fd to be compatible with older releases
-        this.fd = impl.fd;
-    }
-
-    protected void connect(String host, int port)
-        throws UnknownHostException, IOException
-    {
-        impl.connect(host, port);
-    }
-
-    protected void connect(InetAddress address, int port) throws IOException {
-        impl.connect(address, port);
-    }
-
-    protected void connect(SocketAddress address, int timeout) throws IOException {
-        impl.connect(address, timeout);
-    }
-
-    public void setOption(int opt, Object val) throws SocketException {
-        impl.setOption(opt, val);
-    }
-
-    public Object getOption(int opt) throws SocketException {
-        return impl.getOption(opt);
-    }
-
-    synchronized void doConnect(InetAddress address, int port, int timeout) throws IOException {
-        impl.doConnect(address, port, timeout);
-    }
-
-    protected synchronized void bind(InetAddress address, int lport)
-        throws IOException
-    {
-        impl.bind(address, lport);
-    }
-
-    protected synchronized void accept(SocketImpl s) throws IOException {
-        // pass in the real impl not the wrapper.
-        SocketImpl delegate = ((PlainSocketImpl)s).impl;
-        delegate.address = new InetAddress();
-        delegate.fd = new FileDescriptor();
-        impl.accept(delegate);
-
-        // set fd to delegate's fd to be compatible with older releases
-        s.fd = delegate.fd;
-    }
-
-    void setFileDescriptor(FileDescriptor fd) {
-        impl.setFileDescriptor(fd);
-    }
-
-    void setAddress(InetAddress address) {
-        impl.setAddress(address);
-    }
-
-    void setPort(int port) {
-        impl.setPort(port);
-    }
-
-    void setLocalPort(int localPort) {
-        impl.setLocalPort(localPort);
-    }
-
-    protected synchronized InputStream getInputStream() throws IOException {
-        return impl.getInputStream();
-    }
-
-    void setInputStream(SocketInputStream in) {
-        impl.setInputStream(in);
-    }
-
-    protected synchronized OutputStream getOutputStream() throws IOException {
-        return impl.getOutputStream();
-    }
-
-    protected void close() throws IOException {
-        try {
-            impl.close();
-        } finally {
-            // set fd to delegate's fd to be compatible with older releases
-            this.fd = null;
-        }
-    }
-
-    void reset() throws IOException {
-        try {
-            impl.reset();
-        } finally {
-            // set fd to delegate's fd to be compatible with older releases
-            this.fd = null;
-        }
-    }
-
-    protected void shutdownInput() throws IOException {
-        impl.shutdownInput();
-    }
-
-    protected void shutdownOutput() throws IOException {
-        impl.shutdownOutput();
-    }
-
-    protected void sendUrgentData(int data) throws IOException {
-        impl.sendUrgentData(data);
-    }
-
-    FileDescriptor acquireFD() {
-        return impl.acquireFD();
-    }
-
-    void releaseFD() {
-        impl.releaseFD();
-    }
-
-    public boolean isConnectionReset() {
-        return impl.isConnectionReset();
-    }
-
-    public boolean isConnectionResetPending() {
-        return impl.isConnectionResetPending();
-    }
-
-    public void setConnectionReset() {
-        impl.setConnectionReset();
-    }
-
-    public void setConnectionResetPending() {
-        impl.setConnectionResetPending();
-    }
-
-    public boolean isClosedOrPending() {
-        return impl.isClosedOrPending();
-    }
-
-    public int getTimeout() {
-        return impl.getTimeout();
-    }
-
-    // Override methods in AbstractPlainSocketImpl that need to be implemented.
-
-    void socketCreate(boolean isServer) throws IOException {
-        impl.socketCreate(isServer);
-    }
-
-    void socketConnect(InetAddress address, int port, int timeout)
-        throws IOException {
-        impl.socketConnect(address, port, timeout);
-    }
-
-    void socketBind(InetAddress address, int port)
-        throws IOException {
-        impl.socketBind(address, port);
-    }
-
-    void socketListen(int count) throws IOException {
-        impl.socketListen(count);
-    }
-
-    void socketAccept(SocketImpl s) throws IOException {
-        impl.socketAccept(s);
-    }
-
-    int socketAvailable() throws IOException {
-        return impl.socketAvailable();
-    }
-
-    void socketClose0(boolean useDeferredClose) throws IOException {
-        impl.socketClose0(useDeferredClose);
-    }
-
-    void socketShutdown(int howto) throws IOException {
-        impl.socketShutdown(howto);
-    }
-
-    void socketSetOption(int cmd, boolean on, Object value)
-        throws SocketException {
-        socketSetOption(cmd, on, value);
-    }
-
-    int socketGetOption(int opt, Object iaContainerObj) throws SocketException {
-        return impl.socketGetOption(opt, iaContainerObj);
-    }
-
-    void socketSendUrgentData(int data) throws IOException {
-        impl.socketSendUrgentData(data);
-    }
-}
diff --git a/openjdk/java/net/SocketInputStream.java b/openjdk/java/net/SocketInputStream.java
deleted file mode 100644
index 161947cc..00000000
--- a/openjdk/java/net/SocketInputStream.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*
- * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.net;
-
-import java.io.FileDescriptor;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.nio.channels.FileChannel;
-import static ikvm.internal.Winsock.*;
-import static java.net.net_util_md.*;
-
-import sun.misc.IoTrace;
-import sun.net.ConnectionResetException;
-
-/**
- * This stream extends FileInputStream to implement a
- * SocketInputStream. Note that this class should <b>NOT</b> be
- * public.
- *
- * @author      Jonathan Payne
- * @author      Arthur van Hoff
- */
-class SocketInputStream extends FileInputStream
-{
-
-    private boolean eof;
-    private AbstractPlainSocketImpl impl = null;
-    private byte temp[];
-    private Socket socket = null;
-
-    /**
-     * Creates a new SocketInputStream. Can only be called
-     * by a Socket. This method needs to hang on to the owner Socket so
-     * that the fd will not be closed.
-     * @param impl the implemented socket input stream
-     */
-    SocketInputStream(AbstractPlainSocketImpl impl) throws IOException {
-        super(impl.getFileDescriptor());
-        this.impl = impl;
-        socket = impl.getSocket();
-    }
-
-    /**
-     * Returns the unique {@link java.nio.channels.FileChannel FileChannel}
-     * object associated with this file input stream.</p>
-     *
-     * The <code>getChannel</code> method of <code>SocketInputStream</code>
-     * returns <code>null</code> since it is a socket based stream.</p>
-     *
-     * @return  the file channel associated with this file input stream
-     *
-     * @since 1.4
-     * @spec JSR-51
-     */
-    public final FileChannel getChannel() {
-        return null;
-    }
-
-    /**
-     * Reads into an array of bytes at the specified offset using
-     * the received socket primitive.
-     * @param fd the FileDescriptor
-     * @param b the buffer into which the data is read
-     * @param off the start offset of the data
-     * @param len the maximum number of bytes read
-     * @param timeout the read timeout in ms
-     * @return the actual number of bytes read, -1 is
-     *          returned when the end of the stream is reached.
-     * @exception IOException If an I/O error has occurred.
-     */
-    private int socketRead0(FileDescriptor fdObj, byte bufP[], int off, int len, int timeout) throws IOException
-    {
-        // [IKVM] this method is a direct port of the native code in openjdk6-b18\jdk\src\windows\native\java\net\SocketInputStream.c
-        cli.System.Net.Sockets.Socket fd = null;
-        int nread;
-        
-        if (IS_NULL(fdObj)) {
-            throw new SocketException("socket closed");
-        }
-        fd = fdObj.getSocket();
-        if (fd == null) {
-            throw new SocketException("Socket closed");
-        }
-
-        if (timeout != 0) {
-            if (timeout <= 5000 || !isRcvTimeoutSupported) {
-                int ret = NET_Timeout (fd, timeout);
-                
-                if (ret <= 0) {
-                    if (ret == 0) {
-                        throw new SocketTimeoutException("Read timed out");
-                    } else {
-                        // [IKVM] the OpenJDK native code is broken and always throws this exception on any failure of NET_Timeout
-                        throw new SocketException("socket closed");
-                    }
-                }
-                
-                /*check if the socket has been closed while we were in timeout*/
-                if (fdObj.getSocket() == null) {
-                    throw new SocketException("Socket Closed");
-                }
-            }
-        }
-        
-        nread = recv(fd, bufP, off, len, 0);
-        if (nread > 0) {
-            // ok
-        } else {
-            if (nread < 0) {
-                /*
-                 * Recv failed.
-                 */
-                switch (WSAGetLastError()) {
-                    case WSAEINTR:
-                        throw new SocketException("socket closed");
-
-                    case WSAECONNRESET:
-                    case WSAESHUTDOWN:
-                        /*
-                         * Connection has been reset - Windows sometimes reports
-                         * the reset as a shutdown error.
-                         */
-                        throw new ConnectionResetException();
-
-                    case WSAETIMEDOUT :
-                        throw new SocketTimeoutException("Read timed out");
-
-                    default:
-                        throw NET_ThrowCurrent("recv failed");
-                }
-            }
-        }
-        return nread;
-    }
-
-    /**
-     * Reads into a byte array data from the socket.
-     * @param b the buffer into which the data is read
-     * @return the actual number of bytes read, -1 is
-     *          returned when the end of the stream is reached.
-     * @exception IOException If an I/O error has occurred.
-     */
-    public int read(byte b[]) throws IOException {
-        return read(b, 0, b.length);
-    }
-
-    /**
-     * Reads into a byte array <i>b</i> at offset <i>off</i>,
-     * <i>length</i> bytes of data.
-     * @param b the buffer into which the data is read
-     * @param off the start offset of the data
-     * @param len the maximum number of bytes read
-     * @return the actual number of bytes read, -1 is
-     *          returned when the end of the stream is reached.
-     * @exception IOException If an I/O error has occurred.
-     */
-    public int read(byte b[], int off, int length) throws IOException {
-        return read(b, off, length, impl.getTimeout());
-    }
-
-    int read(byte b[], int off, int length, int timeout) throws IOException {
-        int n = 0;
-
-        // EOF already encountered
-        if (eof) {
-            return -1;
-        }
-
-        // connection reset
-        if (impl.isConnectionReset()) {
-            throw new SocketException("Connection reset");
-        }
-
-        // bounds check
-        if (length <= 0 || off < 0 || off + length > b.length) {
-            if (length == 0) {
-                return 0;
-            }
-            throw new ArrayIndexOutOfBoundsException();
-        }
-
-        boolean gotReset = false;
-
-        Object traceContext = IoTrace.socketReadBegin();
-        // acquire file descriptor and do the read
-        FileDescriptor fd = impl.acquireFD();
-        try {
-            n = socketRead0(fd, b, off, length, timeout);
-            if (n > 0) {
-                return n;
-            }
-        } catch (ConnectionResetException rstExc) {
-            gotReset = true;
-        } finally {
-            impl.releaseFD();
-            IoTrace.socketReadEnd(traceContext, impl.address, impl.port,
-                                  timeout, n > 0 ? n : 0);
-        }
-
-        /*
-         * We receive a "connection reset" but there may be bytes still
-         * buffered on the socket
-         */
-        if (gotReset) {
-            traceContext = IoTrace.socketReadBegin();
-            impl.setConnectionResetPending();
-            impl.acquireFD();
-            try {
-                n = socketRead0(fd, b, off, length, timeout);
-                if (n > 0) {
-                    return n;
-                }
-            } catch (ConnectionResetException rstExc) {
-            } finally {
-                impl.releaseFD();
-                IoTrace.socketReadEnd(traceContext, impl.address, impl.port,
-                                      timeout, n > 0 ? n : 0);
-            }
-        }
-
-        /*
-         * If we get here we are at EOF, the socket has been closed,
-         * or the connection has been reset.
-         */
-        if (impl.isClosedOrPending()) {
-            throw new SocketException("Socket closed");
-        }
-        if (impl.isConnectionResetPending()) {
-            impl.setConnectionReset();
-        }
-        if (impl.isConnectionReset()) {
-            throw new SocketException("Connection reset");
-        }
-        eof = true;
-        return -1;
-    }
-
-    /**
-     * Reads a single byte from the socket.
-     */
-    public int read() throws IOException {
-        if (eof) {
-            return -1;
-        }
-        temp = new byte[1];
-        int n = read(temp, 0, 1);
-        if (n <= 0) {
-            return -1;
-        }
-        return temp[0] & 0xff;
-    }
-
-    /**
-     * Skips n bytes of input.
-     * @param n the number of bytes to skip
-     * @return  the actual number of bytes skipped.
-     * @exception IOException If an I/O error has occurred.
-     */
-    public long skip(long numbytes) throws IOException {
-        if (numbytes <= 0) {
-            return 0;
-        }
-        long n = numbytes;
-        int buflen = (int) Math.min(1024, n);
-        byte data[] = new byte[buflen];
-        while (n > 0) {
-            int r = read(data, 0, (int) Math.min((long) buflen, n));
-            if (r < 0) {
-                break;
-            }
-            n -= r;
-        }
-        return numbytes - n;
-    }
-
-    /**
-     * Returns the number of bytes that can be read without blocking.
-     * @return the number of immediately available bytes
-     */
-    public int available() throws IOException {
-        return impl.available();
-    }
-
-    /**
-     * Closes the stream.
-     */
-    private boolean closing = false;
-    public void close() throws IOException {
-        // Prevent recursion. See BugId 4484411
-        if (closing)
-            return;
-        closing = true;
-        if (socket != null) {
-            if (!socket.isClosed())
-                socket.close();
-        } else
-            impl.close();
-        closing = false;
-    }
-
-    void setEOF(boolean eof) {
-        this.eof = eof;
-    }
-
-    /**
-     * Overrides finalize, the fd is closed by the Socket.
-     */
-    protected void finalize() {}
-}
diff --git a/openjdk/java/net/SocketOutputStream.java b/openjdk/java/net/SocketOutputStream.java
deleted file mode 100644
index fd6e2c4f..00000000
--- a/openjdk/java/net/SocketOutputStream.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.net;
-
-import java.io.FileDescriptor;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.channels.FileChannel;
-import static ikvm.internal.Winsock.*;
-import static java.net.net_util_md.*;
-
-import sun.misc.IoTrace;
-
-/**
- * This stream extends FileOutputStream to implement a
- * SocketOutputStream. Note that this class should <b>NOT</b> be
- * public.
- *
- * @author      Jonathan Payne
- * @author      Arthur van Hoff
- */
-class SocketOutputStream extends FileOutputStream
-{
-    private AbstractPlainSocketImpl impl = null;
-    private byte temp[] = new byte[1];
-    private Socket socket = null;
-
-    /**
-     * Creates a new SocketOutputStream. Can only be called
-     * by a Socket. This method needs to hang on to the owner Socket so
-     * that the fd will not be closed.
-     * @param impl the socket output stream inplemented
-     */
-    SocketOutputStream(AbstractPlainSocketImpl impl) throws IOException {
-        super(impl.getFileDescriptor());
-        this.impl = impl;
-        socket = impl.getSocket();
-    }
-
-    /**
-     * Returns the unique {@link java.nio.channels.FileChannel FileChannel}
-     * object associated with this file output stream. </p>
-     *
-     * The <code>getChannel</code> method of <code>SocketOutputStream</code>
-     * returns <code>null</code> since it is a socket based stream.</p>
-     *
-     * @return  the file channel associated with this file output stream
-     *
-     * @since 1.4
-     * @spec JSR-51
-     */
-    public final FileChannel getChannel() {
-        return null;
-    }
-
-    /**
-     * Writes to the socket.
-     * @param fd the FileDescriptor
-     * @param b the data to be written
-     * @param off the start offset in the data
-     * @param len the number of bytes that are written
-     * @exception IOException If an I/O error has occurred.
-     */
-    private void socketWrite0(FileDescriptor fdObj, byte[] data, int off, int len) throws IOException
-    {
-        // [IKVM] this method is a direct port of the native code in openjdk6-b18\jdk\src\windows\native\java\net\SocketOutputStream.c
-        final int MAX_BUFFER_LEN = 2048;
-        cli.System.Net.Sockets.Socket fd;
-        int buflen = 65536; // MAX_HEAP_BUFFER_LEN
-        int n;
-
-        if (IS_NULL(fdObj)) {
-            throw new SocketException("socket closed");
-        } else {
-            fd = fdObj.getSocket();
-        }
-        if (IS_NULL(data)) {
-            throw new NullPointerException("data argument");
-        }
-        
-        while(len > 0) {
-            int loff = 0;
-            int chunkLen = Math.min(buflen, len);
-            int llen = chunkLen;
-            int retry = 0;
-
-            while(llen > 0) {
-                n = send(fd, data, off + loff, llen, 0);
-                if (n > 0) {
-                    llen -= n;
-                    loff += n;
-                    continue;
-                }
-
-                /*
-                 * Due to a bug in Windows Sockets (observed on NT and Windows
-                 * 2000) it may be necessary to retry the send. The issue is that
-                 * on blocking sockets send/WSASend is supposed to block if there
-                 * is insufficient buffer space available. If there are a large
-                 * number of threads blocked on write due to congestion then it's
-                 * possile to hit the NT/2000 bug whereby send returns WSAENOBUFS.
-                 * The workaround we use is to retry the send. If we have a
-                 * large buffer to send (>2k) then we retry with a maximum of
-                 * 2k buffer. If we hit the issue with <=2k buffer then we backoff
-                 * for 1 second and retry again. We repeat this up to a reasonable
-                 * limit before bailing out and throwing an exception. In load
-                 * conditions we've observed that the send will succeed after 2-3
-                 * attempts but this depends on network buffers associated with
-                 * other sockets draining.
-                 */
-                if (WSAGetLastError() == WSAENOBUFS) {
-                    if (llen > MAX_BUFFER_LEN) {
-                        buflen = MAX_BUFFER_LEN;
-                        chunkLen = MAX_BUFFER_LEN;
-                        llen = MAX_BUFFER_LEN;
-                        continue;
-                    }
-                    if (retry >= 30) {
-                        throw new SocketException("No buffer space available - exhausted attempts to queue buffer");
-                    }
-                    cli.System.Threading.Thread.Sleep(1000);
-                    retry++;
-                    continue;
-                }
-
-                /*
-                 * Send failed - can be caused by close or write error.
-                 */
-                if (WSAGetLastError() == WSAENOTSOCK) {
-                    throw new SocketException("Socket closed");
-                } else {
-                    throw NET_ThrowCurrent("socket write error");
-                }
-            }
-            len -= chunkLen;
-            off += chunkLen;
-        }
-    }
-
-    /**
-     * Writes to the socket with appropriate locking of the
-     * FileDescriptor.
-     * @param b the data to be written
-     * @param off the start offset in the data
-     * @param len the number of bytes that are written
-     * @exception IOException If an I/O error has occurred.
-     */
-    private void socketWrite(byte b[], int off, int len) throws IOException {
-
-        if (len <= 0 || off < 0 || off + len > b.length) {
-            if (len == 0) {
-                return;
-            }
-            throw new ArrayIndexOutOfBoundsException();
-        }
-
-        Object traceContext = IoTrace.socketWriteBegin();
-        int bytesWritten = 0;
-        FileDescriptor fd = impl.acquireFD();
-        try {
-            socketWrite0(fd, b, off, len);
-            bytesWritten = len;
-        } catch (SocketException se) {
-            if (se instanceof sun.net.ConnectionResetException) {
-                impl.setConnectionResetPending();
-                se = new SocketException("Connection reset");
-            }
-            if (impl.isClosedOrPending()) {
-                throw new SocketException("Socket closed");
-            } else {
-                throw se;
-            }
-        } finally {
-            impl.releaseFD();
-            IoTrace.socketWriteEnd(traceContext, impl.address, impl.port, bytesWritten);
-        }
-    }
-
-    /**
-     * Writes a byte to the socket.
-     * @param b the data to be written
-     * @exception IOException If an I/O error has occurred.
-     */
-    public void write(int b) throws IOException {
-        temp[0] = (byte)b;
-        socketWrite(temp, 0, 1);
-    }
-
-    /**
-     * Writes the contents of the buffer <i>b</i> to the socket.
-     * @param b the data to be written
-     * @exception SocketException If an I/O error has occurred.
-     */
-    public void write(byte b[]) throws IOException {
-        socketWrite(b, 0, b.length);
-    }
-
-    /**
-     * Writes <i>length</i> bytes from buffer <i>b</i> starting at
-     * offset <i>len</i>.
-     * @param b the data to be written
-     * @param off the start offset in the data
-     * @param len the number of bytes that are written
-     * @exception SocketException If an I/O error has occurred.
-     */
-    public void write(byte b[], int off, int len) throws IOException {
-        socketWrite(b, off, len);
-    }
-
-    /**
-     * Closes the stream.
-     */
-    private boolean closing = false;
-    public void close() throws IOException {
-        // Prevent recursion. See BugId 4484411
-        if (closing)
-            return;
-        closing = true;
-        if (socket != null) {
-            if (!socket.isClosed())
-                socket.close();
-        } else
-            impl.close();
-        closing = false;
-    }
-
-    /**
-     * Overrides finalize, the fd is closed by the Socket.
-     */
-    protected void finalize() {}
-}
diff --git a/openjdk/java/net/SocketUtil.java b/openjdk/java/net/SocketUtil.java
deleted file mode 100644
index d9a30869..00000000
--- a/openjdk/java/net/SocketUtil.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
-  Copyright (C) 2002-2010 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-
-package java.net;
-
-import cli.System.Net.IPAddress;
-import cli.System.Net.IPEndPoint;
-import cli.System.Net.Sockets.SocketOptionName;
-import cli.System.Net.Sockets.SocketOptionLevel;
-import ikvm.lang.CIL;
-import java.io.IOException;
-
-@ikvm.lang.Internal
-public final class SocketUtil
-{
-    private SocketUtil() { }
-
-    // Winsock Error Codes
-    public static final int WSAEINVAL = 10022;
-    public static final int WSAEWOULDBLOCK = 10035;
-    public static final int WSAEMSGSIZE = 10040;
-    public static final int WSAENOPROTOOPT = 10042;
-    public static final int WSAEADDRINUSE = 10048;
-    public static final int WSAENETUNREACH = 10051;
-    public static final int WSAECONNRESET = 10054;
-    public static final int WSAESHUTDOWN = 10058;
-    public static final int WSAETIMEDOUT = 10060;
-    public static final int WSAECONNREFUSED = 10061;
-    public static final int WSAEHOSTUNREACH = 10065;
-    public static final int WSAHOST_NOT_FOUND = 11001;
-
-    public static IOException convertSocketExceptionToIOException(cli.System.Net.Sockets.SocketException x) throws IOException
-    {
-        switch (x.get_ErrorCode())
-        {
-            case WSAEADDRINUSE:
-                return new BindException(x.getMessage());
-            case WSAENETUNREACH:
-            case WSAEHOSTUNREACH:
-                return new NoRouteToHostException(x.getMessage());
-            case WSAETIMEDOUT:
-                return new SocketTimeoutException(x.getMessage());
-            case WSAECONNREFUSED:
-                return new PortUnreachableException(x.getMessage());
-            case WSAHOST_NOT_FOUND:
-                return new UnknownHostException(x.getMessage());
-            default:
-                return new SocketException(x.getMessage() + "\nError Code: " + x.get_ErrorCode());
-        }
-    }
-
-    public static IPAddress getAddressFromInetAddress(InetAddress addr)
-    {
-        return getAddressFromInetAddress(addr, false);
-    }
-
-    public static IPAddress getAddressFromInetAddress(InetAddress addr, boolean v4mapped)
-    {
-        byte[] b = addr.getAddress();
-        if (b.length == 16)
-        {
-            // FXBUG in .NET 1.1 you can only construct IPv6 addresses (not IPv4) with this constructor
-            // (according to the documentation this was fixed in .NET 2.0)
-            return new IPAddress(b);
-        }
-        else if (v4mapped)
-        {
-            if (b[0] == 0 && b[1] == 0 && b[2] == 0 && b[3] == 0)
-            {
-                return IPAddress.IPv6Any;
-            }
-            byte[] b16 = new byte[16];
-            b16[10] = -1;
-            b16[11] = -1;
-            b16[12] = b[0];
-            b16[13] = b[1];
-            b16[14] = b[2];
-            b16[15] = b[3];
-            return new IPAddress(b16);
-        }
-        else
-        {
-            return new IPAddress((((b[3] & 0xff) << 24) + ((b[2] & 0xff) << 16) + ((b[1] & 0xff) << 8) + (b[0] & 0xff)) & 0xffffffffL);
-        }
-    }
-
-    public static InetAddress getInetAddressFromIPEndPoint(IPEndPoint endpoint)
-    {
-        try
-        {
-            return InetAddress.getByAddress(endpoint.get_Address().GetAddressBytes());
-        }
-        catch (UnknownHostException x)
-        {
-            // this exception only happens if the address byte array is of invalid length, which cannot happen unless
-            // the .NET socket returns a bogus address
-            throw (InternalError)new InternalError().initCause(x);
-        }
-    }
-
-    static void setCommonSocketOption(cli.System.Net.Sockets.Socket netSocket, int cmd, boolean on, Object value) throws SocketException
-    {
-        try
-        {
-            if (false) throw new cli.System.Net.Sockets.SocketException();
-            if (false) throw new cli.System.ObjectDisposedException("");
-            switch (cmd)
-            {
-                case SocketOptions.SO_REUSEADDR:
-                    netSocket.SetSocketOption(SocketOptionLevel.wrap(SocketOptionLevel.Socket), SocketOptionName.wrap(SocketOptionName.ReuseAddress), on ? 1 : 0);
-                    break;
-                case SocketOptions.SO_SNDBUF:
-                    netSocket.SetSocketOption(SocketOptionLevel.wrap(SocketOptionLevel.Socket), SocketOptionName.wrap(SocketOptionName.SendBuffer), ((Integer)value).intValue());
-                    break;
-                case SocketOptions.SO_RCVBUF:
-                    netSocket.SetSocketOption(SocketOptionLevel.wrap(SocketOptionLevel.Socket), SocketOptionName.wrap(SocketOptionName.ReceiveBuffer), ((Integer)value).intValue());
-                    break;
-                case SocketOptions.IP_TOS:
-                    netSocket.SetSocketOption(SocketOptionLevel.wrap(SocketOptionLevel.IP), SocketOptionName.wrap(SocketOptionName.TypeOfService), ((Integer)value).intValue());
-                    break;
-                case SocketOptions.SO_BINDADDR: // read-only
-                default:
-                    throw new SocketException("Invalid socket option: " + cmd);
-            }
-        }
-        catch (cli.System.Net.Sockets.SocketException x)
-        {
-            throw new SocketException(x.getMessage());
-        }
-        catch (cli.System.ObjectDisposedException x1)
-        {
-            throw new SocketException("Socket is closed");
-        }
-    }
-
-    static int getCommonSocketOption(cli.System.Net.Sockets.Socket netSocket, int opt, Object iaContainerObj) throws SocketException
-    {
-        try
-        {
-            if (false) throw new cli.System.Net.Sockets.SocketException();
-            if (false) throw new cli.System.ObjectDisposedException("");
-            switch (opt)
-            {
-                case SocketOptions.SO_REUSEADDR:
-                    return CIL.unbox_int(netSocket.GetSocketOption(SocketOptionLevel.wrap(SocketOptionLevel.Socket), SocketOptionName.wrap(SocketOptionName.ReuseAddress))) == 0 ? -1 : 1;
-                case SocketOptions.SO_SNDBUF:
-                    return CIL.unbox_int(netSocket.GetSocketOption(SocketOptionLevel.wrap(SocketOptionLevel.Socket), SocketOptionName.wrap(SocketOptionName.SendBuffer)));
-                case SocketOptions.SO_RCVBUF:
-                    return CIL.unbox_int(netSocket.GetSocketOption(SocketOptionLevel.wrap(SocketOptionLevel.Socket), SocketOptionName.wrap(SocketOptionName.ReceiveBuffer)));
-                case SocketOptions.IP_TOS:
-                    // TODO handle IPv6 here
-                    return CIL.unbox_int(netSocket.GetSocketOption(SocketOptionLevel.wrap(SocketOptionLevel.IP), SocketOptionName.wrap(SocketOptionName.TypeOfService)));
-                case SocketOptions.SO_BINDADDR:
-                    ((InetAddressContainer)iaContainerObj).addr = getInetAddressFromIPEndPoint((IPEndPoint)netSocket.get_LocalEndPoint());
-                    return 0;
-                default:
-                    throw new SocketException("Invalid socket option: " + opt);
-            }
-        }
-        catch (cli.System.Net.Sockets.SocketException x)
-        {
-            throw new SocketException(x.getMessage());
-        }
-        catch (cli.System.ObjectDisposedException x1)
-        {
-            throw new SocketException("Socket is closed");
-        }
-    }
-}
diff --git a/openjdk/java/net/TwoStacksPlainDatagramSocketImpl.java b/openjdk/java/net/TwoStacksPlainDatagramSocketImpl.java
deleted file mode 100644
index 2b2bde1b..00000000
--- a/openjdk/java/net/TwoStacksPlainDatagramSocketImpl.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.net;
-
-import java.io.IOException;
-import java.io.FileDescriptor;
-import sun.net.ResourceManager;
-
-/**
- * This class defines the plain DatagramSocketImpl that is used for all
- * Windows versions lower than Vista. It adds support for IPv6 on
- * these platforms where available.
- *
- * For backward compatibility windows platforms that do not have IPv6
- * support also use this implementation, and fd1 gets set to null
- * during socket creation.
- *
- * @author Chris Hegarty
- */
-
-class TwoStacksPlainDatagramSocketImpl extends AbstractPlainDatagramSocketImpl
-{
-    /* Used for IPv6 on Windows only */
-    FileDescriptor fd1;
-
-    /*
-     * Needed for ipv6 on windows because we need to know
-     * if the socket was bound to ::0 or 0.0.0.0, when a caller
-     * asks for it. In this case, both sockets are used, but we
-     * don't know whether the caller requested ::0 or 0.0.0.0
-     * and need to remember it here.
-     */
-    private InetAddress anyLocalBoundAddr=null;
-
-    cli.System.Net.Sockets.Socket fduse=null; /* saved between peek() and receive() calls */
-
-    /* saved between successive calls to receive, if data is detected
-     * on both sockets at same time. To ensure that one socket is not
-     * starved, they rotate using this field
-     */
-    cli.System.Net.Sockets.Socket lastfd=null;
-
-    // true if this socket is exclusively bound
-    private final boolean exclusiveBind;
-
-    /*
-     * Set to true if SO_REUSEADDR is set after the socket is bound to
-     * indicate SO_REUSEADDR is being emulated
-     */
-    private boolean reuseAddressEmulated;
-
-    // emulates SO_REUSEADDR when exclusiveBind is true and socket is bound
-    private boolean isReuseAddress;
-
-    TwoStacksPlainDatagramSocketImpl(boolean exclBind) {
-        exclusiveBind = exclBind;
-    }
-
-    protected synchronized void create() throws SocketException {
-        fd1 = new FileDescriptor();
-        try {
-            super.create();
-        } catch (SocketException e) {
-            fd1 = null;
-            throw e;
-        }
-    }
-
-    protected synchronized void bind(int lport, InetAddress laddr)
-        throws SocketException {
-        super.bind(lport, laddr);
-        if (laddr.isAnyLocalAddress()) {
-            anyLocalBoundAddr = laddr;
-        }
-    }
-
-    @Override
-    protected synchronized void bind0(int lport, InetAddress laddr)
-        throws SocketException
-    {
-        bind0(lport, laddr, exclusiveBind);
-
-    }
-
-    protected synchronized void receive(DatagramPacket p)
-        throws IOException {
-        try {
-            receive0(p);
-        } finally {
-            fduse = null;
-        }
-    }
-
-    public Object getOption(int optID) throws SocketException {
-        if (isClosed()) {
-            throw new SocketException("Socket Closed");
-        }
-
-        if (optID == SO_BINDADDR) {
-            if (fd != null && fd1 != null) {
-                return anyLocalBoundAddr;
-            }
-            return socketGetOption(optID);
-        } else if (optID == SO_REUSEADDR && reuseAddressEmulated) {
-            return isReuseAddress;
-        } else {
-            return super.getOption(optID);
-        }
-    }
-
-    protected void socketSetOption(int opt, Object val)
-        throws SocketException
-    {
-        if (opt == SO_REUSEADDR && exclusiveBind && localPort != 0)  {
-            // socket already bound, emulate
-            reuseAddressEmulated = true;
-            isReuseAddress = (Boolean)val;
-        } else {
-            socketNativeSetOption(opt, val);
-        }
-
-    }
-
-    protected boolean isClosed() {
-        return (fd == null && fd1 == null) ? true : false;
-    }
-
-    protected void close() {
-        if (fd != null || fd1 != null) {
-            datagramSocketClose();
-            ResourceManager.afterUdpClose();
-            fd = null;
-            fd1 = null;
-        }
-    }
-
-    /* Native methods */
-
-    protected synchronized void bind0(int lport, InetAddress laddr,
-                                             boolean exclBind) throws SocketException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        TwoStacksPlainDatagramSocketImpl_c.bind0(env, this, lport, laddr, exclBind);
-        env.ThrowPendingException();
-    }
-
-    protected void send(DatagramPacket packet) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        TwoStacksPlainDatagramSocketImpl_c.send(env, this, packet);
-        env.ThrowPendingException();
-    }
-
-    protected synchronized int peek(InetAddress addressObj) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        int ret = TwoStacksPlainDatagramSocketImpl_c.peek(env, this, addressObj);
-        env.ThrowPendingException();
-        return ret;
-    }
-
-    protected synchronized int peekData(DatagramPacket p) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        int ret = TwoStacksPlainDatagramSocketImpl_c.peekData(env, this, p);
-        env.ThrowPendingException();
-        return ret;
-    }
-
-    protected synchronized void receive0(DatagramPacket packet) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        TwoStacksPlainDatagramSocketImpl_c.receive0(env, this, packet);
-        env.ThrowPendingException();
-    }
-
-    protected void setTimeToLive(int ttl) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        TwoStacksPlainDatagramSocketImpl_c.setTimeToLive(env, this, ttl);
-        env.ThrowPendingException();
-    }
-
-    protected int getTimeToLive() throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        int ret = TwoStacksPlainDatagramSocketImpl_c.getTimeToLive(env, this);
-        env.ThrowPendingException();
-        return ret;
-    }
-
-    protected void setTTL(byte ttl) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        TwoStacksPlainDatagramSocketImpl_c.setTTL(env, this, ttl);
-        env.ThrowPendingException();
-    }
-
-    protected byte getTTL() throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        byte ret = TwoStacksPlainDatagramSocketImpl_c.getTTL(env, this);
-        env.ThrowPendingException();
-        return ret;
-    }
-
-    protected void join(InetAddress inetaddr, NetworkInterface netIf) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        TwoStacksPlainDatagramSocketImpl_c.join(env, this, inetaddr, netIf);
-        env.ThrowPendingException();
-    }
-
-    protected void leave(InetAddress inetaddr, NetworkInterface netIf) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        TwoStacksPlainDatagramSocketImpl_c.leave(env, this, inetaddr, netIf);
-        env.ThrowPendingException();
-    }
-
-    protected void datagramSocketCreate() throws SocketException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        TwoStacksPlainDatagramSocketImpl_c.datagramSocketCreate(env, this);
-        env.ThrowPendingException();
-    }
-
-    protected void datagramSocketClose() {
-        TwoStacksPlainDatagramSocketImpl_c.datagramSocketClose(this);
-    }
-
-    protected void socketNativeSetOption(int opt, Object val) throws SocketException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        TwoStacksPlainDatagramSocketImpl_c.socketNativeSetOption(env, this, opt, val);
-        env.ThrowPendingException();
-    }
-
-    protected Object socketGetOption(int opt) throws SocketException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        Object ret = TwoStacksPlainDatagramSocketImpl_c.socketGetOption(env, this, opt);
-        env.ThrowPendingException();
-        return ret;
-    }
-
-    protected void connect0(InetAddress address, int port) throws SocketException {
-        if (ikvm.internal.Util.MONO) {
-            // MONOBUG Mono doesn't allow Socket.Connect(IPAddress.Any, 0) to disconnect a datagram socket,
-            // so we throw a SocketException, this will cause DatagramSocket to emulate connectedness
-            throw new SocketException("connected datagram sockets not supported on Mono");
-        }
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        TwoStacksPlainDatagramSocketImpl_c.connect0(env, this, address, port);
-        env.ThrowPendingException();
-    }
-
-    protected void disconnect0(int family) {
-        TwoStacksPlainDatagramSocketImpl_c.disconnect0(this, family);
-    }
-}
diff --git a/openjdk/java/net/TwoStacksPlainDatagramSocketImpl_c.java b/openjdk/java/net/TwoStacksPlainDatagramSocketImpl_c.java
deleted file mode 100644
index d84a427b..00000000
--- a/openjdk/java/net/TwoStacksPlainDatagramSocketImpl_c.java
+++ /dev/null
@@ -1,2463 +0,0 @@
-/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.net;
-
-import java.io.FileDescriptor;
-import static ikvm.internal.JNI.*;
-import static ikvm.internal.Winsock.*;
-import static java.net.net_util_md.*;
-import static java.net.InetAddress.IPv4;
-import static java.net.InetAddress.IPv6;
-
-final class TwoStacksPlainDatagramSocketImpl_c
-{
-static final int ni_class = 0;
-static final int JVM_IO_ERR = -1;
-static final int JVM_IO_INTR = -2;
-
-static final int java_net_SocketOptions_SO_BINDADDR = SocketOptions.SO_BINDADDR;
-static final int java_net_SocketOptions_SO_SNDBUF = SocketOptions.SO_SNDBUF;
-static final int java_net_SocketOptions_SO_RCVBUF = SocketOptions.SO_RCVBUF;
-static final int java_net_SocketOptions_IP_TOS = SocketOptions.IP_TOS;
-static final int java_net_SocketOptions_SO_REUSEADDR = SocketOptions.SO_REUSEADDR;
-static final int java_net_SocketOptions_SO_BROADCAST = SocketOptions.SO_BROADCAST;
-static final int java_net_SocketOptions_IP_MULTICAST_LOOP = SocketOptions.IP_MULTICAST_LOOP;
-static final int java_net_SocketOptions_IP_MULTICAST_IF = SocketOptions.IP_MULTICAST_IF;
-static final int java_net_SocketOptions_IP_MULTICAST_IF2 = SocketOptions.IP_MULTICAST_IF2;
-
-/*
-
-#include <windows.h>
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <malloc.h>
-#include <sys/types.h>
-
-#ifndef IPTOS_TOS_MASK
-#define IPTOS_TOS_MASK 0x1e
-#endif
-#ifndef IPTOS_PREC_MASK
-#define IPTOS_PREC_MASK 0xe0
-#endif
-
-#include "java_net_TwoStacksPlainDatagramSocketImpl.h"
-#include "java_net_SocketOptions.h"
-#include "java_net_NetworkInterface.h"
-
-#include "NetworkInterface.h"
-#include "jvm.h"
-#include "jni_util.h"
-#include "net_util.h"
-
-#define IN_CLASSD(i)    (((long)(i) & 0xf0000000) == 0xe0000000)
-#define IN_MULTICAST(i) IN_CLASSD(i)
-
-*/
-
-static boolean IN_MULTICAST(int ipv4address) {
-    return ((ipv4address >> 24) & 0xf0) == 0xe0;
-}
-
-/************************************************************************
- * TwoStacksPlainDatagramSocketImpl
- */
-
-/*
-static jfieldID IO_fd_fdID;
-static jfieldID pdsi_trafficClassID;
-jfieldID pdsi_fdID;
-jfieldID pdsi_fd1ID;
-jfieldID pdsi_fduseID;
-jfieldID pdsi_lastfdID;
-jfieldID pdsi_timeoutID;
-
-jfieldID pdsi_localPortID;
-jfieldID pdsi_connected;
-
-static jclass ia4_clazz;
-static jmethodID ia4_ctor;
-
-static CRITICAL_SECTION sizeCheckLock;
-*/
-
-/* Windows OS version is XP or better */
-static final boolean xp_or_later = true;
-/* Windows OS version is Windows 2000 or better */
-//static int w2k_or_later = 0;
-
-/*
- * Notes about UDP/IPV6 on Windows (XP and 2003 server):
- *
- * fd always points to the IPv4 fd, and fd1 points to the IPv6 fd.
- * Both fds are used when we bind to a wild-card address. When a specific
- * address is used, only one of them is used.
- */
-
-/*
- * Returns a java.lang.Integer based on 'i'
- */
-/*
-jobject createInteger(JNIEnv *env, int i) {
-    static jclass i_class;
-    static jmethodID i_ctrID;
-    static jfieldID i_valueID;
-
-    if (i_class == NULL) {
-        jclass c = (*env)->FindClass(env, "java/lang/Integer");
-        CHECK_NULL_RETURN(c, NULL);
-        i_ctrID = (*env)->GetMethodID(env, c, "<init>", "(I)V");
-        CHECK_NULL_RETURN(i_ctrID, NULL);
-        i_class = (*env)->NewGlobalRef(env, c);
-        CHECK_NULL_RETURN(i_class, NULL);
-    }
-
-    return ( (*env)->NewObject(env, i_class, i_ctrID, i) );
-}
-*/
-
-/*
- * Returns a java.lang.Boolean based on 'b'
- */
-/*
-jobject createBoolean(JNIEnv *env, int b) {
-    static jclass b_class;
-    static jmethodID b_ctrID;
-    static jfieldID b_valueID;
-
-    if (b_class == NULL) {
-        jclass c = (*env)->FindClass(env, "java/lang/Boolean");
-        CHECK_NULL_RETURN(c, NULL);
-        b_ctrID = (*env)->GetMethodID(env, c, "<init>", "(Z)V");
-        CHECK_NULL_RETURN(b_ctrID, NULL);
-        b_class = (*env)->NewGlobalRef(env, c);
-        CHECK_NULL_RETURN(b_class, NULL);
-    }
-
-    return( (*env)->NewObject(env, b_class, b_ctrID, (jboolean)(b!=0)) );
-}
-*/
-
-
-static cli.System.Net.Sockets.Socket getFD(JNIEnv env, TwoStacksPlainDatagramSocketImpl _this) {
-    FileDescriptor fdObj = _this.fd;
-
-    if (fdObj == NULL) {
-        return null;
-    }
-    return fdObj.getSocket();
-}
-
-static cli.System.Net.Sockets.Socket getFD1(JNIEnv env, TwoStacksPlainDatagramSocketImpl _this) {
-    FileDescriptor fdObj = _this.fd1;
-
-    if (fdObj == NULL) {
-        return null;
-    }
-    return fdObj.getSocket();
-}
-
-/*
- * This function returns JNI_TRUE if the datagram size exceeds the underlying
- * provider's ability to send to the target address. The following OS
- * oddities have been observed :-
- *
- * 1. On Windows 95/98 if we try to send a datagram > 12k to an application
- *    on the same machine then the send will fail silently.
- *
- * 2. On Windows ME if we try to send a datagram > supported by underlying
- *    provider then send will not return an error.
- *
- * 3. On Windows NT/2000 if we exceeds the maximum size then send will fail
- *    with WSAEADDRNOTAVAIL.
- *
- * 4. On Windows 95/98 if we exceed the maximum size when sending to
- *    another machine then WSAEINVAL is returned.
- *
- */
-/*
-jboolean exceedSizeLimit(JNIEnv *env, jint fd, jint addr, jint size)
-{
-#define DEFAULT_MSG_SIZE        65527
-    static jboolean initDone;
-    static jboolean is95or98;
-    static int maxmsg;
-
-    typedef struct _netaddr  {          /* Windows 95/98 only *-/
-        unsigned long addr;
-        struct _netaddr *next;
-    } netaddr;
-    static netaddr *addrList;
-    netaddr *curr;
-
-    /*
-     * First time we are called we must determine which OS this is and also
-     * get the maximum size supported by the underlying provider.
-     *
-     * In addition on 95/98 we must enumerate our IP addresses.
-     *-/
-    if (!initDone) {
-        EnterCriticalSection(&sizeCheckLock);
-
-        if (initDone) {
-            /* another thread got there first *-/
-            LeaveCriticalSection(&sizeCheckLock);
-
-        } else {
-            OSVERSIONINFO ver;
-            int len;
-
-            /*
-             * Step 1: Determine which OS this is.
-             *-/
-            ver.dwOSVersionInfoSize = sizeof(ver);
-            GetVersionEx(&ver);
-
-            is95or98 = JNI_FALSE;
-            if (ver.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS &&
-                ver.dwMajorVersion == 4 &&
-                (ver.dwMinorVersion == 0 || ver.dwMinorVersion == 10)) {
-
-                is95or98 = JNI_TRUE;
-            }
-
-            /*
-             * Step 2: Determine the maximum datagram supported by the
-             * underlying provider. On Windows 95 if winsock hasn't been
-             * upgraded (ie: unsupported configuration) then we assume
-             * the default 64k limit.
-             *-/
-            len = sizeof(maxmsg);
-            if (NET_GetSockOpt(fd, SOL_SOCKET, SO_MAX_MSG_SIZE, (char *)&maxmsg, &len) < 0) {
-                maxmsg = DEFAULT_MSG_SIZE;
-            }
-
-            /*
-             * Step 3: On Windows 95/98 then enumerate the IP addresses on
-             * this machine. This is neccesary because we need to check if the
-             * datagram is being sent to an application on the same machine.
-             *-/
-            if (is95or98) {
-                char hostname[255];
-                struct hostent *hp;
-
-                if (gethostname(hostname, sizeof(hostname)) == -1) {
-                    LeaveCriticalSection(&sizeCheckLock);
-                    JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Unable to obtain hostname");
-                    return JNI_TRUE;
-                }
-                hp = (struct hostent *)gethostbyname(hostname);
-                if (hp != NULL) {
-                    struct in_addr **addrp = (struct in_addr **) hp->h_addr_list;
-
-                    while (*addrp != (struct in_addr *) 0) {
-                        curr = (netaddr *)malloc(sizeof(netaddr));
-                        if (curr == NULL) {
-                            while (addrList != NULL) {
-                                curr = addrList->next;
-                                free(addrList);
-                                addrList = curr;
-                            }
-                            LeaveCriticalSection(&sizeCheckLock);
-                            JNU_ThrowOutOfMemoryError(env, "Native heap allocation failed");
-                            return JNI_TRUE;
-                        }
-                        curr->addr = htonl((*addrp)->S_un.S_addr);
-                        curr->next = addrList;
-                        addrList = curr;
-                        addrp++;
-                    }
-                }
-            }
-
-            /*
-             * Step 4: initialization is done so set flag and unlock cs
-             *-/
-            initDone = JNI_TRUE;
-            LeaveCriticalSection(&sizeCheckLock);
-        }
-    }
-
-    /*
-     * Now examine the size of the datagram :-
-     *
-     * (a) If exceeds size of service provider return 'false' to indicate that
-     *     we exceed the limit.
-     * (b) If not 95/98 then return 'true' to indicate that the size is okay.
-     * (c) On 95/98 if the size is <12k we are okay.
-     * (d) On 95/98 if size > 12k then check if the destination is the current
-     *     machine.
-     *-/
-    if (size > maxmsg) {        /* step (a) *-/
-        return JNI_TRUE;
-    }
-    if (!is95or98) {            /* step (b) *-/
-        return JNI_FALSE;
-    }
-    if (size <= 12280) {        /* step (c) *-/
-        return JNI_FALSE;
-    }
-
-    /* step (d) *-/
-
-    if ((addr & 0x7f000000) == 0x7f000000) {
-        return JNI_TRUE;
-    }
-    curr = addrList;
-    while (curr != NULL) {
-        if (curr->addr == addr) {
-            return JNI_TRUE;
-        }
-        curr = curr->next;
-    }
-    return JNI_FALSE;
-}
-*/
-
-/*
- * Return JNI_TRUE if this Windows edition supports ICMP Port Unreachable
- */
-static boolean supportPortUnreachable() {
-    // we don't support anything pre-Win2K anyway
-    return true;
-}
-
-/*
- * This function "purges" all outstanding ICMP port unreachable packets
- * outstanding on a socket and returns JNI_TRUE if any ICMP messages
- * have been purged. The rational for purging is to emulate normal BSD
- * behaviour whereby receiving a "connection reset" status resets the
- * socket.
- */
-static boolean purgeOutstandingICMP(cli.System.Net.Sockets.Socket fd)
-{
-    boolean got_icmp = false;
-    byte[] buf = new byte[1];
-    fd_set tbl = new fd_set();
-    timeval t = new timeval();
-    SOCKETADDRESS rmtaddr = null;
-
-    /*
-     * A no-op if this OS doesn't support it.
-     */
-    if (!supportPortUnreachable()) {
-        return JNI_FALSE;
-    }
-
-    /*
-     * Peek at the queue to see if there is an ICMP port unreachable. If there
-     * is then receive it.
-     */
-    FD_ZERO(tbl);
-    FD_SET(fd, tbl);
-    while(true) {
-        if (select(tbl, null, null, t) <= 0) {
-            break;
-        }
-        if (recvfrom(fd, buf, 1, MSG_PEEK,
-                         rmtaddr) != JVM_IO_ERR) {
-            break;
-        }
-        if (WSAGetLastError() != WSAECONNRESET) {
-            /* some other error - we don't care here */
-            break;
-        }
-
-        recvfrom(fd, buf, 1, 0, rmtaddr);
-        got_icmp = JNI_TRUE;
-    }
-
-    return got_icmp;
-}
-
-
-/*
- * Class:     java_net_TwoStacksPlainDatagramSocketImpl
- * Method:    init
- * Signature: ()V
- */
-/*
-JNIEXPORT void JNICALL
-Java_java_net_TwoStacksPlainDatagramSocketImpl_init(JNIEnv *env, jclass cls) {
-
-    OSVERSIONINFO ver;
-    int version;
-    ver.dwOSVersionInfoSize = sizeof(ver);
-    GetVersionEx(&ver);
-
-    version = ver.dwMajorVersion * 10 + ver.dwMinorVersion;
-    xp_or_later = (ver.dwPlatformId == VER_PLATFORM_WIN32_NT) && (version >= 51);
-    w2k_or_later = (ver.dwPlatformId == VER_PLATFORM_WIN32_NT) && (version >= 50);
-
-    /* get fieldIDs *-/
-    pdsi_fdID = (*env)->GetFieldID(env, cls, "fd", "Ljava/io/FileDescriptor;");
-    CHECK_NULL(pdsi_fdID);
-    pdsi_fd1ID = (*env)->GetFieldID(env, cls, "fd1", "Ljava/io/FileDescriptor;");
-    CHECK_NULL(pdsi_fd1ID);
-    pdsi_timeoutID = (*env)->GetFieldID(env, cls, "timeout", "I");
-    CHECK_NULL(pdsi_timeoutID);
-    pdsi_fduseID = (*env)->GetFieldID(env, cls, "fduse", "I");
-    CHECK_NULL(pdsi_fduseID);
-    pdsi_lastfdID = (*env)->GetFieldID(env, cls, "lastfd", "I");
-    CHECK_NULL(pdsi_lastfdID);
-    pdsi_trafficClassID = (*env)->GetFieldID(env, cls, "trafficClass", "I");
-    CHECK_NULL(pdsi_trafficClassID);
-    pdsi_localPortID = (*env)->GetFieldID(env, cls, "localPort", "I");
-    CHECK_NULL(pdsi_localPortID);
-    pdsi_connected = (*env)->GetFieldID(env, cls, "connected", "Z");
-    CHECK_NULL(pdsi_connected);
-
-    cls = (*env)->FindClass(env, "java/io/FileDescriptor");
-    CHECK_NULL(cls);
-    IO_fd_fdID = NET_GetFileDescriptorID(env);
-    CHECK_NULL(IO_fd_fdID);
-
-    ia4_clazz = (*env)->FindClass(env, "java/net/Inet4Address");
-    CHECK_NULL(ia4_clazz);
-    ia4_clazz = (*env)->NewGlobalRef(env, ia4_clazz);
-    CHECK_NULL(ia4_clazz);
-    ia4_ctor = (*env)->GetMethodID(env, ia4_clazz, "<init>", "()V");
-    CHECK_NULL(ia4_ctor);
-
-
-    InitializeCriticalSection(&sizeCheckLock);
-}
-*/
-
-static void bind0(JNIEnv env, TwoStacksPlainDatagramSocketImpl _this,
-                                           int port, InetAddress addressObj,
-                                           boolean exclBind) {
-    FileDescriptor fdObj = _this.fd;
-    FileDescriptor fd1Obj = _this.fd1;
-
-    cli.System.Net.Sockets.Socket fd = null;
-    cli.System.Net.Sockets.Socket fd1 = null;
-    int family;
-    boolean ipv6_supported = ipv6_available();
-
-    SOCKETADDRESS lcladdr;
-    lcladdr = new SOCKETADDRESS();
-
-    family = getInetAddress_family(env, addressObj);
-    if (family == IPv6 && !ipv6_supported) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                        "Protocol family not supported");
-        return;
-    }
-
-    if (IS_NULL(fdObj) || (ipv6_supported && IS_NULL(fd1Obj))) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException", "socket closed");
-        return;
-    } else {
-        fd = fdObj.getSocket();
-        if (ipv6_supported) {
-            fd1 = fd1Obj.getSocket();
-        }
-    }
-    if (IS_NULL(addressObj)) {
-        JNU_ThrowNullPointerException(env, "argument address");
-        return;
-    }
-
-    if (NET_InetAddressToSockaddr(env, addressObj, port, lcladdr, JNI_FALSE) != 0) {
-      return;
-    }
-
-    if (ipv6_supported) {
-        ipv6bind v6bind = new ipv6bind();
-        v6bind.addr = lcladdr;
-        v6bind.ipv4_fd = fd;
-        v6bind.ipv6_fd = fd1;
-        if (NET_BindV6(v6bind, exclBind) != -1) {
-            /* check if the fds have changed */
-            if (v6bind.ipv4_fd != fd) {
-                fd = v6bind.ipv4_fd;
-                if (fd == null) {
-                    /* socket is closed. */
-                    _this.fd = null;
-                } else {
-                    /* socket was re-created */
-                    fdObj.setSocket(fd);
-                }
-            }
-            if (v6bind.ipv6_fd != fd1) {
-                fd1 = v6bind.ipv6_fd;
-                if (fd1 == null) {
-                    /* socket is closed. */
-                    _this.fd1 = null;
-                } else {
-                    /* socket was re-created */
-                    fd1Obj.setSocket(fd1);
-                }
-            }
-        } else {
-            NET_ThrowCurrent (env, "Cannot bind");
-            return;
-        }
-    } else {
-        if (NET_WinBind(fd, lcladdr, exclBind) == -1) {
-            if (WSAGetLastError() == WSAEACCES) {
-                WSASetLastError(WSAEADDRINUSE);
-            }
-            NET_ThrowCurrent(env, "Cannot bind");
-            return;
-        }
-    }
-
-    if (port == 0) {
-        if (fd == null) {
-            /* must be an IPV6 only socket. */
-            fd = fd1;
-        }
-        if (getsockname(fd, lcladdr) == -1) {
-            NET_ThrowCurrent(env, "JVM_GetSockName");
-            return;
-        }
-        port = ntohs(GET_PORT (lcladdr));
-    }
-    _this.localPort = port;
-}
-
-
-/*
- * Class:     java_net_TwoStacksPlainDatagramSocketImpl
- * Method:    connect0
- * Signature: (Ljava/net/InetAddress;I)V
- */
-
-static void connect0(JNIEnv env, TwoStacksPlainDatagramSocketImpl _this, InetAddress address, int port) {
-    /* The object's field */
-    FileDescriptor fdObj = _this.fd;
-    FileDescriptor fd1Obj = _this.fd1;
-    /* The fdObj'fd */
-    cli.System.Net.Sockets.Socket fd = null;
-    cli.System.Net.Sockets.Socket fd1 = null;
-    cli.System.Net.Sockets.Socket fdc;
-    /* The packetAddress address, family and port */
-    int addr, family;
-    SOCKETADDRESS rmtaddr;
-    rmtaddr = new SOCKETADDRESS();
-    boolean ipv6_supported = ipv6_available();
-
-    if (IS_NULL(fdObj) && IS_NULL(fd1Obj)) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                        "Socket closed");
-        return;
-    }
-    if (!IS_NULL(fdObj)) {
-        fd = fdObj.getSocket();
-    }
-    if (!IS_NULL(fd1Obj)) {
-        fd1 = fd1Obj.getSocket();
-    }
-
-    if (IS_NULL(address)) {
-        JNU_ThrowNullPointerException(env, "address");
-        return;
-    }
-
-    addr = getInetAddress_addr(env, address);
-
-    family = getInetAddress_family(env, address);
-    if (family == IPv6 && !ipv6_supported) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                        "Protocol family not supported");
-        return;
-    }
-
-    fdc = family == IPv4? fd: fd1;
-
-    if (xp_or_later) {
-        /* SIO_UDP_CONNRESET fixes a bug introduced in Windows 2000, which
-         * returns connection reset errors on connected UDP sockets (as well
-         * as connected sockets). The solution is to only enable this feature
-         * when the socket is connected
-         */
-        WSAIoctl(fdc, SIO_UDP_CONNRESET, true);
-    }
-
-    if (NET_InetAddressToSockaddr(env, address, port, rmtaddr, JNI_FALSE) != 0) {
-      return;
-    }
-
-    if (connect(fdc, rmtaddr) == -1) {
-        NET_ThrowCurrent(env, "connect");
-        return;
-    }
-}
-
-/*
- * Class:     java_net_TwoStacksPlainDatagramSocketImpl
- * Method:    disconnect0
- * Signature: ()V
- */
-
-static void disconnect0(TwoStacksPlainDatagramSocketImpl _this, int family) {
-    /* The object's field */
-    FileDescriptor fdObj;
-    /* The fdObj'fd */
-    cli.System.Net.Sockets.Socket fd;
-    SOCKETADDRESS addr;
-    addr = new SOCKETADDRESS();
-
-    if (family == IPv4) {
-        fdObj = _this.fd;
-    } else {
-        fdObj = _this.fd1;
-    }
-
-    if (IS_NULL(fdObj)) {
-        /* disconnect doesn't throw any exceptions */
-        return;
-    }
-    fd = fdObj.getSocket();
-
-    connect(fd, addr);
-
-    /*
-     * use SIO_UDP_CONNRESET
-     * to disable ICMP port unreachable handling here.
-     */
-    if (xp_or_later) {
-        WSAIoctl(fd,SIO_UDP_CONNRESET,false);
-    }
-}
-
-/*
- * Class:     java_net_TwoStacksPlainDatagramSocketImpl
- * Method:    send
- * Signature: (Ljava/net/DatagramPacket;)V
- */
-static void send(JNIEnv env, TwoStacksPlainDatagramSocketImpl _this, DatagramPacket packet) {
-    FileDescriptor fdObj;
-    cli.System.Net.Sockets.Socket fd;
-
-    InetAddress iaObj;
-    int address;
-    int family;
-
-    int packetBufferOffset, packetBufferLen, packetPort;
-    byte[] packetBuffer;
-    boolean connected;
-
-    SOCKETADDRESS rmtaddr;
-    rmtaddr = new SOCKETADDRESS();
-
-    if (IS_NULL(packet)) {
-        JNU_ThrowNullPointerException(env, "null packet");
-        return;
-    }
-
-    iaObj = packet.address;
-
-    packetPort = packet.port;
-    packetBufferOffset = packet.offset;
-    packetBuffer = packet.buf;
-    connected = _this.connected;
-
-    if (IS_NULL(iaObj) || IS_NULL(packetBuffer)) {
-        JNU_ThrowNullPointerException(env, "null address || null buffer");
-        return;
-    }
-
-    family = getInetAddress_family(env, iaObj);
-    if (family == IPv4) {
-        fdObj = _this.fd;
-    } else {
-        if (!ipv6_available()) {
-            JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                        "Protocol not allowed");
-            return;
-        }
-        fdObj = _this.fd1;
-    }
-
-    if (IS_NULL(fdObj)) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                        "Socket closed");
-        return;
-    }
-    fd = fdObj.getSocket();
-
-    packetBufferLen = packet.length;
-    /* Note: the buffer needn't be greater than 65,536 (0xFFFF)...
-     * the maximum size of an IP packet. Anything bigger is truncated anyway.
-     */
-    if (packetBufferLen > MAX_PACKET_LEN) {
-        packetBufferLen = MAX_PACKET_LEN;
-    }
-
-    if (connected) {
-        rmtaddr = null;
-    } else {
-      if (NET_InetAddressToSockaddr(env, iaObj, packetPort, rmtaddr, JNI_FALSE) != 0) {
-        return;
-      }
-    }
-
-    /*
-    if (packetBufferLen > MAX_BUFFER_LEN) {
-
-        /*
-         * On 95/98 if we try to send a datagram >12k to an application
-         * on the same machine then this will fail silently. Thus we
-         * catch this situation here so that we can throw an exception
-         * when this arises.
-         * On ME if we try to send a datagram with a size greater than
-         * that supported by the service provider then no error is
-         * returned.
-         *-/
-        if (!w2k_or_later) { /* avoid this check on Win 2K or better. Does not work with IPv6.
-                      * Check is not necessary on these OSes *-/
-            if (connected) {
-                address = getInetAddress_addr(env, iaObj);
-            } else {
-                address = ntohl(rmtaddr.him4.sin_addr.s_addr);
-            }
-
-            if (exceedSizeLimit(env, fd, address, packetBufferLen)) {
-                if (!((*env)->ExceptionOccurred(env))) {
-                    NET_ThrowNew(env, WSAEMSGSIZE, "Datagram send failed");
-                }
-                return;
-            }
-        }
-
-        /* When JNI-ifying the JDK's IO routines, we turned
-         * reads and writes of byte arrays of size greater
-         * than 2048 bytes into several operations of size 2048.
-         * This saves a malloc()/memcpy()/free() for big
-         * buffers.  This is OK for file IO and TCP, but that
-         * strategy violates the semantics of a datagram protocol.
-         * (one big send) != (several smaller sends).  So here
-         * we *must* alloc the buffer.  Note it needn't be bigger
-         * than 65,536 (0xFFFF) the max size of an IP packet.
-         * anything bigger is truncated anyway.
-         *-/
-        fullPacket = (char *)malloc(packetBufferLen);
-        if (!fullPacket) {
-            JNU_ThrowOutOfMemoryError(env, "Send buf native heap allocation failed");
-            return;
-        }
-    } else {
-        fullPacket = &(BUF[0]);
-    }
-    */
-
-    switch (sendto(fd, packetBuffer, packetBufferOffset, packetBufferLen, 0, rmtaddr)) {
-        case JVM_IO_ERR:
-            NET_ThrowCurrent(env, "Datagram send failed");
-            break;
-
-        case JVM_IO_INTR:
-            JNU_ThrowByName(env, JNU_JAVAIOPKG+"InterruptedIOException",
-                            "operation interrupted");
-    }
-}
-
-/*
- * check which socket was last serviced when there was data on both sockets.
- * Only call this if sure that there is data on both sockets.
- */
-private static cli.System.Net.Sockets.Socket checkLastFD (TwoStacksPlainDatagramSocketImpl _this, cli.System.Net.Sockets.Socket fd, cli.System.Net.Sockets.Socket fd1) {
-    cli.System.Net.Sockets.Socket nextfd, lastfd = _this.lastfd;
-    if (lastfd == null) {
-        /* arbitrary. Choose fd */
-        _this.lastfd = fd;
-        return fd;
-    } else {
-        if (lastfd == fd) {
-            nextfd = fd1;
-        } else {
-            nextfd = fd;
-        }
-        _this.lastfd = nextfd;
-        return nextfd;
-    }
-}
-
-/*
- * Class:     java_net_TwoStacksPlainDatagramSocketImpl
- * Method:    peek
- * Signature: (Ljava/net/InetAddress;)I
- */
-static int peek(JNIEnv env, TwoStacksPlainDatagramSocketImpl _this, InetAddress addressObj) {
-    FileDescriptor fdObj = _this.fd;
-    int timeout = _this.timeout;
-    cli.System.Net.Sockets.Socket fd;
-
-    /* The address and family fields of addressObj */
-    int address, family;
-
-    int n;
-    SOCKETADDRESS remote_addr = new SOCKETADDRESS();
-    byte[] buf = new byte[1];
-    boolean retry;
-    long prevTime = 0;
-
-    if (IS_NULL(fdObj)) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException", "Socket closed");
-        return -1;
-    } else {
-        fd = fdObj.getSocket();
-        if (fd == null) {
-           JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                           "socket closed");
-           return -1;
-        }
-    }
-    if (IS_NULL(addressObj)) {
-        JNU_ThrowNullPointerException(env, "Null address in peek()");
-        return -1;
-    } else {
-        address = getInetAddress_addr(env, addressObj);
-        /* We only handle IPv4 for now. Will support IPv6 once its in the os */
-        family = AF_INET;
-    }
-
-    do {
-        retry = FALSE;
-
-        /*
-         * If a timeout has been specified then we select on the socket
-         * waiting for a read event or a timeout.
-         */
-        if (timeout != 0) {
-            int ret;
-            prevTime = JVM_CurrentTimeMillis(env, 0);
-            ret = NET_Timeout (fd, timeout);
-            if (ret == 0) {
-                JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketTimeoutException",
-                                "Peek timed out");
-                return ret;
-            } else if (ret == JVM_IO_ERR) {
-                NET_ThrowCurrent(env, "timeout in datagram socket peek");
-                return ret;
-            } else if (ret == JVM_IO_INTR) {
-                JNU_ThrowByName(env, JNU_JAVAIOPKG+"InterruptedIOException",
-                                "operation interrupted");
-                return ret;
-            }
-        }
-
-        /* now try the peek */
-        n = recvfrom(fd, buf, 1, MSG_PEEK,
-                         remote_addr);
-
-        if (n == JVM_IO_ERR) {
-            if (WSAGetLastError() == WSAECONNRESET) {
-                boolean connected;
-
-                /*
-                 * An icmp port unreachable - we must receive this as Windows
-                 * does not reset the state of the socket until this has been
-                 * received.
-                 */
-                purgeOutstandingICMP(fd);
-
-                connected =  _this.connected;
-                if (connected) {
-                    JNU_ThrowByName(env, JNU_JAVANETPKG+"PortUnreachableException",
-                                       "ICMP Port Unreachable");
-                    return 0;
-                }
-
-                /*
-                 * If a timeout was specified then we need to adjust it because
-                 * we may have used up some of the timeout befor the icmp port
-                 * unreachable arrived.
-                 */
-                if (timeout != 0) {
-                    long newTime = JVM_CurrentTimeMillis(env, 0);
-                    timeout -= (newTime - prevTime);
-                    if (timeout <= 0) {
-                        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketTimeoutException",
-                                "Receive timed out");
-                        return 0;
-                    }
-                    prevTime = newTime;
-                }
-
-                /* Need to retry the recv */
-                retry = TRUE;
-            }
-        }
-    } while (retry);
-
-    if (n == JVM_IO_ERR && WSAGetLastError() != WSAEMSGSIZE) {
-        NET_ThrowCurrent(env, "Datagram peek failed");
-        return 0;
-    }
-    if (n == JVM_IO_INTR) {
-        JNU_ThrowByName(env, JNU_JAVAIOPKG+"InterruptedIOException", null);
-        return 0;
-    }
-    addressObj.holder().address = ntohl(remote_addr.sin_addr.s_addr);
-    addressObj.holder().family = IPv4;
-
-    /* return port */
-    return ntohs(remote_addr.sin_port);
-}
-
-static int peekData(JNIEnv env, TwoStacksPlainDatagramSocketImpl _this, DatagramPacket packet) {
-
-    FileDescriptor fdObj = _this.fd;
-    FileDescriptor fd1Obj = _this.fd1;
-    int timeout = _this.timeout;
-
-    byte[] packetBuffer;
-    int packetBufferOffset, packetBufferLen;
-
-    cli.System.Net.Sockets.Socket fd = null, fd1 = null, fduse = null;
-    int nsockets=0, errorCode;
-    int port;
-    byte[] data;
-
-    boolean checkBoth = false;
-    int datalen;
-    int n;
-    SOCKETADDRESS remote_addr;
-    remote_addr = new SOCKETADDRESS();
-    boolean retry;
-    long prevTime = 0;
-
-    if (!IS_NULL(fdObj)) {
-        fd = fdObj.getSocket();
-        if (fd == null) {
-           JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                           "socket closed");
-           return -1;
-        }
-        nsockets = 1;
-    }
-
-    if (!IS_NULL(fd1Obj)) {
-        fd1 = fd1Obj.getSocket();
-        if (fd1 == null) {
-           JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                           "socket closed");
-           return -1;
-        }
-        nsockets ++;
-    }
-
-    switch (nsockets) {
-      case 0:
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                       "socket closed");
-        return -1;
-      case 1:
-        if (!IS_NULL(fdObj)) {
-           fduse = fd;
-        } else {
-           fduse = fd1;
-        }
-        break;
-      case 2:
-        checkBoth = TRUE;
-        break;
-    }
-
-    if (IS_NULL(packet)) {
-        JNU_ThrowNullPointerException(env, "packet");
-        return -1;
-    }
-
-    packetBuffer = packet.buf;
-
-    if (IS_NULL(packetBuffer)) {
-        JNU_ThrowNullPointerException(env, "packet buffer");
-        return -1;
-    }
-
-    packetBufferOffset = packet.offset;
-    packetBufferLen = packet.bufLength;
-
-    /*
-    if (packetBufferLen > MAX_BUFFER_LEN) {
-
-        /* When JNI-ifying the JDK's IO routines, we turned
-         * read's and write's of byte arrays of size greater
-         * than 2048 bytes into several operations of size 2048.
-         * This saves a malloc()/memcpy()/free() for big
-         * buffers.  This is OK for file IO and TCP, but that
-         * strategy violates the semantics of a datagram protocol.
-         * (one big send) != (several smaller sends).  So here
-         * we *must* alloc the buffer.  Note it needn't be bigger
-         * than 65,536 (0xFFFF) the max size of an IP packet.
-         * anything bigger is truncated anyway.
-         *-/
-        fullPacket = (char *)malloc(packetBufferLen);
-        if (!fullPacket) {
-            JNU_ThrowOutOfMemoryError(env, "Native heap allocation failed");
-            return -1;
-        }
-    } else {
-        fullPacket = &(BUF[0]);
-    }
-    */
-
-    do {
-        int ret;
-        retry = FALSE;
-
-        /*
-         * If a timeout has been specified then we select on the socket
-         * waiting for a read event or a timeout.
-         */
-        if (checkBoth) {
-            int t = timeout == 0 ? -1: timeout;
-            prevTime = JVM_CurrentTimeMillis(env, 0);
-            cli.System.Net.Sockets.Socket[] tmp = new cli.System.Net.Sockets.Socket[] { fduse };
-            ret = NET_Timeout2 (fd, fd1, t, tmp);
-            fduse = tmp[0];
-            /* all subsequent calls to recv() or select() will use the same fd
-             * for this call to peek() */
-            if (ret <= 0) {
-                if (ret == 0) {
-                    JNU_ThrowByName(env,JNU_JAVANETPKG+"SocketTimeoutException",
-                                        "Peek timed out");
-                } else if (ret == JVM_IO_ERR) {
-                    NET_ThrowCurrent(env, "timeout in datagram socket peek");
-                } else if (ret == JVM_IO_INTR) {
-                    JNU_ThrowByName(env, JNU_JAVAIOPKG+"InterruptedIOException",
-                                    "operation interrupted");
-                }
-                return -1;
-            }
-            if (ret == 2) {
-                fduse = checkLastFD (_this, fd, fd1);
-            }
-            checkBoth = FALSE;
-        } else if (timeout != 0) {
-            if (prevTime == 0) {
-                prevTime = JVM_CurrentTimeMillis(env, 0);
-            }
-            ret = NET_Timeout (fduse, timeout);
-            if (ret <= 0) {
-                if (ret == 0) {
-                    JNU_ThrowByName(env,JNU_JAVANETPKG+"SocketTimeoutException",
-                                    "Receive timed out");
-                } else if (ret == JVM_IO_ERR) {
-                    JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                                    "Socket closed");
-                } else if (ret == JVM_IO_INTR) {
-                    JNU_ThrowByName(env, JNU_JAVAIOPKG+"InterruptedIOException",
-                                    "operation interrupted");
-                }
-                return -1;
-            }
-        }
-
-        /* receive the packet */
-        n = recvfrom(fduse, packetBuffer, packetBufferOffset, packetBufferLen, MSG_PEEK, remote_addr);
-        port = ntohs (GET_PORT(remote_addr));
-        if (n == JVM_IO_ERR) {
-            if (WSAGetLastError() == WSAECONNRESET) {
-                boolean connected;
-
-                /*
-                 * An icmp port unreachable - we must receive this as Windows
-                 * does not reset the state of the socket until this has been
-                 * received.
-                 */
-                purgeOutstandingICMP(fduse);
-
-                connected = _this.connected;
-                if (connected) {
-                    JNU_ThrowByName(env, JNU_JAVANETPKG+"PortUnreachableException",
-                                       "ICMP Port Unreachable");
-
-                    return -1;
-                }
-
-                /*
-                 * If a timeout was specified then we need to adjust it because
-                 * we may have used up some of the timeout befor the icmp port
-                 * unreachable arrived.
-                 */
-                if (timeout != 0) {
-                    long newTime = JVM_CurrentTimeMillis(env, 0);
-                    timeout -= (newTime - prevTime);
-                    if (timeout <= 0) {
-                        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketTimeoutException",
-                                "Receive timed out");
-                        return -1;
-                    }
-                    prevTime = newTime;
-                }
-                retry = TRUE;
-            }
-        }
-    } while (retry);
-
-    if (n < 0) {
-        errorCode = WSAGetLastError();
-        /* check to see if it's because the buffer was too small */
-        if (errorCode == WSAEMSGSIZE) {
-            /* it is because the buffer is too small. It's UDP, it's
-             * unreliable, it's all good. discard the rest of the
-             * data..
-             */
-            n = packetBufferLen;
-        } else {
-            /* failure */
-            packet.length = 0;
-        }
-    }
-    if (n == -1) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException", "socket closed");
-    } else if (n == -2) {
-        JNU_ThrowByName(env, JNU_JAVAIOPKG+"InterruptedIOException",
-                        "operation interrupted");
-    } else if (n < 0) {
-        NET_ThrowCurrent(env, "Datagram receive failed");
-    } else {
-        InetAddress packetAddress;
-
-        /*
-         * Check if there is an InetAddress already associated with this
-         * packet. If so we check if it is the same source address. We
-         * can't update any existing InetAddress because it is immutable
-         */
-        packetAddress = packet.address;
-        if (packetAddress != NULL) {
-            if (!NET_SockaddrEqualsInetAddress(remote_addr, packetAddress)) {
-                /* force a new InetAddress to be created */
-                packetAddress = null;
-            }
-        }
-        if (packetAddress == NULL) {
-            int[] tmp = { port };
-            packetAddress = NET_SockaddrToInetAddress(remote_addr, tmp);
-            port = tmp[0];
-            /* stuff the new Inetaddress in the packet */
-            packet.address = packetAddress;
-        }
-
-        /* populate the packet */
-        packet.port = port;
-        packet.length = n;
-    }
-
-    /* make sure receive() picks up the right fd */
-    _this.fduse = fduse;
-
-    return port;
-}
-
-/*
- * Class:     java_net_TwoStacksPlainDatagramSocketImpl
- * Method:    receive
- * Signature: (Ljava/net/DatagramPacket;)V
- */
-static void receive0(JNIEnv env, TwoStacksPlainDatagramSocketImpl _this, DatagramPacket packet) {
-    FileDescriptor fdObj = _this.fd;
-    FileDescriptor fd1Obj = _this.fd1;
-    int timeout = _this.timeout;
-    byte[] packetBuffer;
-    int packetBufferOffset, packetBufferLen;
-    boolean ipv6_supported = ipv6_available();
-
-    /* as a result of the changes for ipv6, peek() or peekData()
-     * must be called prior to receive() so that fduse can be set.
-     */
-    cli.System.Net.Sockets.Socket fd = null;
-    cli.System.Net.Sockets.Socket fd1 = null;
-    cli.System.Net.Sockets.Socket fduse = null;
-    int errorCode;
-
-    int n, nsockets=0;
-    SOCKETADDRESS remote_addr;
-    remote_addr = new SOCKETADDRESS();
-    boolean retry;
-    long prevTime = 0, selectTime=0;
-    boolean connected;
-
-    if (IS_NULL(fdObj) && IS_NULL(fd1Obj)) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                        "Socket closed");
-        return;
-    }
-
-    if (!IS_NULL(fdObj)) {
-        fd = fdObj.getSocket();
-        nsockets ++;
-    }
-    if (!IS_NULL(fd1Obj)) {
-        fd1 = fd1Obj.getSocket();
-        nsockets ++;
-    }
-
-    if (nsockets == 2) { /* need to choose one of them */
-        /* was fduse set in peek? */
-        fduse = _this.fduse;
-        if (fduse == null) {
-            /* not set in peek(), must select on both sockets */
-            int ret, t = (timeout == 0) ? -1: timeout;
-            cli.System.Net.Sockets.Socket[] tmp = new cli.System.Net.Sockets.Socket[] { fduse };
-            ret = NET_Timeout2 (fd, fd1, t, tmp);
-            fduse = tmp[0];
-            if (ret == 2) {
-                fduse = checkLastFD (_this, fd, fd1);
-            } else if (ret <= 0) {
-                if (ret == 0) {
-                    JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketTimeoutException",
-                                    "Receive timed out");
-                } else if (ret == JVM_IO_ERR) {
-                    JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                                    "Socket closed");
-                } else if (ret == JVM_IO_INTR) {
-                    JNU_ThrowByName(env, JNU_JAVAIOPKG+"InterruptedIOException",
-                                    "operation interrupted");
-                }
-                return;
-            }
-        }
-    } else if (!ipv6_supported) {
-        fduse = fd;
-    } else if (IS_NULL(fdObj)) {
-        /* ipv6 supported: and this socket bound to an IPV6 only address */
-        fduse = fd1;
-    } else {
-        /* ipv6 supported: and this socket bound to an IPV4 only address */
-        fduse = fd;
-    }
-
-    if (IS_NULL(packet)) {
-        JNU_ThrowNullPointerException(env, "packet");
-        return;
-    }
-
-    packetBuffer = packet.buf;
-
-    if (IS_NULL(packetBuffer)) {
-        JNU_ThrowNullPointerException(env, "packet buffer");
-        return;
-    }
-
-    packetBufferOffset = packet.offset;
-    packetBufferLen = packet.bufLength;
-
-    /*
-    if (packetBufferLen > MAX_BUFFER_LEN) {
-
-        /* When JNI-ifying the JDK's IO routines, we turned
-         * read's and write's of byte arrays of size greater
-         * than 2048 bytes into several operations of size 2048.
-         * This saves a malloc()/memcpy()/free() for big
-         * buffers.  This is OK for file IO and TCP, but that
-         * strategy violates the semantics of a datagram protocol.
-         * (one big send) != (several smaller sends).  So here
-         * we *must* alloc the buffer.  Note it needn't be bigger
-         * than 65,536 (0xFFFF) the max size of an IP packet.
-         * anything bigger is truncated anyway.
-         *-/
-        fullPacket = (char *)malloc(packetBufferLen);
-        if (!fullPacket) {
-            JNU_ThrowOutOfMemoryError(env, "Receive buf native heap allocation failed");
-            return;
-        }
-    } else {
-        fullPacket = &(BUF[0]);
-    }
-    */
-
-
-
-    /*
-     * If this Windows edition supports ICMP port unreachable and if we
-     * are not connected then we need to know if a timeout has been specified
-     * and if so we need to pick up the current time. These are required in
-     * order to implement the semantics of timeout, viz :-
-     * timeout set to t1 but ICMP port unreachable arrives in t2 where
-     * t2 < t1. In this case we must discard the ICMP packets and then
-     * wait for the next packet up to a maximum of t1 minus t2.
-     */
-    connected = _this.connected;
-    if (supportPortUnreachable() && !connected && timeout != 0 &&!ipv6_supported) {
-        prevTime = JVM_CurrentTimeMillis(env, 0);
-    }
-
-    if (timeout != 0 && nsockets == 1) {
-        int ret;
-        ret = NET_Timeout(fduse, timeout);
-        if (ret <= 0) {
-            if (ret == 0) {
-                JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketTimeoutException",
-                                "Receive timed out");
-            } else if (ret == JVM_IO_ERR) {
-                JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                                "Socket closed");
-            } else if (ret == JVM_IO_INTR) {
-                JNU_ThrowByName(env, JNU_JAVAIOPKG+"InterruptedIOException",
-                                "operation interrupted");
-            }
-            return;
-        }
-    }
-
-    /*
-     * Loop only if we discarding ICMP port unreachable packets
-     */
-    do {
-        retry = FALSE;
-
-        /* receive the packet */
-        n = recvfrom(fduse, packetBuffer, packetBufferOffset, packetBufferLen, 0, remote_addr);
-
-        if (n == JVM_IO_ERR) {
-            if (WSAGetLastError() == WSAECONNRESET) {
-                /*
-                 * An icmp port unreachable has been received - consume any other
-                 * outstanding packets.
-                 */
-                purgeOutstandingICMP(fduse);
-
-                /*
-                 * If connected throw a PortUnreachableException
-                 */
-
-                if (connected) {
-                    JNU_ThrowByName(env, JNU_JAVANETPKG+"PortUnreachableException",
-                                       "ICMP Port Unreachable");
-                    return;
-                }
-
-                /*
-                 * If a timeout was specified then we need to adjust it because
-                 * we may have used up some of the timeout before the icmp port
-                 * unreachable arrived.
-                 */
-                if (timeout != 0) {
-                    int ret;
-                    long newTime = JVM_CurrentTimeMillis(env, 0);
-                    timeout -= (newTime - prevTime);
-                    prevTime = newTime;
-
-                    if (timeout <= 0) {
-                        ret = 0;
-                    } else {
-                        ret = NET_Timeout(fduse, timeout);
-                    }
-
-                    if (ret <= 0) {
-                        if (ret == 0) {
-                            JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketTimeoutException",
-                                            "Receive timed out");
-                        } else if (ret == JVM_IO_ERR) {
-                            JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                                            "Socket closed");
-                        } else if (ret == JVM_IO_INTR) {
-                            JNU_ThrowByName(env, JNU_JAVAIOPKG+"InterruptedIOException",
-                                            "operation interrupted");
-                        }
-                        return;
-                    }
-                }
-
-                /*
-                 * An ICMP port unreachable was received but we are
-                 * not connected so ignore it.
-                 */
-                retry = TRUE;
-            }
-        }
-    } while (retry);
-
-    if (n < 0) {
-        errorCode = WSAGetLastError();
-        /* check to see if it's because the buffer was too small */
-        if (errorCode == WSAEMSGSIZE) {
-            /* it is because the buffer is too small. It's UDP, it's
-             * unreliable, it's all good. discard the rest of the
-             * data..
-             */
-            n = packetBufferLen;
-        } else {
-            /* failure */
-            packet.length = 0;
-        }
-    }
-    if (n == -1) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException", "socket closed");
-    } else if (n == -2) {
-        JNU_ThrowByName(env, JNU_JAVAIOPKG+"InterruptedIOException",
-                        "operation interrupted");
-    } else if (n < 0) {
-        NET_ThrowCurrent(env, "Datagram receive failed");
-    } else {
-        int port;
-        InetAddress packetAddress;
-
-        /*
-         * Check if there is an InetAddress already associated with this
-         * packet. If so we check if it is the same source address. We
-         * can't update any existing InetAddress because it is immutable
-         */
-        packetAddress = packet.address;
-
-        if (packetAddress != NULL) {
-            if (!NET_SockaddrEqualsInetAddress(remote_addr, packetAddress)) {
-                /* force a new InetAddress to be created */
-                packetAddress = null;
-            }
-        }
-        if (packetAddress == NULL) {
-            int[] tmp = { 0 };
-            packetAddress = NET_SockaddrToInetAddress(remote_addr, tmp);
-            port = tmp[0];
-            /* stuff the new Inetaddress in the packet */
-            packet.address = packetAddress;
-        } else {
-            /* only get the new port number */
-            port = NET_GetPortFromSockaddr(remote_addr);
-        }
-        /* populate the packet */
-        packet.port = port;
-        packet.length = n;
-    }
-}
-
-/*
- * Class:     java_net_TwoStacksPlainDatagramSocketImpl
- * Method:    datagramSocketCreate
- * Signature: ()V
- */
-static void datagramSocketCreate(JNIEnv env, TwoStacksPlainDatagramSocketImpl _this) {
-    FileDescriptor fdObj = _this.fd;
-    FileDescriptor fd1Obj = _this.fd1;
-    cli.System.Net.Sockets.Socket fd = null;
-    cli.System.Net.Sockets.Socket fd1 = null;
-    boolean ipv6_supported = ipv6_available();
-
-    if (IS_NULL(fdObj) || (ipv6_supported && IS_NULL(fd1Obj))) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException", "Socket closed");
-        return;
-    } else {
-        fd =  socket (AF_INET, SOCK_DGRAM, 0);
-    }
-    if (fd == INVALID_SOCKET) {
-        NET_ThrowCurrent(env, "Socket creation failed");
-        return;
-    }
-    fdObj.setSocket(fd);
-    NET_SetSockOpt(fd, SOL_SOCKET, SO_BROADCAST, true);
-
-    if (ipv6_supported) {
-        /* SIO_UDP_CONNRESET fixes a bug introduced in Windows 2000, which
-         * returns connection reset errors un connected UDP sockets (as well
-         * as connected sockets. The solution is to only enable this feature
-         * when the socket is connected
-         */
-        WSAIoctl(fd,SIO_UDP_CONNRESET,false);
-        fd1 = socket (AF_INET6, SOCK_DGRAM, 0);
-        if (fd1 == INVALID_SOCKET) {
-            NET_ThrowCurrent(env, "Socket creation failed");
-            return;
-        }
-        NET_SetSockOpt(fd1, SOL_SOCKET, SO_BROADCAST, true);
-        WSAIoctl(fd1,SIO_UDP_CONNRESET,false);
-        fd1Obj.setSocket(fd1);
-    } else {
-        /* drop the second fd */
-        _this.fd1 = null;
-    }
-}
-
-/*
- * Class:     java_net_TwoStacksPlainDatagramSocketImpl
- * Method:    datagramSocketClose
- * Signature: ()V
- */
-static void datagramSocketClose(TwoStacksPlainDatagramSocketImpl _this) {
-    /*
-     * REMIND: PUT A LOCK AROUND THIS CODE
-     */
-    FileDescriptor fdObj = _this.fd;
-    FileDescriptor fd1Obj = _this.fd1;
-    boolean ipv6_supported = ipv6_available();
-    cli.System.Net.Sockets.Socket fd = null, fd1 = null;
-
-    if (IS_NULL(fdObj) && (!ipv6_supported || IS_NULL(fd1Obj))) {
-        return;
-    }
-
-    if (!IS_NULL(fdObj)) {
-        fd = fdObj.getSocket();
-        if (fd != null) {
-            fdObj.setSocket(null);
-            NET_SocketClose(fd);
-        }
-    }
-
-    if (ipv6_supported && fd1Obj != NULL) {
-        fd1 = fd1Obj.getSocket();
-        if (fd1 == null) {
-            return;
-        }
-        fd1Obj.setSocket(null);
-        NET_SocketClose(fd1);
-    }
-}
-
-/*
- * check the addresses attached to the NetworkInterface object
- * and return the first one (of the requested family Ipv4 or Ipv6)
- * in *iaddr
- */
-
-private static int getInetAddrFromIf (JNIEnv env, int family, NetworkInterface nif, InetAddress[] iaddr)
-{
-    InetAddress[] addrArray;
-    int len;
-    InetAddress addr;
-    int i;
-
-    addrArray = getNetworkInterfaceAddresses(nif);
-    len = addrArray.length;
-
-    /*
-     * Check that there is at least one address bound to this
-     * interface.
-     */
-    if (len < 1) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-            "bad argument for IP_MULTICAST_IF2: No IP addresses bound to interface");
-        return -1;
-    }
-    for (i=0; i<len; i++) {
-        int fam;
-        addr = addrArray[i];
-        fam = getInetAddress_family(env, addr);
-        if (fam == family) {
-            iaddr[0] = addr;
-            return 0;
-        }
-    }
-    return -1;
-}
-
-private static int getInet4AddrFromIf (JNIEnv env, NetworkInterface nif, in_addr iaddr)
-{
-    InetAddress[] addr = new InetAddress[1];
-
-    int ret = getInetAddrFromIf (env, IPv4, nif, addr);
-    if (ret == -1) {
-        return -1;
-    }
-
-    iaddr.s_addr = htonl(getInetAddress_addr(env, addr[0]));
-    return 0;
-}
-
-/* Get the multicasting index from the interface */
-
-private static int getIndexFromIf (JNIEnv env, NetworkInterface nif) {
-    return nif.getIndex();
-}
-
-private static InetAddress[] getNetworkInterfaceAddresses(final NetworkInterface nif) {
-    // [IKVM] this is IKVM specific, because I don't want to use reflection (or map.xml hacks) to access the "addrs" member of NetworkInterface
-    return java.security.AccessController.doPrivileged(new java.security.PrivilegedAction<InetAddress[]>() {
-        public InetAddress[] run() {
-            java.util.ArrayList<InetAddress> list = new java.util.ArrayList<InetAddress>();
-            for (java.util.Enumeration<InetAddress> e = nif.getInetAddresses(); e.hasMoreElements(); ) {
-                list.add(e.nextElement());
-            }
-            return list.toArray(new InetAddress[list.size()]);
-        }
-    });
-}
-
-static int isAdapterIpv6Enabled(JNIEnv env, int index) {
-    return java.security.AccessController.doPrivileged(new java.security.PrivilegedAction<Integer>() {
-        public Integer run() {
-            try {
-                for (java.util.Enumeration<InetAddress> e = NetworkInterface.getByIndex(index).getInetAddresses(); e.hasMoreElements(); ) {
-                    if (e.nextElement() instanceof Inet6Address) {
-                        return 1;
-                    }
-                }
-            } catch (SocketException x) {
-            }
-            return 0;
-        }
-    }).intValue();
-}
-
-private static NetworkInterface Java_java_net_NetworkInterface_getByIndex(JNIEnv env, int ni_class, int index)
-{
-    try {
-        return NetworkInterface.getByIndex(index);
-    } catch (Exception x) {
-        env.Throw(x);
-        return null;
-    }
-}
-
-private static NetworkInterface Java_java_net_NetworkInterface_getByInetAddress0(JNIEnv env, int ni_class, Object address)
-{
-    try {
-        return NetworkInterface.getByInetAddress((InetAddress)address);
-    } catch (Exception x) {
-        env.Throw(x);
-        return null;
-    }
-}
-
-/*
- * Sets the multicast interface.
- *
- * SocketOptions.IP_MULTICAST_IF (argument is an InetAddress) :-
- *      IPv4:   set outgoing multicast interface using
- *              IPPROTO_IP/IP_MULTICAST_IF
- *
- *      IPv6:   Get the interface to which the
- *              InetAddress is bound
- *              and do same as SockOptions.IF_MULTICAST_IF2
- *
- * SockOptions.IF_MULTICAST_IF2 (argument is a NetworkInterface ) :-
- *      For each stack:
- *      IPv4:   Obtain IP address bound to network interface
- *              (NetworkInterface.addres[0])
- *              set outgoing multicast interface using
- *              IPPROTO_IP/IP_MULTICAST_IF
- *
- *      IPv6:   Obtain NetworkInterface.index
- *              Set outgoing multicast interface using
- *              IPPROTO_IPV6/IPV6_MULTICAST_IF
- *
- */
-private static void setMulticastInterface(JNIEnv env, TwoStacksPlainDatagramSocketImpl _this, cli.System.Net.Sockets.Socket fd, cli.System.Net.Sockets.Socket fd1,
-                                  int opt, Object value)
-{
-    boolean ipv6_supported = ipv6_available();
-
-    if (opt == java_net_SocketOptions_IP_MULTICAST_IF) {
-        /*
-         * value is an InetAddress.
-         * On IPv4 system use IP_MULTICAST_IF socket option
-         * On IPv6 system get the NetworkInterface that this IP
-         * address is bound to and use the IPV6_MULTICAST_IF
-         * option instead of IP_MULTICAST_IF
-         */
-        if (ipv6_supported) {
-            value = Java_java_net_NetworkInterface_getByInetAddress0(env, ni_class, value);
-            if (value == NULL) {
-                if (env.ExceptionOccurred() == null) {
-                    JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                         "bad argument for IP_MULTICAST_IF"
-                        +": address not bound to any interface");
-                }
-                return;
-            }
-            opt = java_net_SocketOptions_IP_MULTICAST_IF2;
-        } else {
-            in_addr in = new in_addr();
-
-            in.s_addr = htonl(getInetAddress_addr(env, (InetAddress)value));
-
-            if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF,
-                               in) < 0) {
-                NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG+"SocketException",
-                                 "Error setting socket option");
-            }
-            return;
-        }
-    }
-
-    if (opt == java_net_SocketOptions_IP_MULTICAST_IF2) {
-        /*
-         * value is a NetworkInterface.
-         * On IPv6 system get the index of the interface and use the
-         * IPV6_MULTICAST_IF socket option
-         * On IPv4 system extract addr[0] and use the IP_MULTICAST_IF
-         * option. For IPv6 both must be done.
-         */
-        if (ipv6_supported) {
-            in_addr in = new in_addr();
-            int index;
-
-            index = ((NetworkInterface)value).getIndex();
-
-            if ( isAdapterIpv6Enabled(env, index) != 0 ) {
-                if (setsockopt(fd1, IPPROTO_IPV6, IPV6_MULTICAST_IF,
-                               index) < 0) {
-                    if (WSAGetLastError() == WSAEINVAL && index > 0) {
-                        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                            "IPV6_MULTICAST_IF failed (interface has IPv4 "
-                           +"address only?)");
-                    } else {
-                        NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG+"SocketException",
-                                   "Error setting socket option");
-                    }
-                    return;
-                }
-            }
-
-            /* If there are any IPv4 addresses on this interface then
-             * repeat the operation on the IPv4 fd */
-
-            if (getInet4AddrFromIf (env, (NetworkInterface)value, in) < 0) {
-                return;
-            }
-            if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF,
-                               in) < 0) {
-                NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG+"SocketException",
-                                 "Error setting socket option");
-            }
-            return;
-        } else {
-            in_addr in = new in_addr();
-
-            if (getInet4AddrFromIf (env, (NetworkInterface)value, in) < 0) {
-                if (env.ExceptionOccurred() != null) {
-                    return;
-                }
-                JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                        "no InetAddress instances of requested type");
-                return;
-            }
-
-            if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF,
-                               in) < 0) {
-                NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG+"SocketException",
-                               "Error setting socket option");
-            }
-            return;
-        }
-    }
-}
-
-/*
- * Class:     java_net_TwoStacksPlainDatagramSocketImpl
- * Method:    socketNativeSetOption
- * Signature: (ILjava/lang/Object;)V
- */
-static void socketNativeSetOption(JNIEnv env, TwoStacksPlainDatagramSocketImpl _this, int opt, Object value) {
-    cli.System.Net.Sockets.Socket fd = null;
-    cli.System.Net.Sockets.Socket fd1 = null;
-    int[] levelv4 = new int[1];
-    int[] levelv6 = new int[1];
-    int[] optnamev4 = new int[1];
-    int[] optnamev6 = new int[1];
-    Object optval;
-    boolean ipv6_supported = ipv6_available();
-
-    fd = getFD(env, _this);
-
-    if (ipv6_supported) {
-        fd1 = getFD1(env, _this);
-    }
-    if (fd == null && fd1 == null) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException", "socket closed");
-        return;
-    }
-
-    if ((opt == java_net_SocketOptions_IP_MULTICAST_IF) ||
-        (opt == java_net_SocketOptions_IP_MULTICAST_IF2)) {
-
-        setMulticastInterface(env, _this, fd, fd1, opt, value);
-        return;
-    }
-
-    /*
-     * Map the Java level socket option to the platform specific
-     * level(s) and option name(s).
-     */
-    if (fd1 != null) {
-        if (NET_MapSocketOptionV6(opt, levelv6, optnamev6) != 0) {
-            JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException", "Invalid option");
-            return;
-        }
-    }
-    if (fd != null) {
-        if (NET_MapSocketOption(opt, levelv4, optnamev4) != 0) {
-            JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException", "Invalid option");
-            return;
-        }
-    }
-
-    switch (opt) {
-        case java_net_SocketOptions_SO_SNDBUF :
-        case java_net_SocketOptions_SO_RCVBUF :
-        case java_net_SocketOptions_IP_TOS :
-            optval = ((Integer)value).intValue();
-            break;
-
-        case java_net_SocketOptions_SO_REUSEADDR:
-        case java_net_SocketOptions_SO_BROADCAST:
-        case java_net_SocketOptions_IP_MULTICAST_LOOP:
-            {
-                boolean on = ((Boolean)value).booleanValue();
-                optval = on;
-                /*
-                 * setLoopbackMode (true) disables IP_MULTICAST_LOOP rather
-                 * than enabling it.
-                 */
-                if (opt == java_net_SocketOptions_IP_MULTICAST_LOOP) {
-                    optval = !on;
-                }
-            }
-            break;
-
-        default :
-            JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                "Socket option not supported by PlainDatagramSocketImp");
-            return;
-    }
-
-    if (fd1 != null) {
-        if (NET_SetSockOpt(fd1, levelv6[0], optnamev6[0], optval) < 0) {
-            NET_ThrowCurrent(env, "setsockopt IPv6");
-            return;
-        }
-    }
-    if (fd != null) {
-        if (NET_SetSockOpt(fd, levelv4[0], optnamev4[0], optval) < 0) {
-            NET_ThrowCurrent(env, "setsockopt");
-            return;
-        }
-    }
-}
-
-/*
- *
- * called by getMulticastInterface to retrieve a NetworkInterface
- * configured for IPv4.
- * The ipv4Mode parameter, is a closet boolean, which allows for a NULL return,
- * or forces the creation of a NetworkInterface object with null data.
- * It relates to its calling context in getMulticastInterface.
- * ipv4Mode == 1, the context is IPV4 processing only.
- * ipv4Mode == 0, the context is IPV6 processing
- *
- *-/
-static jobject getIPv4NetworkInterface (JNIEnv *env, jobject this, int fd, jint opt, int ipv4Mode) {
-        static jclass inet4_class;
-        static jmethodID inet4_ctrID;
-
-        static jclass ni_class; static jmethodID ni_ctrID;
-        static jfieldID ni_indexID;
-        static jfieldID ni_addrsID;
-
-        jobjectArray addrArray;
-        jobject addr;
-        jobject ni;
-
-        struct in_addr in;
-        struct in_addr *inP = &in;
-        int len = sizeof(struct in_addr);
-        if (getsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF,
-                           (char *)inP, &len) < 0) {
-            NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
-                             "Error getting socket option");
-            return NULL;
-        }
-
-        /*
-         * Construct and populate an Inet4Address
-         *-/
-        if (inet4_class == NULL) {
-            jclass c = (*env)->FindClass(env, "java/net/Inet4Address");
-            CHECK_NULL_RETURN(c, NULL);
-            inet4_ctrID = (*env)->GetMethodID(env, c, "<init>", "()V");
-            CHECK_NULL_RETURN(inet4_ctrID, NULL);
-            inet4_class = (*env)->NewGlobalRef(env, c);
-            CHECK_NULL_RETURN(inet4_class, NULL);
-        }
-        addr = (*env)->NewObject(env, inet4_class, inet4_ctrID, 0);
-        CHECK_NULL_RETURN(addr, NULL);
-
-        setInetAddress_addr(env, addr, ntohl(in.s_addr));
-
-        /*
-         * For IP_MULTICAST_IF return InetAddress
-         *-/
-        if (opt == java_net_SocketOptions_IP_MULTICAST_IF) {
-            return addr;
-        }
-
-        /*
-         * For IP_MULTICAST_IF2 we get the NetworkInterface for
-         * this address and return it
-         *-/
-        if (ni_class == NULL) {
-            jclass c = (*env)->FindClass(env, "java/net/NetworkInterface");
-            CHECK_NULL_RETURN(c, NULL);
-            ni_ctrID = (*env)->GetMethodID(env, c, "<init>", "()V");
-            CHECK_NULL_RETURN(ni_ctrID, NULL);
-            ni_indexID = (*env)->GetFieldID(env, c, "index", "I");
-            CHECK_NULL_RETURN(ni_indexID, NULL);
-            ni_addrsID = (*env)->GetFieldID(env, c, "addrs",
-                                            "[Ljava/net/InetAddress;");
-            CHECK_NULL_RETURN(ni_addrsID, NULL);
-            ni_class = (*env)->NewGlobalRef(env, c);
-            CHECK_NULL_RETURN(ni_class, NULL);
-        }
-        ni = Java_java_net_NetworkInterface_getByInetAddress0(env, ni_class, addr);
-        if (ni) {
-            return ni;
-        }
-        if (ipv4Mode) {
-            ni = (*env)->NewObject(env, ni_class, ni_ctrID, 0);
-            CHECK_NULL_RETURN(ni, NULL);
-
-            (*env)->SetIntField(env, ni, ni_indexID, -1);
-            addrArray = (*env)->NewObjectArray(env, 1, inet4_class, NULL);
-            CHECK_NULL_RETURN(addrArray, NULL);
-            (*env)->SetObjectArrayElement(env, addrArray, 0, addr);
-            (*env)->SetObjectField(env, ni, ni_addrsID, addrArray);
-        } else {
-            ni = NULL;
-        }
-        return ni;
-}
-
-/*
- * Return the multicast interface:
- *
- * SocketOptions.IP_MULTICAST_IF
- *      IPv4:   Query IPPROTO_IP/IP_MULTICAST_IF
- *              Create InetAddress
- *              IP_MULTICAST_IF returns struct ip_mreqn on 2.2
- *              kernel but struct in_addr on 2.4 kernel
- *      IPv6:   Query IPPROTO_IPV6 / IPV6_MULTICAST_IF or
- *              obtain from impl is Linux 2.2 kernel
- *              If index == 0 return InetAddress representing
- *              anyLocalAddress.
- *              If index > 0 query NetworkInterface by index
- *              and returns addrs[0]
- *
- * SocketOptions.IP_MULTICAST_IF2
- *      IPv4:   Query IPPROTO_IP/IP_MULTICAST_IF
- *              Query NetworkInterface by IP address and
- *              return the NetworkInterface that the address
- *              is bound too.
- *      IPv6:   Query IPPROTO_IPV6 / IPV6_MULTICAST_IF
- *              (except Linux .2 kernel)
- *              Query NetworkInterface by index and
- *              return NetworkInterface.
- */
-private static Object getMulticastInterface(JNIEnv env, TwoStacksPlainDatagramSocketImpl _this, cli.System.Net.Sockets.Socket fd, cli.System.Net.Sockets.Socket fd1, int opt) {
-    boolean isIPV4 = !ipv6_available() || fd1 == null;
-
-    /*
-     * IPv4 implementation
-     */
-    if (isIPV4) {
-        Inet4Address addr;
-
-        in_addr in = new in_addr();
-
-        if (getsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF,
-                           in) < 0) {
-            NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG+"SocketException",
-                             "Error getting socket option");
-            return NULL;
-        }
-
-        /*
-         * Construct and populate an Inet4Address
-         */
-        addr = new Inet4Address();
-        addr.holder().address = ntohl(in.s_addr);
-
-        /*
-         * For IP_MULTICAST_IF return InetAddress
-         */
-        if (opt == java_net_SocketOptions_IP_MULTICAST_IF) {
-            return addr;
-        }
-
-        NetworkInterface ni;
-        ni = Java_java_net_NetworkInterface_getByInetAddress0(env, ni_class, addr);
-        if (ni != null) {
-            return ni;
-        }
-
-        /*
-         * The address doesn't appear to be bound at any known
-         * NetworkInterface. Therefore we construct a NetworkInterface
-         * with this address.
-         */
-        return new NetworkInterface(null, -1, new InetAddress[] { addr });
-    }
-
-
-    /*
-     * IPv6 implementation
-     */
-    if ((opt == java_net_SocketOptions_IP_MULTICAST_IF) ||
-        (opt == java_net_SocketOptions_IP_MULTICAST_IF2)) {
-
-        int index;
-
-        InetAddress[] addrArray;
-        InetAddress addr;
-        NetworkInterface ni;
-
-        {
-            int[] tmp = { 0 };
-            if (getsockopt(fd1, IPPROTO_IPV6, IPV6_MULTICAST_IF,
-                               tmp) < 0) {
-                NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG+"SocketException",
-                               "Error getting socket option");
-                return NULL;
-            }
-            index = tmp[0];
-        }
-
-        /*
-         * If multicast to a specific interface then return the
-         * interface (for IF2) or the any address on that interface
-         * (for IF).
-         */
-        if (index > 0) {
-            ni = Java_java_net_NetworkInterface_getByIndex(env, ni_class,
-                                                                   index);
-            if (ni == NULL) {
-                String errmsg = "IPV6_MULTICAST_IF returned index to unrecognized interface: " + index;
-                JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException", errmsg);
-                return NULL;
-            }
-
-            /*
-             * For IP_MULTICAST_IF2 return the NetworkInterface
-             */
-            if (opt == java_net_SocketOptions_IP_MULTICAST_IF2) {
-                return ni;
-            }
-
-            /*
-             * For IP_MULTICAST_IF return addrs[0]
-             */
-            addrArray = getNetworkInterfaceAddresses(ni);
-            if (addrArray.length < 1) {
-                JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                    "IPV6_MULTICAST_IF returned interface without IP bindings");
-                return NULL;
-            }
-
-            addr = addrArray[0];
-            return addr;
-        }
-
-        /*
-         * Multicast to any address - return anyLocalAddress
-         * or a NetworkInterface with addrs[0] set to anyLocalAddress
-         */
-
-        addr = InetAddress.anyLocalAddress();
-        if (opt == java_net_SocketOptions_IP_MULTICAST_IF) {
-            return addr;
-        }
-
-        return new NetworkInterface(null, -1, new InetAddress[] { addr });
-    }
-    return NULL;
-}
-/*
- * Returns relevant info as a jint.
- *
- * Class:     java_net_TwoStacksPlainDatagramSocketImpl
- * Method:    socketGetOption
- * Signature: (I)Ljava/lang/Object;
- */
-static Object socketGetOption(JNIEnv env, TwoStacksPlainDatagramSocketImpl _this, int opt) {
-    cli.System.Net.Sockets.Socket fd = null;
-    cli.System.Net.Sockets.Socket fd1 = null;
-    int[] level = new int[1];
-    int[] optname = new int[1];
-    int[] optval = new int[1];
-    boolean ipv6_supported = ipv6_available();
-
-    fd = getFD(env, _this);
-    if (ipv6_supported) {
-        fd1 = getFD1(env, _this);
-    }
-
-    if (fd == null && fd1 ==  null) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                        "Socket closed");
-        return NULL;
-    }
-
-    /*
-     * Handle IP_MULTICAST_IF separately
-     */
-    if (opt == java_net_SocketOptions_IP_MULTICAST_IF ||
-        opt == java_net_SocketOptions_IP_MULTICAST_IF2) {
-        return getMulticastInterface(env, _this, fd, fd1, opt);
-    }
-
-    /*
-     * Map the Java level socket option to the platform specific
-     * level and option name.
-     */
-    if (NET_MapSocketOption(opt, level, optname) != 0) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException", "Invalid option");
-        return NULL;
-    }
-
-    if (fd == null) {
-        if (NET_MapSocketOptionV6(opt, level, optname) != 0) {
-            JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException", "Invalid option");
-            return NULL;
-        }
-        fd = fd1; /* must be IPv6 only */
-    }
-
-    if (NET_GetSockOpt(fd, level[0], optname[0], optval) < 0) {
-        String errmsg = "error getting socket option: " + WSAGetLastError();
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException", errmsg);
-        return NULL;
-    }
-
-    switch (opt) {
-        case java_net_SocketOptions_SO_BROADCAST:
-        case java_net_SocketOptions_SO_REUSEADDR:
-            return optval[0] != 0;
-
-        case java_net_SocketOptions_IP_MULTICAST_LOOP:
-            /* getLoopbackMode() returns true if IP_MULTICAST_LOOP is disabled */
-            return optval[0] == 0;
-
-        case java_net_SocketOptions_SO_SNDBUF:
-        case java_net_SocketOptions_SO_RCVBUF:
-        case java_net_SocketOptions_IP_TOS:
-            return optval[0];
-
-        default :
-            JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                "Socket option not supported by TwoStacksPlainDatagramSocketImpl");
-            return NULL;
-
-    }
-}
-
-/*
- * Returns local address of the socket.
- *
- * Class:     java_net_TwoStacksPlainDatagramSocketImpl
- * Method:    socketLocalAddress
- * Signature: (I)Ljava/lang/Object;
- */
-static Object socketLocalAddress(JNIEnv env, TwoStacksPlainDatagramSocketImpl _this,
-                                                      int family) {
-    cli.System.Net.Sockets.Socket fd = null;
-    cli.System.Net.Sockets.Socket fd1 = null;
-    SOCKETADDRESS him;
-    him = new SOCKETADDRESS();
-    Object iaObj;
-    boolean ipv6_supported = ipv6_available();
-
-    fd = getFD(env, _this);
-    if (ipv6_supported) {
-        fd1 = getFD1(env, _this);
-    }
-
-    if (fd == null && fd1 == null) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                        "Socket closed");
-        return NULL;
-    }
-
-    /* find out local IP address */
-
-    /* family==-1 when socket is not connected */
-    if ((family == IPv6) || (family == -1 && fd == null)) {
-        fd = fd1; /* must be IPv6 only */
-    }
-
-    if (fd == null) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                        "Socket closed");
-        return NULL;
-    }
-
-    if (getsockname(fd, him) == -1) {
-        NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG+"SocketException",
-                       "Error getting socket name");
-        return NULL;
-    }
-    iaObj = NET_SockaddrToInetAddress(him, new int[1]);
-
-    return iaObj;
-}
-
-/*
- * Class:     java_net_TwoStacksPlainDatagramSocketImpl
- * Method:    setTimeToLive
- * Signature: (I)V
- */
-static void setTimeToLive(JNIEnv env, TwoStacksPlainDatagramSocketImpl _this, int ttl) {
-    FileDescriptor fdObj = _this.fd;
-    FileDescriptor fd1Obj = _this.fd1;
-    cli.System.Net.Sockets.Socket fd = null;
-    cli.System.Net.Sockets.Socket fd1 = null;
-
-    if (IS_NULL(fdObj) && IS_NULL(fd1Obj)) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                        "Socket closed");
-        return;
-    } else {
-      if (!IS_NULL(fdObj)) {
-        fd = fdObj.getSocket();
-      }
-      if (!IS_NULL(fd1Obj)) {
-        fd1 = fd1Obj.getSocket();
-      }
-    }
-
-    /* setsockopt to be correct ttl */
-    if (fd != null) {
-      if (NET_SetSockOpt(fd, IPPROTO_IP, IP_MULTICAST_TTL, ttl) < 0) {
-        NET_ThrowCurrent(env, "set IP_MULTICAST_TTL failed");
-      }
-    }
-
-    if (fd1 != null) {
-      if (NET_SetSockOpt(fd1, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, ttl) <0) {
-        NET_ThrowCurrent(env, "set IPV6_MULTICAST_HOPS failed");
-      }
-    }
-}
-
-/*
- * Class:     java_net_TwoStacksPlainDatagramSocketImpl
- * Method:    setTTL
- * Signature: (B)V
- */
-static void setTTL(JNIEnv env, TwoStacksPlainDatagramSocketImpl _this, byte ttl) {
-    setTimeToLive(env, _this, ttl & 0xFF);
-}
-
-/*
- * Class:     java_net_TwoStacksPlainDatagramSocketImpl
- * Method:    getTimeToLive
- * Signature: ()I
- */
-static int getTimeToLive(JNIEnv env, TwoStacksPlainDatagramSocketImpl _this) {
-    FileDescriptor fdObj = _this.fd;
-    FileDescriptor fd1Obj = _this.fd1;
-    cli.System.Net.Sockets.Socket fd = null;
-    cli.System.Net.Sockets.Socket fd1 = null;
-    int[] ttl = new int[1];
-
-    if (IS_NULL(fdObj) && IS_NULL(fd1Obj)) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                        "Socket closed");
-        return -1;
-    } else {
-      if (!IS_NULL(fdObj)) {
-        fd = fdObj.getSocket();
-      }
-      if (!IS_NULL(fd1Obj)) {
-        fd1 = fd1Obj.getSocket();
-      }
-    }
-
-    /* getsockopt of ttl */
-    if (fd != null) {
-      if (NET_GetSockOpt(fd, IPPROTO_IP, IP_MULTICAST_TTL, ttl) < 0) {
-        NET_ThrowCurrent(env, "get IP_MULTICAST_TTL failed");
-        return -1;
-      }
-      return ttl[0];
-    }
-    if (fd1 != null) {
-      if (NET_GetSockOpt(fd1, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, ttl) < 0) {
-        NET_ThrowCurrent(env, "get IP_MULTICAST_TTL failed");
-        return -1;
-      }
-      return ttl[0];
-    }
-    return -1;
-}
-
-/*
- * Class:     java_net_TwoStacksPlainDatagramSocketImpl
- * Method:    getTTL
- * Signature: ()B
- */
-static byte getTTL(JNIEnv env, TwoStacksPlainDatagramSocketImpl _this) {
-    int result = getTimeToLive(env, _this);
-
-    return (byte)result;
-}
-
-/* join/leave the named group on the named interface, or if no interface specified
- * then the interface set with setInterfac(), or the default interface otherwise */
-
-private static void mcast_join_leave(JNIEnv env, TwoStacksPlainDatagramSocketImpl _this, InetAddress iaObj, NetworkInterface niObj, boolean join)
-{
-    FileDescriptor fdObj = _this.fd;
-    FileDescriptor fd1Obj = _this.fd1;
-    cli.System.Net.Sockets.Socket fd = null;
-    cli.System.Net.Sockets.Socket fd1 = null;
-
-    SOCKETADDRESS name;
-    name = new SOCKETADDRESS();
-    ip_mreq mname = new ip_mreq();
-    ipv6_mreq mname6 = new ipv6_mreq();
-
-    in_addr in = new in_addr();
-    int ifindex;
-
-    int family;
-    boolean ipv6_supported = ipv6_available();
-    int cmd ;
-
-    if (IS_NULL(fdObj) && IS_NULL(fd1Obj)) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                        "Socket closed");
-        return;
-    }
-    if (!IS_NULL(fdObj)) {
-        fd = fdObj.getSocket();
-    }
-    if (ipv6_supported && !IS_NULL(fd1Obj)) {
-        fd1 = fd1Obj.getSocket();
-    }
-
-    if (IS_NULL(iaObj)) {
-        JNU_ThrowNullPointerException(env, "address");
-        return;
-    }
-
-    if (NET_InetAddressToSockaddr(env, iaObj, 0, name, JNI_FALSE) != 0) {
-      return;
-    }
-
-    /* Set the multicast group address in the ip_mreq field
-     * eventually this check should be done by the security manager
-     */
-    family = name.him.sa_family;
-
-    if (family == AF_INET) {
-        int address = name.him4.sin_addr.s_addr;
-        if (!IN_MULTICAST(ntohl(address))) {
-            JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException", "not in multicast");
-            return;
-        }
-        mname.imr_multiaddr.s_addr = address;
-        if (fd == null) {
-          JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException", "Can't join an IPv4 group on an IPv6 only socket");
-          return;
-        }
-        if (IS_NULL(niObj)) {
-            if (NET_GetSockOpt(fd, IPPROTO_IP, IP_MULTICAST_IF, in) < 0) {
-                NET_ThrowCurrent(env, "get IP_MULTICAST_IF failed");
-                return;
-            }
-            mname.imr_interface.s_addr = in.s_addr;
-        } else {
-            if (getInet4AddrFromIf (env, niObj, mname.imr_interface) != 0) {
-                NET_ThrowCurrent(env, "no Inet4Address associated with interface");
-                return;
-            }
-        }
-
-        cmd = join ? IP_ADD_MEMBERSHIP: IP_DROP_MEMBERSHIP;
-
-        /* Join the multicast group */
-        if (NET_SetSockOpt(fd, IPPROTO_IP, cmd, mname) < 0) {
-            if (WSAGetLastError() == WSAENOBUFS) {
-                JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                    "IP_ADD_MEMBERSHIP failed (out of hardware filters?)");
-            } else {
-                JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException","error setting options");
-            }
-        }
-    } else /* AF_INET6 */ {
-        if (ipv6_supported) {
-            in6_addr address;
-            address = in6_addr.FromSockAddr(name);
-            if (!IN6_IS_ADDR_MULTICAST(address)) {
-                JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException", "not in6 multicast");
-                return;
-            }
-            mname6.ipv6mr_multiaddr = address;
-        } else {
-            JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException", "IPv6 not supported");
-            return;
-        }
-        if (fd1 == null) {
-          JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException", "Can't join an IPv6 group on a IPv4 socket");
-          return;
-        }
-        if (IS_NULL(niObj)) {
-            int[] tmp = { 0 };
-            if (NET_GetSockOpt(fd1, IPPROTO_IPV6, IPV6_MULTICAST_IF, tmp) < 0) {
-                NET_ThrowCurrent(env, "get IPV6_MULTICAST_IF failed");
-                return;
-            }
-            ifindex = tmp[0];
-        } else {
-            ifindex = getIndexFromIf (env, niObj);
-            if (ifindex == -1) {
-                NET_ThrowCurrent(env, "get ifindex failed");
-                return;
-            }
-        }
-        mname6.ipv6mr_interface = ifindex;
-        cmd = join ? IPV6_ADD_MEMBERSHIP: IPV6_DROP_MEMBERSHIP;
-
-        /* Join the multicast group */
-        if (NET_SetSockOpt(fd1, IPPROTO_IPV6, cmd, mname6) < 0) {
-            if (WSAGetLastError() == WSAENOBUFS) {
-                JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                    "IP_ADD_MEMBERSHIP failed (out of hardware filters?)");
-            } else {
-                JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException","error setting options");
-            }
-        }
-    }
-
-    return;
-}
-
-/*
- * Class:     java_net_TwoStacksPlainDatagramSocketImpl
- * Method:    join
- * Signature: (Ljava/net/InetAddress;)V
- */
-static void join(JNIEnv env, TwoStacksPlainDatagramSocketImpl _this, InetAddress inetaddr, NetworkInterface netIf) {
-    mcast_join_leave(env, _this, inetaddr, netIf, true);
-}
-
-/*
- * Class:     java_net_TwoStacksPlainDatagramSocketImpl
- * Method:    leave
- * Signature: (Ljava/net/InetAddress;)V
- */
-static void leave(JNIEnv env, TwoStacksPlainDatagramSocketImpl _this, InetAddress inetaddr, NetworkInterface netIf) {
-    mcast_join_leave(env, _this, inetaddr, netIf, false);
-}
-
-}
diff --git a/openjdk/java/net/TwoStacksPlainSocketImpl.java b/openjdk/java/net/TwoStacksPlainSocketImpl.java
deleted file mode 100644
index 12c1794f..00000000
--- a/openjdk/java/net/TwoStacksPlainSocketImpl.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.net;
-
-import java.io.IOException;
-import java.io.FileDescriptor;
-import sun.net.ResourceManager;
-
-/*
- * This class defines the plain SocketImpl that is used for all
- * Windows version lower than Vista. It adds support for IPv6 on
- * these platforms where available.
- *
- * For backward compatibility Windows platforms that do not have IPv6
- * support also use this implementation, and fd1 gets set to null
- * during socket creation.
- *
- * @author Chris Hegarty
- */
-
-class TwoStacksPlainSocketImpl extends AbstractPlainSocketImpl
-{
-    /* second fd, used for ipv6 on windows only.
-     * fd1 is used for listeners and for client sockets at initialization
-     * until the socket is connected. Up to this point fd always refers
-     * to the ipv4 socket and fd1 to the ipv6 socket. After the socket
-     * becomes connected, fd always refers to the connected socket
-     * (either v4 or v6) and fd1 is closed.
-     *
-     * For ServerSockets, fd always refers to the v4 listener and
-     * fd1 the v6 listener.
-     */
-    FileDescriptor fd1;
-
-    /*
-     * Needed for ipv6 on windows because we need to know
-     * if the socket is bound to ::0 or 0.0.0.0, when a caller
-     * asks for it. Otherwise we don't know which socket to ask.
-     */
-    private InetAddress anyLocalBoundAddr = null;
-
-    /* to prevent starvation when listening on two sockets, this is
-     * is used to hold the id of the last socket we accepted on.
-     */
-    cli.System.Net.Sockets.Socket lastfd = null;
-
-    // true if this socket is exclusively bound
-    private final boolean exclusiveBind;
-
-    // emulates SO_REUSEADDR when exclusiveBind is true
-    private boolean isReuseAddress;
-
-
-    public TwoStacksPlainSocketImpl(boolean exclBind) {
-        exclusiveBind = exclBind;
-    }
-
-    public TwoStacksPlainSocketImpl(FileDescriptor fd, boolean exclBind) {
-        this.fd = fd;
-        exclusiveBind = exclBind;
-    }
-
-    /**
-     * Creates a socket with a boolean that specifies whether this
-     * is a stream socket (true) or an unconnected UDP socket (false).
-     */
-    protected synchronized void create(boolean stream) throws IOException {
-        fd1 = new FileDescriptor();
-        try {
-            super.create(stream);
-        } catch (IOException e) {
-            fd1 = null;
-            throw e;
-        }
-    }
-
-     /**
-     * Binds the socket to the specified address of the specified local port.
-     * @param address the address
-     * @param port the port
-     */
-    protected synchronized void bind(InetAddress address, int lport)
-        throws IOException
-    {
-        super.bind(address, lport);
-        if (address.isAnyLocalAddress()) {
-            anyLocalBoundAddr = address;
-        }
-    }
-
-    public Object getOption(int opt) throws SocketException {
-        if (isClosedOrPending()) {
-            throw new SocketException("Socket Closed");
-        }
-        if (opt == SO_BINDADDR) {
-            if (fd != null && fd1 != null ) {
-                /* must be unbound or else bound to anyLocal */
-                return anyLocalBoundAddr;
-            }
-            InetAddressContainer in = new InetAddressContainer();
-            socketGetOption(opt, in);
-            return in.addr;
-        } else if (opt == SO_REUSEADDR && exclusiveBind) {
-            // SO_REUSEADDR emulated when using exclusive bind
-            return isReuseAddress;
-        } else
-            return super.getOption(opt);
-    }
-
-    @Override
-    void socketBind(InetAddress address, int port) throws IOException {
-        socketBind(address, port, exclusiveBind);
-    }
-
-    @Override
-    void socketSetOption(int opt, boolean on, Object value)
-        throws SocketException
-    {
-        // SO_REUSEADDR emulated when using exclusive bind
-        if (opt == SO_REUSEADDR && exclusiveBind)
-            isReuseAddress = on;
-        else
-            socketNativeSetOption(opt, on, value);
-    }
-
-    /**
-     * Closes the socket.
-     */
-    @Override
-    protected void close() throws IOException {
-        synchronized(fdLock) {
-            if (fd != null || fd1 != null) {
-                if (!stream) {
-                    ResourceManager.afterUdpClose();
-                }
-                if (fdUseCount == 0) {
-                    if (closePending) {
-                        return;
-                    }
-                    closePending = true;
-                    socketClose();
-                    fd = null;
-                    fd1 = null;
-                    return;
-                } else {
-                    /*
-                     * If a thread has acquired the fd and a close
-                     * isn't pending then use a deferred close.
-                     * Also decrement fdUseCount to signal the last
-                     * thread that releases the fd to close it.
-                     */
-                    if (!closePending) {
-                        closePending = true;
-                        fdUseCount--;
-                        socketClose();
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    void reset() throws IOException {
-        if (fd != null || fd1 != null) {
-            socketClose();
-        }
-        fd = null;
-        fd1 = null;
-        super.reset();
-    }
-
-    /*
-     * Return true if already closed or close is pending
-     */
-    @Override
-    public boolean isClosedOrPending() {
-        /*
-         * Lock on fdLock to ensure that we wait if a
-         * close is in progress.
-         */
-        synchronized (fdLock) {
-            if (closePending || (fd == null && fd1 == null)) {
-                return true;
-            } else {
-                return false;
-            }
-        }
-    }
-
-    /* Native methods */
-    
-    void socketCreate(boolean stream) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        TwoStacksPlainSocketImpl_c.socketCreate(env, this, stream);
-        env.ThrowPendingException();
-    }
-
-    void socketConnect(InetAddress address, int port, int timeout) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        TwoStacksPlainSocketImpl_c.socketConnect(env, this, address, port, timeout);
-        env.ThrowPendingException();
-    }
-    
-    void socketBind(InetAddress address, int localport, boolean exclBind) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        TwoStacksPlainSocketImpl_c.socketBind(env, this, address, localport, exclBind);
-        env.ThrowPendingException();
-    }
-    
-    void socketListen(int count) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        TwoStacksPlainSocketImpl_c.socketListen(env, this, count);
-        env.ThrowPendingException();
-    }
-
-    void socketAccept(SocketImpl socket) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        TwoStacksPlainSocketImpl_c.socketAccept(env, this, socket);
-        env.ThrowPendingException();
-    }
-
-    int socketAvailable() throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        int ret = TwoStacksPlainSocketImpl_c.socketAvailable(env, this);
-        env.ThrowPendingException();
-        return ret;
-    }
-
-    void socketClose0(boolean useDeferredClose) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        TwoStacksPlainSocketImpl_c.socketClose0(env, this, useDeferredClose);
-        env.ThrowPendingException();
-    }
-
-    void socketShutdown(int howto) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        TwoStacksPlainSocketImpl_c.socketShutdown(env, this, howto);
-        env.ThrowPendingException();
-    }
-
-    void socketNativeSetOption(int cmd, boolean on, Object value) throws SocketException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        TwoStacksPlainSocketImpl_c.socketNativeSetOption(env, this, cmd, on, value);
-        env.ThrowPendingException();
-    }
-
-    int socketGetOption(int opt, Object iaContainerObj) throws SocketException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        int ret = TwoStacksPlainSocketImpl_c.socketGetOption(env, this, opt, iaContainerObj);
-        env.ThrowPendingException();
-        return ret;
-    }
-
-    int socketGetOption1(int opt, Object iaContainerObj, FileDescriptor fd) throws SocketException {
-        throw new UnsatisfiedLinkError();
-    }
-
-    void socketSendUrgentData(int data) throws IOException {
-        ikvm.internal.JNI.JNIEnv env = new ikvm.internal.JNI.JNIEnv();
-        TwoStacksPlainSocketImpl_c.socketSendUrgentData(env, this, data);
-        env.ThrowPendingException();
-    }
-}
diff --git a/openjdk/java/net/TwoStacksPlainSocketImpl_c.java b/openjdk/java/net/TwoStacksPlainSocketImpl_c.java
deleted file mode 100644
index d86e84d0..00000000
--- a/openjdk/java/net/TwoStacksPlainSocketImpl_c.java
+++ /dev/null
@@ -1,1080 +0,0 @@
-/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.net;
-
-import java.io.FileDescriptor;
-import static ikvm.internal.JNI.*;
-import static ikvm.internal.Winsock.*;
-import static java.net.net_util_md.*;
-import static java.net.InetAddress.IPv4;
-import static java.net.InetAddress.IPv6;
-
-final class TwoStacksPlainSocketImpl_c
-{
-static final int JVM_IO_ERR = -1;
-static final int JVM_IO_INTR = -2;
-
-static final int java_net_SocketOptions_SO_TIMEOUT = SocketOptions.SO_TIMEOUT;
-static final int java_net_SocketOptions_SO_BINDADDR = SocketOptions.SO_BINDADDR;
-static final int java_net_SocketOptions_SO_SNDBUF = SocketOptions.SO_SNDBUF;
-static final int java_net_SocketOptions_SO_RCVBUF = SocketOptions.SO_RCVBUF;
-static final int java_net_SocketOptions_IP_TOS = SocketOptions.IP_TOS;
-static final int java_net_SocketOptions_SO_REUSEADDR = SocketOptions.SO_REUSEADDR;
-static final int java_net_SocketOptions_TCP_NODELAY = SocketOptions.TCP_NODELAY;
-static final int java_net_SocketOptions_SO_OOBINLINE = SocketOptions.SO_OOBINLINE;
-static final int java_net_SocketOptions_SO_KEEPALIVE = SocketOptions.SO_KEEPALIVE;
-static final int java_net_SocketOptions_SO_LINGER = SocketOptions.SO_LINGER;
-
-/*
-#include <windows.h>
-#include <winsock2.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <malloc.h>
-#include <sys/types.h>
-
-#include "java_net_SocketOptions.h"
-#include "java_net_TwoStacksPlainSocketImpl.h"
-#include "java_net_SocketImpl.h"
-#include "java_net_InetAddress.h"
-#include "java_io_FileDescriptor.h"
-#include "java_lang_Integer.h"
-
-#include "jvm.h"
-#include "net_util.h"
-#include "jni_util.h"
-*/
-
-/************************************************************************
- * TwoStacksPlainSocketImpl
- */
-
-/*
-static jfieldID IO_fd_fdID;
-
-jfieldID psi_fdID;
-jfieldID psi_fd1ID;
-jfieldID psi_addressID;
-jfieldID psi_portID;
-jfieldID psi_localportID;
-jfieldID psi_timeoutID;
-jfieldID psi_trafficClassID;
-jfieldID psi_serverSocketID;
-jfieldID psi_lastfdID;
-*/
-
-/*
- * the level of the TCP protocol for setsockopt and getsockopt
- * we only want to look this up once, from the static initializer
- * of TwoStacksPlainSocketImpl
- */
-static int tcp_level = -1;
-
-static cli.System.Net.Sockets.Socket getFD(JNIEnv env, TwoStacksPlainSocketImpl _this) {
-    FileDescriptor fdObj = _this.fd;
-
-    if (fdObj == NULL) {
-        return null;
-    }
-    return fdObj.getSocket();
-}
-
-static cli.System.Net.Sockets.Socket getFD1(JNIEnv env, TwoStacksPlainSocketImpl _this) {
-    FileDescriptor fdObj = _this.fd1;
-
-    if (fdObj == NULL) {
-        return null;
-    }
-    return fdObj.getSocket();
-}
-
-
-/*
- * The initProto function is called whenever TwoStacksPlainSocketImpl is
- * loaded, to cache fieldIds for efficiency. This is called everytime
- * the Java class is loaded.
- *
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    initProto
-
- * Signature: ()V
- */
-/*
-JNIEXPORT void JNICALL
-Java_java_net_TwoStacksPlainSocketImpl_initProto(JNIEnv *env, jclass cls) {
-
-    struct protoent *proto = getprotobyname("TCP");
-    tcp_level = (proto == 0 ? IPPROTO_TCP: proto->p_proto);
-
-    psi_fdID = (*env)->GetFieldID(env, cls , "fd", "Ljava/io/FileDescriptor;");
-    CHECK_NULL(psi_fdID);
-    psi_fd1ID =(*env)->GetFieldID(env, cls , "fd1", "Ljava/io/FileDescriptor;");
-    CHECK_NULL(psi_fd1ID);
-    psi_addressID = (*env)->GetFieldID(env, cls, "address",
-                                          "Ljava/net/InetAddress;");
-    CHECK_NULL(psi_addressID);
-    psi_portID = (*env)->GetFieldID(env, cls, "port", "I");
-    CHECK_NULL(psi_portID);
-    psi_lastfdID = (*env)->GetFieldID(env, cls, "lastfd", "I");
-    CHECK_NULL(psi_portID);
-    psi_localportID = (*env)->GetFieldID(env, cls, "localport", "I");
-    CHECK_NULL(psi_localportID);
-    psi_timeoutID = (*env)->GetFieldID(env, cls, "timeout", "I");
-    CHECK_NULL(psi_timeoutID);
-    psi_trafficClassID = (*env)->GetFieldID(env, cls, "trafficClass", "I");
-    CHECK_NULL(psi_trafficClassID);
-    psi_serverSocketID = (*env)->GetFieldID(env, cls, "serverSocket",
-                                            "Ljava/net/ServerSocket;");
-    CHECK_NULL(psi_serverSocketID);
-    IO_fd_fdID = NET_GetFileDescriptorID(env);
-    CHECK_NULL(IO_fd_fdID);
-}
-*/
-
-/*
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    socketCreate
- * Signature: (Z)V
- */
-static void socketCreate(JNIEnv env, TwoStacksPlainSocketImpl _this, boolean stream) {
-    FileDescriptor fdObj = _this.fd;
-    FileDescriptor fd1Obj = _this.fd1;
-    cli.System.Net.Sockets.Socket fd = null;
-    cli.System.Net.Sockets.Socket fd1 = null;
-
-    if (IS_NULL(fdObj)) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                        "null fd object");
-        return;
-    }
-    fd = socket(AF_INET, (stream ? SOCK_STREAM: SOCK_DGRAM), 0);
-    if (fd == INVALID_SOCKET) {
-        NET_ThrowCurrent(env, "create");
-        return;
-    } else {
-        /* Set socket attribute so it is not passed to any child process */
-        //SetHandleInformation((HANDLE)(UINT_PTR)fd, HANDLE_FLAG_INHERIT, FALSE);
-        fdObj.setSocket(fd);
-    }
-    if (ipv6_available()) {
-
-        if (IS_NULL(fd1Obj)) {
-            JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                            "null fd1 object");
-            fdObj.setSocket(null);
-            NET_SocketClose(fd);
-            return;
-        }
-        fd1 = socket(AF_INET6, (stream ? SOCK_STREAM: SOCK_DGRAM), 0);
-        if (fd1 == INVALID_SOCKET) {
-            NET_ThrowCurrent(env, "create");
-            fdObj.setSocket(null);
-            NET_SocketClose(fd);
-            return;
-        } else {
-            fd1Obj.setSocket(fd1);
-        }
-    } else {
-        _this.fd1 = null;
-    }
-}
-
-/*
- * inetAddress is the address object passed to the socket connect
- * call.
- *
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    socketConnect
- * Signature: (Ljava/net/InetAddress;I)V
- */
-static void socketConnect(JNIEnv env, TwoStacksPlainSocketImpl _this, InetAddress iaObj, int port, int timeout)
-{
-    int localport = _this.localport;
-
-    /* family and localport are int fields of iaObj */
-    int family;
-    cli.System.Net.Sockets.Socket fd = null;
-    cli.System.Net.Sockets.Socket fd1 = null;
-    boolean ipv6_supported = ipv6_available();
-
-    /* fd initially points to the IPv4 socket and fd1 to the IPv6 socket
-     * If we want to connect to IPv6 then we swap the two sockets/objects
-     * This way, fd is always the connected socket, and fd1 always gets closed.
-     */
-    FileDescriptor fdObj = _this.fd;
-    FileDescriptor fd1Obj = _this.fd1;
-
-    SOCKETADDRESS him;
-    him = new SOCKETADDRESS();
-
-    /* The result of the connection */
-    int connect_res;
-
-    if (!IS_NULL(fdObj)) {
-        fd = fdObj.getSocket();
-    }
-
-    if (ipv6_supported && !IS_NULL(fd1Obj)) {
-        fd1 = fd1Obj.getSocket();
-    }
-
-    if (IS_NULL(iaObj)) {
-        JNU_ThrowNullPointerException(env, "inet address argument is null.");
-        return;
-    }
-
-    if (NET_InetAddressToSockaddr(env, iaObj, port, him, JNI_FALSE) != 0) {
-      return;
-    }
-
-    family = him.him.sa_family;
-    if (family == AF_INET6) {
-        if (!ipv6_supported) {
-            JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                            "Protocol family not supported");
-            return;
-        } else {
-            if (fd1 == null) {
-                JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                                "Destination unreachable");
-                return;
-            }
-            /* close the v4 socket, and set fd to be the v6 socket */
-            _this.fd = fd1Obj;
-            _this.fd1 = null;
-            NET_SocketClose(fd);
-            fd = fd1; fdObj = fd1Obj;
-        }
-    } else {
-        if (fd1 != null) {
-            fd1Obj.setSocket(null);
-            NET_SocketClose(fd1);
-        }
-        if (fd == null) {
-            JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                            "Destination unreachable");
-            return;
-        }
-    }
-    _this.fd1 = null;
-
-    if (timeout <= 0) {
-        connect_res = connect(fd, him);
-        if (connect_res == SOCKET_ERROR) {
-            connect_res = WSAGetLastError();
-        }
-    } else {
-        int optval;
-
-        /* make socket non-blocking */
-        optval = 1;
-        ioctlsocket( fd, FIONBIO, optval );
-
-        /* initiate the connect */
-        connect_res = connect(fd, him);
-        if (connect_res == SOCKET_ERROR) {
-            if (WSAGetLastError() != WSAEWOULDBLOCK) {
-                connect_res = WSAGetLastError();
-            } else {
-                fd_set wr, ex;
-                wr = new fd_set(); ex = new fd_set();
-                timeval t = new timeval();
-
-                FD_ZERO(wr);
-                FD_ZERO(ex);
-                FD_SET(fd, wr);
-                FD_SET(fd, ex);
-                t.tv_sec = timeout / 1000;
-                t.tv_usec = (timeout % 1000) * 1000;
-
-                /*
-                 * Wait for timout, connection established or
-                 * connection failed.
-                 */
-                connect_res = select(null, wr, ex, t);
-
-                /*
-                 * Timeout before connection is established/failed so
-                 * we throw exception and shutdown input/output to prevent
-                 * socket from being used.
-                 * The socket should be closed immediately by the caller.
-                 */
-                if (connect_res == 0) {
-                    JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketTimeoutException",
-                                    "connect timed out");
-                    shutdown( fd, SD_BOTH );
-
-                     /* make socket blocking again - just in case */
-                    optval = 0;
-                    ioctlsocket( fd, FIONBIO, optval );
-                    return;
-                }
-
-                /*
-                 * We must now determine if the connection has been established
-                 * or if it has failed. The logic here is designed to work around
-                 * bug on Windows NT whereby using getsockopt to obtain the
-                 * last error (SO_ERROR) indicates there is no error. The workaround
-                 * on NT is to allow winsock to be scheduled and this is done by
-                 * yielding and retrying. As yielding is problematic in heavy
-                 * load conditions we attempt up to 3 times to get the error reason.
-                 */
-                if (!FD_ISSET(fd, ex)) {
-                    connect_res = 0;
-                } else {
-                    int retry;
-                    for (retry=0; retry<3; retry++) {
-                        int[] tmp = { 0 };
-                        NET_GetSockOpt(fd, SOL_SOCKET, SO_ERROR,
-                                       tmp);
-                        connect_res = tmp[0];
-                        if (connect_res != 0) {
-                            break;
-                        }
-                        Sleep(0);
-                    }
-
-                    if (connect_res == 0) {
-                        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                                        "Unable to establish connection");
-                        return;
-                    }
-                }
-            }
-        }
-
-        /* make socket blocking again */
-        optval = 0;
-        ioctlsocket(fd, FIONBIO, optval);
-    }
-
-    if (connect_res != 0) {
-        if (connect_res == WSAEADDRNOTAVAIL) {
-            JNU_ThrowByName(env, JNU_JAVANETPKG+"ConnectException",
-                "connect: Address is invalid on local machine, or port is not valid on remote machine");
-        } else {
-            NET_ThrowNew(env, connect_res, "connect");
-        }
-        return;
-    }
-
-    fdObj.setSocket(fd);
-
-    /* set the remote peer address and port */
-    _this.address = iaObj;
-    _this.port = port;
-
-    /*
-     * we need to initialize the local port field if bind was called
-     * previously to the connect (by the client) then localport field
-     * will already be initialized
-     */
-    if (localport == 0) {
-        /* Now that we're a connected socket, let's extract the port number
-         * that the system chose for us and store it in the Socket object.
-         */
-        if (getsockname(fd, him) == -1) {
-
-            if (WSAGetLastError() == WSAENOTSOCK) {
-                JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                        "Socket closed");
-            } else {
-                NET_ThrowCurrent(env, "getsockname failed");
-            }
-            return;
-        }
-        port = ntohs (GET_PORT(him));
-        _this.localport = port;
-    }
-}
-
-/*
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    socketBind
- * Signature: (Ljava/net/InetAddress;I)V
- */
-static void socketBind(JNIEnv env, TwoStacksPlainSocketImpl _this,
-                                         InetAddress iaObj, int localport,
-                                         boolean exclBind) {
-    FileDescriptor fdObj = _this.fd;
-    FileDescriptor fd1Obj = _this.fd1;
-    cli.System.Net.Sockets.Socket fd = null;
-    cli.System.Net.Sockets.Socket fd1 = null;
-    boolean ipv6_supported = ipv6_available();
-
-    /* family is an int field of iaObj */
-    int family;
-    int rv;
-
-    SOCKETADDRESS him;
-    him = new SOCKETADDRESS();
-
-    family = getInetAddress_family(env, iaObj);
-
-    if (family == IPv6 && !ipv6_supported) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                        "Protocol family not supported");
-        return;
-    }
-
-    if (IS_NULL(fdObj) || (ipv6_supported && IS_NULL(fd1Obj))) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                        "Socket closed");
-        return;
-    } else {
-        fd = fdObj.getSocket();
-        if (ipv6_supported) {
-            fd1 = fd1Obj.getSocket();
-        }
-    }
-    if (IS_NULL(iaObj)) {
-        JNU_ThrowNullPointerException(env, "inet address argument");
-        return;
-    }
-
-    if (NET_InetAddressToSockaddr(env, iaObj, localport,
-                          him, JNI_FALSE) != 0) {
-      return;
-    }
-    if (ipv6_supported) {
-        ipv6bind v6bind = new ipv6bind();
-        v6bind.addr = him;
-        v6bind.ipv4_fd = fd;
-        v6bind.ipv6_fd = fd1;
-        rv = NET_BindV6(v6bind, exclBind);
-        if (rv != -1) {
-            /* check if the fds have changed */
-            if (v6bind.ipv4_fd != fd) {
-                fd = v6bind.ipv4_fd;
-                if (fd == null) {
-                    /* socket is closed. */
-                    _this.fd = null;
-                } else {
-                    /* socket was re-created */
-                    fdObj.setSocket(fd);
-                }
-            }
-            if (v6bind.ipv6_fd != fd1) {
-                fd1 = v6bind.ipv6_fd;
-                if (fd1 == null) {
-                    /* socket is closed. */
-                    _this.fd1 = null;
-                } else {
-                    /* socket was re-created */
-                    fd1Obj.setSocket(fd1);
-                }
-            }
-        }
-    } else {
-        rv = NET_WinBind(fd, him, exclBind);
-    }
-
-    if (rv == -1) {
-        NET_ThrowCurrent(env, "JVM_Bind");
-        return;
-    }
-
-    /* set the address */
-    _this.address = iaObj;
-
-    /* intialize the local port */
-    if (localport == 0) {
-        /* Now that we're a bound socket, let's extract the port number
-         * that the system chose for us and store it in the Socket object.
-         */
-        int port;
-        fd = him.him.sa_family == AF_INET? fd: fd1;
-
-        if (getsockname(fd, him) == -1) {
-            NET_ThrowCurrent(env, "getsockname in plain socketBind");
-            return;
-        }
-        port = ntohs (GET_PORT (him));
-
-        _this.localport = port;
-    } else {
-        _this.localport = localport;
-    }
-}
-
-/*
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    socketListen
- * Signature: (I)V
- */
-static void socketListen (JNIEnv env, TwoStacksPlainSocketImpl _this, int count)
-{
-    /* this FileDescriptor fd field */
-    FileDescriptor fdObj = _this.fd;
-    FileDescriptor fd1Obj = _this.fd1;
-    InetAddress address;
-    /* fdObj's int fd field */
-    cli.System.Net.Sockets.Socket fd = null;
-    cli.System.Net.Sockets.Socket fd1 = null;
-    SOCKETADDRESS addr = new SOCKETADDRESS();
-
-    if (IS_NULL(fdObj) && IS_NULL(fd1Obj)) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                        "socket closed");
-        return;
-    }
-
-    if (!IS_NULL(fdObj)) {
-        fd = fdObj.getSocket();
-    }
-    /* Listen on V4 if address type is v4 or if v6 and address is ::0.
-     * Listen on V6 if address type is v6 or if v4 and address is 0.0.0.0.
-     * In cases, where we listen on one space only, we close the other socket.
-     */
-    address = _this.address;
-    if (IS_NULL(address)) {
-        JNU_ThrowNullPointerException(env, "socket address");
-        return;
-    }
-    if (NET_InetAddressToSockaddr(env, address, 0, addr,
-                                  JNI_FALSE) != 0) {
-      return;
-    }
-
-    if (addr.him.sa_family == AF_INET || IN6ADDR_ISANY(addr.him6)) {
-        /* listen on v4 */
-        if (listen(fd, count) == -1) {
-            NET_ThrowCurrent(env, "listen failed");
-        }
-    } else {
-        NET_SocketClose (fd);
-        _this.fd = null;
-    }
-    if (ipv6_available() && !IS_NULL(fd1Obj)) {
-        fd1 = fd1Obj.getSocket();
-        if (addr.him.sa_family == AF_INET6 || addr.him4.sin_addr.s_addr == INADDR_ANY) {
-            /* listen on v6 */
-            if (listen(fd1, count) == -1) {
-                NET_ThrowCurrent(env, "listen failed");
-            }
-        } else {
-            NET_SocketClose (fd1);
-            _this.fd1 = null;
-        }
-    }
-}
-
-/*
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    socketAccept
- * Signature: (Ljava/net/SocketImpl;)V
- */
-static void socketAccept(JNIEnv env, TwoStacksPlainSocketImpl _this, SocketImpl socket)
-{
-    /* fields on this */
-    int port;
-    int timeout = _this.timeout;
-    FileDescriptor fdObj = _this.fd;
-    FileDescriptor fd1Obj = _this.fd1;
-
-    /* the FileDescriptor field on socket */
-    FileDescriptor socketFdObj;
-
-    /* the InetAddress field on socket */
-    InetAddress socketAddressObj;
-
-    /* the fd int field on fdObj */
-    cli.System.Net.Sockets.Socket fd=null, fd1=null;
-
-    SOCKETADDRESS him;
-    him = new SOCKETADDRESS();
-
-    if (IS_NULL(fdObj) && IS_NULL(fd1Obj)) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                        "Socket closed");
-        return;
-    }
-    if (!IS_NULL(fdObj)) {
-        fd = fdObj.getSocket();
-    }
-    if (!IS_NULL(fd1Obj)) {
-        fd1 = fd1Obj.getSocket();
-    }
-    if (IS_NULL(socket)) {
-        JNU_ThrowNullPointerException(env, "socket is null");
-        return;
-    } else {
-        socketFdObj = socket.fd;
-        socketAddressObj = socket.address;
-    }
-    if ((IS_NULL(socketAddressObj)) || (IS_NULL(socketFdObj))) {
-        JNU_ThrowNullPointerException(env, "socket address or fd obj");
-        return;
-    }
-    if (fd != null && fd1 != null) {
-        fd_set rfds = new fd_set();
-        timeval t = new timeval();
-        cli.System.Net.Sockets.Socket lastfd, fd2;
-        FD_ZERO(rfds);
-        FD_SET(fd,rfds);
-        FD_SET(fd1,rfds);
-        if (timeout != 0) {
-            t.tv_sec = timeout/1000;
-            t.tv_usec = (timeout%1000)*1000;
-        } else {
-            t = null;
-        }
-        int res = select (rfds, null, null, t);
-        if (res == 0) {
-            JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketTimeoutException",
-                            "Accept timed out");
-            return;
-        } else if (res == 1) {
-            fd2 = FD_ISSET(fd, rfds)? fd: fd1;
-        } else if (res == 2) {
-            /* avoid starvation */
-            lastfd = _this.lastfd;
-            if (lastfd != null) {
-                fd2 = lastfd==fd? fd1: fd;
-            } else {
-                fd2 = fd;
-            }
-            _this.lastfd = fd2;
-        } else {
-            JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                            "select failed");
-            return;
-        }
-        fd = fd2;
-    } else {
-        int ret;
-        if (fd1 != null) {
-            fd = fd1;
-        }
-        if (timeout != 0) {
-            ret = NET_Timeout(fd, timeout);
-            if (ret == 0) {
-                JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketTimeoutException",
-                                "Accept timed out");
-                return;
-            } else if (ret == -1) {
-                JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException", "socket closed");
-            /* REMIND: SOCKET CLOSED PROBLEM */
-    /*        NET_ThrowCurrent(env, "Accept failed"); */
-                return;
-            } else if (ret == -2) {
-                JNU_ThrowByName(env, JNU_JAVAIOPKG+"InterruptedIOException",
-                                "operation interrupted");
-                return;
-            }
-        }
-    }
-    fd = accept(fd, him);
-    if (fd == null) {
-        /* REMIND: SOCKET CLOSED PROBLEM */
-        if (false) {
-            JNU_ThrowByName(env, JNU_JAVAIOPKG+"InterruptedIOException",
-                            "operation interrupted");
-        } else {
-            JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                            "socket closed");
-        }
-        return;
-    }
-    socketFdObj.setSocket(fd);
-
-    if (him.him.sa_family == AF_INET) {
-
-        /*
-         * fill up the remote peer port and address in the new socket structure
-         */
-        socketAddressObj = new Inet4Address(null, ntohl(him.him4.sin_addr.s_addr));
-        socket.address = socketAddressObj;
-    } else {
-        /* AF_INET6 -> Inet6Address */
-
-        // [IKVM] We need to convert scope_id 0 to -1 here, because for sin6_scope_id 0 means unspecified, whereas Java uses -1
-        int scopeId = him.him6.sin6_scope_id;
-        socketAddressObj = new Inet6Address(null, him.him6.sin6_addr, scopeId == 0 ? -1 : scopeId);
-    }
-    /* fields common to AF_INET and AF_INET6 */
-
-    port = ntohs (GET_PORT (him));
-    socket.port = port;
-    port = _this.localport;
-    socket.localport = port;
-    socket.address = socketAddressObj;
-}
-
-/*
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    socketAvailable
- * Signature: ()I
- */
-static int socketAvailable(JNIEnv env, TwoStacksPlainSocketImpl _this) {
-
-    int[] available = { -1 };
-    int res;
-    FileDescriptor fdObj = _this.fd;
-    cli.System.Net.Sockets.Socket fd;
-
-    if (IS_NULL(fdObj)) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException", "Socket closed");
-        return -1;
-    } else {
-        fd = fdObj.getSocket();
-    }
-    res = ioctlsocket(fd, FIONREAD, available);
-    /* if result isn't 0, it means an error */
-    if (res != 0) {
-        NET_ThrowNew(env, res, "socket available");
-    }
-    return available[0];
-}
-
-/*
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    socketClose
- * Signature: ()V
- */
-static void socketClose0(JNIEnv env, TwoStacksPlainSocketImpl _this, boolean useDeferredClose) {
-
-    FileDescriptor fdObj = _this.fd;
-    FileDescriptor fd1Obj = _this.fd1;
-    cli.System.Net.Sockets.Socket fd = null;
-    cli.System.Net.Sockets.Socket fd1 = null;
-
-    if (IS_NULL(fdObj) && IS_NULL(fd1Obj)) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                        "socket already closed");
-        return;
-    }
-    if (!IS_NULL(fdObj)) {
-        fd = fdObj.getSocket();
-    }
-    if (!IS_NULL(fd1Obj)) {
-        fd1 = fd1Obj.getSocket();
-    }
-    if (fd != null) {
-        fdObj.setSocket(null);
-        NET_SocketClose(fd);
-    }
-    if (fd1 != null) {
-        fd1Obj.setSocket(null);
-        NET_SocketClose(fd1);
-    }
-}
-
-/*
- * Socket options for plainsocketImpl
- *
- *
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    socketNativeSetOption
- * Signature: (IZLjava/lang/Object;)V
- */
-static void socketNativeSetOption(JNIEnv env, TwoStacksPlainSocketImpl _this, int cmd, boolean on, Object value) {
-    cli.System.Net.Sockets.Socket fd, fd1;
-    int[] level = new int[1];
-    int[] optname = new int[1];
-    Object optval;
-
-    /*
-     * Get SOCKET and check that it hasn't been closed
-     */
-    fd = getFD(env, _this);
-    fd1 = getFD1(env, _this);
-    if (fd == null && fd1 == null) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException", "Socket closed");
-        return;
-    }
-
-    /*
-     * SO_TIMEOUT is the socket option used to specify the timeout
-     * for ServerSocket.accept and Socket.getInputStream().read.
-     * It does not typically map to a native level socket option.
-     * For Windows we special-case this and use the SOL_SOCKET/SO_RCVTIMEO
-     * socket option to specify a receive timeout on the socket. This
-     * receive timeout is applicable to Socket only and the socket
-     * option should not be set on ServerSocket.
-     */
-    if (cmd == java_net_SocketOptions_SO_TIMEOUT) {
-
-        /*
-         * Don't enable the socket option on ServerSocket as it's
-         * meaningless (we don't receive on a ServerSocket).
-         */
-        Object ssObj = _this.serverSocket;
-        if (ssObj != NULL) {
-            return;
-        }
-
-        /*
-         * SO_RCVTIMEO is only supported on Microsoft's implementation
-         * of Windows Sockets so if WSAENOPROTOOPT returned then
-         * reset flag and timeout will be implemented using
-         * select() -- see SocketInputStream.socketRead.
-         */
-        if (isRcvTimeoutSupported) {
-            int timeout = ((Integer)value).intValue();
-
-            /*
-             * Disable SO_RCVTIMEO if timeout is <= 5 second.
-             */
-            if (timeout <= 5000) {
-                timeout = 0;
-            }
-
-            if (setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, timeout) < 0) {
-                if (WSAGetLastError() == WSAENOPROTOOPT) {
-                    isRcvTimeoutSupported = JNI_FALSE;
-                } else {
-                    NET_ThrowCurrent(env, "setsockopt SO_RCVTIMEO");
-                }
-            }
-            if (fd1 != null) {
-                if (setsockopt(fd1, SOL_SOCKET, SO_RCVTIMEO, timeout) < 0) {
-                    NET_ThrowCurrent(env, "setsockopt SO_RCVTIMEO");
-                }
-            }
-        }
-        return;
-    }
-
-    /*
-     * Map the Java level socket option to the platform specific
-     * level
-     */
-    if (NET_MapSocketOption(cmd, level, optname) != 0) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                        "Invalid option");
-        return;
-    }
-
-    switch (cmd) {
-
-        case java_net_SocketOptions_TCP_NODELAY :
-        case java_net_SocketOptions_SO_OOBINLINE :
-        case java_net_SocketOptions_SO_KEEPALIVE :
-        case java_net_SocketOptions_SO_REUSEADDR :
-            optval = on;
-            break;
-
-        case java_net_SocketOptions_SO_SNDBUF :
-        case java_net_SocketOptions_SO_RCVBUF :
-        case java_net_SocketOptions_IP_TOS :
-            optval = ((Integer)value).intValue();
-            break;
-
-        case java_net_SocketOptions_SO_LINGER :
-            {
-                linger ling = new linger();
-                if (on) {
-                    ling.l_onoff = 1;
-                    ling.l_linger = ((Integer)value).intValue();
-                } else {
-                    ling.l_onoff = 0;
-                    ling.l_linger = 0;
-                }
-                optval = ling;
-            }
-            break;
-
-        default: /* shouldn't get here */
-            JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                "Option not supported by TwoStacksPlainSocketImpl");
-            return;
-    }
-
-    if (fd != null) {
-        if (NET_SetSockOpt(fd, level[0], optname[0], optval) < 0) {
-            NET_ThrowCurrent(env, "setsockopt");
-        }
-    }
-
-    if (fd1 != null) {
-        if (NET_SetSockOpt(fd1, level[0], optname[0], optval) < 0) {
-            NET_ThrowCurrent(env, "setsockopt");
-        }
-    }
-}
-
-
-/*
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    socketGetOption
- * Signature: (I)I
- */
-static int socketGetOption(JNIEnv env, TwoStacksPlainSocketImpl _this, int opt, Object iaContainerObj) {
-
-    cli.System.Net.Sockets.Socket fd, fd1;
-    int[] level = new int[1];
-    int[] optname = new int[1];
-    Object optval;
-
-    /*
-     * Get SOCKET and check it hasn't been closed
-     */
-    fd = getFD(env, _this);
-    fd1 = getFD1(env, _this);
-
-    if (fd == null && fd1 == null) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException", "Socket closed");
-        return -1;
-    }
-    if (fd == null) {
-        fd = fd1;
-    }
-
-    /* For IPv6, we assume both sockets have the same setting always */
-
-    /*
-     * SO_BINDADDR isn't a socket option
-     */
-    if (opt == java_net_SocketOptions_SO_BINDADDR) {
-        SOCKETADDRESS him;
-        him = new SOCKETADDRESS();
-        int[] port = { 0 };
-        InetAddress iaObj;
-
-        if (fd == null) {
-            /* must be an IPV6 only socket. Case where both sockets are != -1
-             * is handled in java
-             */
-            fd = getFD1 (env, _this);
-        }
-
-        if (getsockname(fd, him) < 0) {
-            NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG+"SocketException",
-                             "Error getting socket name");
-            return -1;
-        }
-        iaObj = NET_SockaddrToInetAddress(him, port);
-        ((InetAddressContainer)iaContainerObj).addr = iaObj;
-        return 0; /* notice change from before */
-    }
-
-    /*
-     * Map the Java level socket option to the platform specific
-     * level and option name.
-     */
-    if (NET_MapSocketOption(opt, level, optname) != 0) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException", "Invalid option");
-        return -1;
-    }
-
-    /*
-     * Args are int except for SO_LINGER
-     */
-    if (opt == java_net_SocketOptions_SO_LINGER) {
-        optval = new linger();
-    } else {
-        optval = new int[1];
-    }
-
-    if (NET_GetSockOpt(fd, level[0], optname[0], optval) < 0) {
-        NET_ThrowCurrent(env, "getsockopt");
-        return -1;
-    }
-
-    switch (opt) {
-        case java_net_SocketOptions_SO_LINGER:
-            return (((linger)optval).l_onoff != 0 ? ((linger)optval).l_linger: -1);
-
-        case java_net_SocketOptions_SO_SNDBUF:
-        case java_net_SocketOptions_SO_RCVBUF:
-        case java_net_SocketOptions_IP_TOS:
-            return ((int[])optval)[0];
-
-        case java_net_SocketOptions_TCP_NODELAY :
-        case java_net_SocketOptions_SO_OOBINLINE :
-        case java_net_SocketOptions_SO_KEEPALIVE :
-        case java_net_SocketOptions_SO_REUSEADDR :
-            return (((int[])optval)[0] == 0) ? -1 : 1;
-
-        default: /* shouldn't get here */
-            JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                "Option not supported by TwoStacksPlainSocketImpl");
-            return -1;
-    }
-}
-
-/*
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    socketShutdown
- * Signature: (I)V
- */
-static void socketShutdown(JNIEnv env, TwoStacksPlainSocketImpl _this, int howto)
-{
-
-    FileDescriptor fdObj = _this.fd;
-    cli.System.Net.Sockets.Socket fd;
-
-    /*
-     * WARNING: THIS NEEDS LOCKING. ALSO: SHOULD WE CHECK for fd being
-     * -1 already?
-     */
-    if (IS_NULL(fdObj)) {
-        JNU_ThrowByName(env, JNU_JAVANETPKG+"SocketException",
-                        "socket already closed");
-        return;
-    } else {
-        fd = fdObj.getSocket();
-    }
-    shutdown(fd, howto);
-}
-
-/*
- * Class:     java_net_TwoStacksPlainSocketImpl
- * Method:    socketSendUrgentData
- * Signature: (B)V
- */
-static void socketSendUrgentData(JNIEnv env, TwoStacksPlainSocketImpl _this, int data) {
-    /* The fd field */
-    FileDescriptor fdObj = _this.fd;
-    int n;
-    cli.System.Net.Sockets.Socket fd;
-
-    if (IS_NULL(fdObj)) {
-        JNU_ThrowByName(env, "java/net/SocketException", "Socket closed");
-        return;
-    } else {
-        fd = fdObj.getSocket();
-        /* Bug 4086704 - If the Socket associated with this file descriptor
-         * was closed (sysCloseFD), the the file descriptor is set to -1.
-         */
-        if (fd == null) {
-            JNU_ThrowByName(env, "java/net/SocketException", "Socket closed");
-            return;
-        }
-
-    }
-    n = send(fd, new byte[] { (byte)data }, 1, MSG_OOB);
-    if (n == JVM_IO_ERR) {
-        NET_ThrowCurrent(env, "send");
-        return;
-    }
-    if (n == JVM_IO_INTR) {
-        JNU_ThrowByName(env, "java/io/InterruptedIOException", null);
-        return;
-    }
-}
-}
diff --git a/openjdk/java/net/net_util_md.java b/openjdk/java/net/net_util_md.java
deleted file mode 100644
index 724ba4cc..00000000
--- a/openjdk/java/net/net_util_md.java
+++ /dev/null
@@ -1,884 +0,0 @@
-/*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.net;
-
-import java.io.FileDescriptor;
-import cli.System.Net.IPAddress;
-import cli.System.Net.IPEndPoint;
-import static ikvm.internal.JNI.*;
-import static ikvm.internal.Winsock.*;
-
-final class net_util_md
-{
-    private net_util_md() { }
-
-    static final int INADDR_ANY = 0;
-
-    static final int IPTOS_TOS_MASK = 0x1e;
-    static final int IPTOS_PREC_MASK = 0xe0;
-
-    static boolean isRcvTimeoutSupported = true;
-
-    /*
-     * Table of Windows Sockets errors, the specific exception we
-     * throw for the error, and the error text.
-     *
-     * Note that this table excludes OS dependent errors.
-     *
-     * Latest list of Windows Sockets errors can be found at :-
-     * http://msdn.microsoft.com/library/psdk/winsock/errors_3wc2.htm
-     */
-    private static class WinsockError
-    {
-        final int errCode;
-        final int exc;
-        final String errString;
-
-        WinsockError(int errCode, int exc, String errString)
-        {
-            this.errCode = errCode;
-            this.exc = exc;
-            this.errString = errString;
-        }
-    }
-
-    private static final int Exception_BindException = 1;
-    private static final int Exception_ConnectException = 2;
-    private static final int Exception_NoRouteToHostException = 3;
-
-    private static final WinsockError[] winsock_errors = {
-        new WinsockError(WSAEACCES,                0,      "Permission denied"),
-        new WinsockError(WSAEADDRINUSE,            Exception_BindException,        "Address already in use"),
-        new WinsockError(WSAEADDRNOTAVAIL,         Exception_BindException,        "Cannot assign requested address"),
-        new WinsockError(WSAEAFNOSUPPORT,          0,      "Address family not supported by protocol family"),
-        new WinsockError(WSAEALREADY,              0,      "Operation already in progress"),
-        new WinsockError(WSAECONNABORTED,          0,      "Software caused connection abort"),
-        new WinsockError(WSAECONNREFUSED,          Exception_ConnectException,     "Connection refused"),
-        new WinsockError(WSAECONNRESET,            0,      "Connection reset by peer"),
-        new WinsockError(WSAEDESTADDRREQ,          0,      "Destination address required"),
-        new WinsockError(WSAEFAULT,                0,      "Bad address"),
-        new WinsockError(WSAEHOSTDOWN,             0,      "Host is down"),
-        new WinsockError(WSAEHOSTUNREACH,          Exception_NoRouteToHostException,       "No route to host"),
-        new WinsockError(WSAEINPROGRESS,           0,      "Operation now in progress"),
-        new WinsockError(WSAEINTR,                 0,      "Interrupted function call"),
-        new WinsockError(WSAEINVAL,                0,      "Invalid argument"),
-        new WinsockError(WSAEISCONN,               0,      "Socket is already connected"),
-        new WinsockError(WSAEMFILE,                0,      "Too many open files"),
-        new WinsockError(WSAEMSGSIZE,              0,      "The message is larger than the maximum supported by the underlying transport"),
-        new WinsockError(WSAENETDOWN,              0,      "Network is down"),
-        new WinsockError(WSAENETRESET,             0,      "Network dropped connection on reset"),
-        new WinsockError(WSAENETUNREACH,           0,      "Network is unreachable"),
-        new WinsockError(WSAENOBUFS,               0,      "No buffer space available (maximum connections reached?)"),
-        new WinsockError(WSAENOPROTOOPT,           0,      "Bad protocol option"),
-        new WinsockError(WSAENOTCONN,              0,      "Socket is not connected"),
-        new WinsockError(WSAENOTSOCK,              0,      "Socket operation on nonsocket"),
-        new WinsockError(WSAEOPNOTSUPP,            0,      "Operation not supported"),
-        new WinsockError(WSAEPFNOSUPPORT,          0,      "Protocol family not supported"),
-        new WinsockError(WSAEPROCLIM,              0,      "Too many processes"),
-        new WinsockError(WSAEPROTONOSUPPORT,       0,      "Protocol not supported"),
-        new WinsockError(WSAEPROTOTYPE,            0,      "Protocol wrong type for socket"),
-        new WinsockError(WSAESHUTDOWN,             0,      "Cannot send after socket shutdown"),
-        new WinsockError(WSAESOCKTNOSUPPORT,       0,      "Socket type not supported"),
-        new WinsockError(WSAETIMEDOUT,             Exception_ConnectException,     "Connection timed out"),
-        new WinsockError(WSATYPE_NOT_FOUND,        0,      "Class type not found"),
-        new WinsockError(WSAEWOULDBLOCK,           0,      "Resource temporarily unavailable"),
-        new WinsockError(WSAHOST_NOT_FOUND,        0,      "Host not found"),
-        new WinsockError(WSA_NOT_ENOUGH_MEMORY,    0,      "Insufficient memory available"),
-        new WinsockError(WSANOTINITIALISED,        0,      "Successful WSAStartup not yet performed"),
-        new WinsockError(WSANO_DATA,               0,      "Valid name, no data record of requested type"),
-        new WinsockError(WSANO_RECOVERY,           0,      "This is a nonrecoverable error"),
-        new WinsockError(WSASYSNOTREADY,           0,      "Network subsystem is unavailable"),
-        new WinsockError(WSATRY_AGAIN,             0,      "Nonauthoritative host not found"),
-        new WinsockError(WSAVERNOTSUPPORTED,       0,      "Winsock.dll version out of range"),
-        new WinsockError(WSAEDISCON,               0,      "Graceful shutdown in progress"),
-        new WinsockError(WSA_OPERATION_ABORTED,    0,      "Overlapped operation aborted")
-    };
-
-    /*
-     * Since winsock doesn't have the equivalent of strerror(errno)
-     * use table to lookup error text for the error.
-     */
-    static SocketException NET_ThrowNew(int errorNum, String msg)
-    {
-        int i;
-        int table_size = winsock_errors.length;
-        int excP = 0;
-        String fullMsg;
-
-        if (msg == null) {
-            msg = "no further information";
-        }
-
-        /*
-         * Check table for known winsock errors
-         */
-        i=0;
-        while (i < table_size) {
-            if (errorNum == winsock_errors[i].errCode) {
-                break;
-            }
-            i++;
-        }
-
-        /*
-         * If found get pick the specific exception and error
-         * message corresponding to this error.
-         */
-        if (i < table_size) {
-            excP = winsock_errors[i].exc;
-            fullMsg = winsock_errors[i].errString + ": " + msg;
-        } else {
-            fullMsg = "Unrecognized Windows Sockets error: " + errorNum + ": " + msg;
-        }
-
-        /*
-         * Throw SocketException if no specific exception for this
-         * error.
-         */
-        switch (excP) {
-            case Exception_BindException:
-                return new BindException(fullMsg);
-            case Exception_ConnectException:
-                return new ConnectException(fullMsg);
-            case Exception_NoRouteToHostException:
-                return new NoRouteToHostException(fullMsg);
-            default:
-                return new SocketException(fullMsg);
-        }
-    }
-
-    static void NET_ThrowNew(JNIEnv env, int errorNum, String msg)
-    {
-        env.Throw(NET_ThrowNew(errorNum, msg));
-    }
-
-    static SocketException NET_ThrowCurrent(String msg)
-    {
-        return NET_ThrowNew(WSAGetLastError(), msg);
-    }
-
-    static void NET_ThrowCurrent(JNIEnv env, String msg)
-    {
-        env.Throw(NET_ThrowCurrent(msg));
-    }
-
-    /*
-     * Return the default TOS value
-     */
-    static int NET_GetDefaultTOS() {
-        // we always use the "default" default...
-        return 0;
-    }
-
-    /*
-     * Map the Java level socket option to the platform specific
-     * level and option name.
-     */
-
-    private static final class sockopts {
-        int cmd;
-        int level;
-        int optname;
-
-        sockopts(int cmd, int level, int optname) {
-            this.cmd = cmd;
-            this.level = level;
-            this.optname = optname;
-        }
-    }
-
-    private static final sockopts opts[] = {
-        new sockopts(SocketOptions.TCP_NODELAY,   IPPROTO_TCP,    TCP_NODELAY ),
-        new sockopts(SocketOptions.SO_OOBINLINE,  SOL_SOCKET,     SO_OOBINLINE ),
-        new sockopts(SocketOptions.SO_LINGER,     SOL_SOCKET,     SO_LINGER ),
-        new sockopts(SocketOptions.SO_SNDBUF,     SOL_SOCKET,     SO_SNDBUF ),
-        new sockopts(SocketOptions.SO_RCVBUF,     SOL_SOCKET,     SO_RCVBUF ),
-        new sockopts(SocketOptions.SO_KEEPALIVE,  SOL_SOCKET,     SO_KEEPALIVE ),
-        new sockopts(SocketOptions.SO_REUSEADDR,  SOL_SOCKET,     SO_REUSEADDR ),
-        new sockopts(SocketOptions.SO_BROADCAST,  SOL_SOCKET,     SO_BROADCAST ),
-        new sockopts(SocketOptions.IP_MULTICAST_IF,   IPPROTO_IP, IP_MULTICAST_IF ),
-        new sockopts(SocketOptions.IP_MULTICAST_LOOP, IPPROTO_IP, IP_MULTICAST_LOOP ),
-        new sockopts(SocketOptions.IP_TOS,            IPPROTO_IP, IP_TOS ),
-
-    };
-
-    /* call NET_MapSocketOptionV6 for the IPv6 fd only
-     * and NET_MapSocketOption for the IPv4 fd
-     */
-    static int NET_MapSocketOptionV6(int cmd, int[] level, int[] optname) {
-
-        switch (cmd) {
-            case SocketOptions.IP_MULTICAST_IF:
-            case SocketOptions.IP_MULTICAST_IF2:
-                level[0] = IPPROTO_IPV6;
-                optname[0] = IPV6_MULTICAST_IF;
-                return 0;
-
-            case SocketOptions.IP_MULTICAST_LOOP:
-                level[0] = IPPROTO_IPV6;
-                optname[0] = IPV6_MULTICAST_LOOP;
-                return 0;
-        }
-        return NET_MapSocketOption (cmd, level, optname);
-    }
-
-    static int NET_MapSocketOption(int cmd, int[] level, int[] optname) {
-        /*
-         * Map the Java level option to the native level
-         */
-        for (int i=0; i<opts.length; i++) {
-            if (cmd == opts[i].cmd) {
-                level[0] = opts[i].level;
-                optname[0] = opts[i].optname;
-                return 0;
-            }
-        }
-
-        /* not found */
-        return -1;
-    }
-
-    static int NET_SetSockOpt(cli.System.Net.Sockets.Socket s, int level, int optname, Object optval)
-    {
-        int rv;
-
-        if (level == IPPROTO_IP && optname == IP_TOS) {
-            int tos = (Integer)optval;
-            tos &= (IPTOS_TOS_MASK | IPTOS_PREC_MASK);
-            optval = tos;
-        }
-
-        if (optname == SO_REUSEADDR) {
-            /*
-             * Do not set SO_REUSEADDE if SO_EXCLUSIVEADDUSE is already set
-             */
-            int[] parg = new int[1];
-            rv = NET_GetSockOpt(s, SOL_SOCKET, SO_EXCLUSIVEADDRUSE, parg);
-            if (rv == 0 && parg[0] == 1) {
-                return rv;
-            }
-        }
-
-        rv = setsockopt(s, level, optname, optval);
-
-        if (rv == SOCKET_ERROR) {
-            /*
-             * IP_TOS & IP_MULTICAST_LOOP can't be set on some versions
-             * of Windows.
-             */
-            if ((WSAGetLastError() == WSAENOPROTOOPT) &&
-                (level == IPPROTO_IP) &&
-                (optname == IP_TOS || optname == IP_MULTICAST_LOOP)) {
-                rv = 0;
-            }
-
-            /*
-             * IP_TOS can't be set on unbound UDP sockets.
-             */
-            if ((WSAGetLastError() == WSAEINVAL) &&
-                (level == IPPROTO_IP) &&
-                (optname == IP_TOS)) {
-                rv = 0;
-            }
-        }
-
-        return rv;
-    }
-
-    /*
-     * Wrapper for setsockopt dealing with Windows specific issues :-
-     *
-     * IP_TOS is not supported on some versions of Windows so
-     * instead return the default value for the OS.
-     */
-    static int NET_GetSockOpt(cli.System.Net.Sockets.Socket s, int level, int optname, Object optval)
-    {
-        int rv;
-
-        rv = getsockopt(s, level, optname, optval);
-
-
-        /*
-         * IPPROTO_IP/IP_TOS is not supported on some Windows
-         * editions so return the default type-of-service
-         * value.
-         */
-        if (rv == SOCKET_ERROR) {
-
-            if (WSAGetLastError() == WSAENOPROTOOPT &&
-                level == IPPROTO_IP && optname == IP_TOS) {
-
-                ((int[])optval)[0] = NET_GetDefaultTOS();
-
-                rv = 0;
-            }
-        }
-
-        return rv;
-    }
-
-    /*
-     * Sets SO_ECLUSIVEADDRUSE if SO_REUSEADDR is not already set.
-     */
-    static void setExclusiveBind(cli.System.Net.Sockets.Socket fd) {
-        int[] parg = new int[1];
-        int rv = 0;
-        rv = NET_GetSockOpt(fd, SOL_SOCKET, SO_REUSEADDR, parg);
-        if (rv == 0 && parg[0] == 0) {
-            rv = NET_SetSockOpt(fd, SOL_SOCKET, SO_EXCLUSIVEADDRUSE, 1);
-        }
-    }
-
-    /*
-     * Wrapper for bind winsock call - transparent converts an
-     * error related to binding to a port that has exclusive access
-     * into an error indicating the port is in use (facilitates
-     * better error reporting).
-     */
-    static int NET_Bind(cli.System.Net.Sockets.Socket s, SOCKETADDRESS him)
-    {
-        int rv;
-        rv = bind(s, him);
-
-        if (rv == SOCKET_ERROR) {
-            /*
-             * If bind fails with WSAEACCES it means that a privileged
-             * process has done an exclusive bind (NT SP4/2000/XP only).
-             */
-            if (WSAGetLastError() == WSAEACCES) {
-                WSASetLastError(WSAEADDRINUSE);
-            }
-        }
-
-        return rv;
-    }
-
-    /*
-     * Wrapper for NET_Bind call. Sets SO_EXCLUSIVEADDRUSE
-     * if required, and then calls NET_BIND
-     */
-    static int NET_WinBind(cli.System.Net.Sockets.Socket s, SOCKETADDRESS him, boolean exclBind)
-    {
-        if (exclBind == JNI_TRUE)
-            setExclusiveBind(s);
-        return NET_Bind(s, him);
-    }
-
-    static int NET_SocketClose(cli.System.Net.Sockets.Socket fd) {
-        linger l = new linger();
-        int ret;
-        if (getsockopt(fd, SOL_SOCKET, SO_LINGER, l) == 0) {
-            if (l.l_onoff == 0) {
-                WSASendDisconnect(fd);
-            }
-        }
-        ret = closesocket (fd);
-        return ret;
-    }
-
-    static int NET_Timeout(cli.System.Net.Sockets.Socket fd, long timeout) {
-        int ret;
-        fd_set tbl = new fd_set();
-        timeval t = new timeval();
-        t.tv_sec = timeout / 1000;
-        t.tv_usec = (timeout % 1000) * 1000;
-        FD_ZERO(tbl);
-        FD_SET(fd, tbl);
-        ret = select (tbl, null, null, t);
-        return ret;
-    }
-
-    /*
-     * differs from NET_Timeout() as follows:
-     *
-     * If timeout = -1, it blocks forever.
-     *
-     * returns 1 or 2 depending if only one or both sockets
-     * fire at same time.
-     *
-     * *fdret is (one of) the active fds. If both sockets
-     * fire at same time, *fdret = fd always.
-     */
-    static int NET_Timeout2(cli.System.Net.Sockets.Socket fd, cli.System.Net.Sockets.Socket fd1, long timeout, cli.System.Net.Sockets.Socket[] fdret) {
-        int ret;
-        fd_set tbl = new fd_set();
-        timeval t = new timeval();
-        if (timeout == -1) {
-            t = null;
-        } else {
-            t.tv_sec = timeout / 1000;
-            t.tv_usec = (timeout % 1000) * 1000;
-        }
-        FD_ZERO(tbl);
-        FD_SET(fd, tbl);
-        FD_SET(fd1, tbl);
-        ret = select (tbl, null, null, t);
-        switch (ret) {
-        case 0:
-            return 0; /* timeout */
-        case 1:
-            if (FD_ISSET (fd, tbl)) {
-                fdret[0]= fd;
-            } else {
-                fdret[0]= fd1;
-            }
-            return 1;
-        case 2:
-            fdret[0]= fd;
-            return 2;
-        }
-        return -1;
-    }
-
-    /*
-     * if ipv6 is available, call NET_BindV6 to bind to the required address/port.
-     * Because the same port number may need to be reserved in both v4 and v6 space,
-     * this may require socket(s) to be re-opened. Therefore, all of this information
-     * is passed in and returned through the ipv6bind structure.
-     *
-     * If the request is to bind to a specific address, then this (by definition) means
-     * only bind in either v4 or v6, and this is just the same as normal. ie. a single
-     * call to bind() will suffice. The other socket is closed in this case.
-     *
-     * The more complicated case is when the requested address is ::0 or 0.0.0.0.
-     *
-     * Two further cases:
-     * 2. If the reqeusted port is 0 (ie. any port) then we try to bind in v4 space
-     *    first with a wild-card port argument. We then try to bind in v6 space
-     *    using the returned port number. If this fails, we repeat the process
-     *    until a free port common to both spaces becomes available.
-     *
-     * 3. If the requested port is a specific port, then we just try to get that
-     *    port in both spaces, and if it is not free in both, then the bind fails.
-     *
-     * On failure, sockets are closed and an error returned with CLOSE_SOCKETS_AND_RETURN
-     */
-
-    static class ipv6bind {
-        SOCKETADDRESS addr;
-        cli.System.Net.Sockets.Socket ipv4_fd;
-        cli.System.Net.Sockets.Socket ipv6_fd;
-    }
-
-    private static int CLOSE_SOCKETS_AND_RETURN(
-        cli.System.Net.Sockets.Socket fd,
-        cli.System.Net.Sockets.Socket ofd,
-        cli.System.Net.Sockets.Socket close_fd,
-        cli.System.Net.Sockets.Socket close_ofd,
-        ipv6bind b) {
-        if (fd != null) {
-            closesocket (fd);
-        }
-        if (ofd != null) {
-            closesocket (ofd);
-        }
-        if (close_fd != null) {
-            closesocket (close_fd);
-        }
-        if (close_ofd != null) {
-            closesocket (close_ofd);
-        }
-        b.ipv4_fd = b.ipv6_fd = null;
-        return SOCKET_ERROR;
-    }
-
-    static int NET_BindV6(ipv6bind b, boolean exclBind) {
-        cli.System.Net.Sockets.Socket fd = null;
-        cli.System.Net.Sockets.Socket ofd = null;
-        int rv;
-        /* need to defer close until new sockets created */
-        cli.System.Net.Sockets.Socket close_fd = null;
-        cli.System.Net.Sockets.Socket close_ofd = null;
-
-        SOCKETADDRESS oaddr = new SOCKETADDRESS();
-        int family = b.addr.him.sa_family;
-        int ofamily;
-        int port;
-        int bound_port;
-
-        if (family == AF_INET && (b.addr.him4.sin_addr.s_addr != INADDR_ANY)) {
-            /* bind to v4 only */
-            int ret;
-            ret = NET_WinBind (b.ipv4_fd, b.addr, exclBind);
-            if (ret == SOCKET_ERROR) {
-                return CLOSE_SOCKETS_AND_RETURN(fd, ofd, close_fd, close_ofd, b);
-            }
-            closesocket (b.ipv6_fd);
-            b.ipv6_fd = null;
-            return 0;
-        }
-        if (family == AF_INET6 && (!IN6ADDR_ISANY(b.addr))) {
-            /* bind to v6 only */
-            int ret;
-            ret = NET_WinBind (b.ipv6_fd, b.addr, exclBind);
-            if (ret == SOCKET_ERROR) {
-                return CLOSE_SOCKETS_AND_RETURN(fd, ofd, close_fd, close_ofd, b);
-            }
-            closesocket (b.ipv4_fd);
-            b.ipv4_fd = null;
-            return 0;
-        }
-
-        /* We need to bind on both stacks, with the same port number */
-
-        if (family == AF_INET) {
-            ofamily = AF_INET6;
-            fd = b.ipv4_fd;
-            ofd = b.ipv6_fd;
-            port = GET_PORT (b.addr);
-            oaddr.set(new IPEndPoint(IPAddress.IPv6Any, htons(port)));
-        } else {
-            ofamily = AF_INET;
-            ofd = b.ipv4_fd;
-            fd = b.ipv6_fd;
-            port = GET_PORT (b.addr);
-            oaddr.set(new IPEndPoint(IPAddress.Any, htons(port)));
-        }
-
-        rv = NET_WinBind (fd, b.addr, exclBind);
-        if (rv == SOCKET_ERROR) {
-            return CLOSE_SOCKETS_AND_RETURN(fd, ofd, close_fd, close_ofd, b);
-        }
-
-        /* get the port and set it in the other address */
-        if (getsockname(fd, b.addr) == -1) {
-            return CLOSE_SOCKETS_AND_RETURN(fd, ofd, close_fd, close_ofd, b);
-        }
-        bound_port = b.addr.sin_port;
-        oaddr.sin_port = bound_port;
-        if ((rv=NET_Bind (ofd, oaddr)) == SOCKET_ERROR) {
-
-            /* no retries unless, the request was for any free port */
-
-            if (port != 0) {
-                return CLOSE_SOCKETS_AND_RETURN(fd, ofd, close_fd, close_ofd, b);
-            }
-
-            int sotype = fd.get_SocketType().Value;
-
-            /* 50 is an arbitrary limit, just to ensure that this
-             * cannot be an endless loop. Would expect socket creation to
-             * succeed sooner.
-             */
-            for (int retries = 0; retries < 50 /*SOCK_RETRIES*/; retries ++) {
-                close_fd = fd;
-                fd = null;
-                close_ofd = ofd;
-                ofd = null;
-                b.ipv4_fd = null;
-                b.ipv6_fd = null;
-
-                /* create two new sockets */
-                fd = socket (family, sotype, 0);
-                if (fd == INVALID_SOCKET) {
-                    return CLOSE_SOCKETS_AND_RETURN(fd, ofd, close_fd, close_ofd, b);
-                }
-                ofd = socket (ofamily, sotype, 0);
-                if (ofd == INVALID_SOCKET) {
-                    return CLOSE_SOCKETS_AND_RETURN(fd, ofd, close_fd, close_ofd, b);
-                }
-
-                /* bind random port on first socket */
-                oaddr.sin_port = 0;
-                rv = NET_WinBind (ofd, oaddr,
-                                  exclBind);
-                if (rv == SOCKET_ERROR) {
-                    return CLOSE_SOCKETS_AND_RETURN(fd, ofd, close_fd, close_ofd, b);
-                }
-                /* close the original pair of sockets before continuing */
-                closesocket (close_fd);
-                closesocket (close_ofd);
-                close_fd = close_ofd = null;
-
-                /* bind new port on second socket */
-                if (getsockname(ofd, oaddr) == -1) {
-                    return CLOSE_SOCKETS_AND_RETURN(fd, ofd, close_fd, close_ofd, b);
-                }
-                bound_port = oaddr.sin_port;
-                b.addr.sin_port = bound_port;
-                rv = NET_WinBind (fd, b.addr,
-                                  exclBind);
-
-                if (rv != SOCKET_ERROR) {
-                    if (family == AF_INET) {
-                        b.ipv4_fd = fd;
-                        b.ipv6_fd = ofd;
-                    } else {
-                        b.ipv4_fd = ofd;
-                        b.ipv6_fd = fd;
-                    }
-                    return 0;
-                }
-            }
-            return CLOSE_SOCKETS_AND_RETURN(fd, ofd, close_fd, close_ofd, b);
-        }
-        return 0;
-    }
-
-    /* If address types is IPv6, then IPv6 must be available. Otherwise
-     * no address can be generated. In the case of an IPv4 Inetaddress this
-     * method will return an IPv4 mapped address where IPv6 is available and
-     * v4MappedAddress is TRUE. Otherwise it will return a sockaddr_in
-     * structure for an IPv4 InetAddress.
-    */
-    static int NET_InetAddressToSockaddr(JNIEnv env, InetAddress iaObj, int port, SOCKETADDRESS him, boolean v4MappedAddress) {
-        if (iaObj.family == InetAddress.IPv4) {
-            him.set(new IPEndPoint(new IPAddress(htonl(iaObj.address) & 0xFFFFFFFFL), port));
-            return 0;
-        } else {
-            Inet6Address v6addr = (Inet6Address)iaObj;
-            int scope = v6addr.getScopeId();
-            if (scope == 0) {
-                him.set(new IPEndPoint(new IPAddress(v6addr.ipaddress), port));
-                return 0;
-            } else {
-                him.set(new IPEndPoint(new IPAddress(v6addr.ipaddress, scope & 0xFFFFFFFFL), port));
-                return 0;
-            }
-        }
-    }
-
-    static int NET_GetPortFromSockaddr(SOCKETADDRESS him) {
-        return ntohs(GET_PORT(him));
-    }
-
-    static boolean NET_IsIPv4Mapped(byte[] caddr) {
-        int i;
-        for (i = 0; i < 10; i++) {
-            if (caddr[i] != 0x00) {
-                return false;
-            }
-        }
-
-        if (((caddr[10] & 0xff) == 0xff) && ((caddr[11] & 0xff) == 0xff)) {
-            return true;
-        }
-        return false;
-    }
-
-    static int NET_IPv4MappedToIPv4(byte[] caddr) {
-        return ((caddr[12] & 0xff) << 24) | ((caddr[13] & 0xff) << 16) | ((caddr[14] & 0xff) << 8)
-            | (caddr[15] & 0xff);
-    }
-
-    static boolean NET_IsEqual(byte[] caddr1, byte[] caddr2) {
-        int i;
-        for (i = 0; i < 16; i++) {
-            if (caddr1[i] != caddr2[i]) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    static int getScopeID (SOCKETADDRESS him) {
-        return him.him6.sin6_scope_id;
-    }
-
-    static boolean cmpScopeID (int scope, SOCKETADDRESS him) {
-        return him.him6.sin6_scope_id == scope;
-    }
-
-    /* these methods are not from net_util_md.c */
-
-    static boolean ipv6_available() {
-        return InetAddressImplFactory.isIPv6Supported();
-    }
-
-    static boolean IS_NULL(Object obj) {
-        return obj == null;
-    }
-
-    static boolean IN6ADDR_ISANY(SOCKETADDRESS him) {
-        if (him.sa_family != AF_INET6) {
-            return false;
-        }
-        byte[] addr = him.him6.sin6_addr;
-        byte b = 0;
-        for (int i = 0; i < addr.length; i++) {
-            b |= addr[i];
-        }
-        return b == 0;
-    }
-
-    static boolean NET_SockaddrEqualsInetAddress(SOCKETADDRESS him, InetAddress iaObj) {
-        int family = iaObj.family == InetAddress.IPv4 ? AF_INET : AF_INET6;
-
-        if (him.sa_family == AF_INET6) {
-            byte[] caddrNew = him.him6.sin6_addr;
-                if (NET_IsIPv4Mapped(caddrNew)) {
-                    int addrNew;
-                    int addrCur;
-                    if (family == AF_INET6) {
-                        return false;
-                    }
-                    addrNew = NET_IPv4MappedToIPv4(caddrNew);
-                    addrCur = iaObj.address;
-                    if (addrNew == addrCur) {
-                        return true;
-                    } else {
-                        return false;
-                    }
-                } else {
-                    byte[] caddrCur;
-                    int scope;
-
-                    if (family == AF_INET) {
-                        return false;
-                    }
-                    scope = ((Inet6Address)iaObj).getScopeId();
-                    caddrCur = ((Inet6Address)iaObj).ipaddress;
-                    if (NET_IsEqual(caddrNew, caddrCur) && cmpScopeID(scope, him)) {
-                        return true;
-                    } else {
-                        return false;
-                    }
-                }
-        } else {
-            int addrNew, addrCur;
-            if (family != AF_INET) {
-                return false;
-            }
-            addrNew = ntohl(him.him4.sin_addr.s_addr);
-            addrCur = iaObj.address;
-            if (addrNew == addrCur) {
-                return true;
-            } else {
-                return false;
-            }
-        }
-    }
-
-    static InetAddress NET_SockaddrToInetAddress(JNIEnv env, SOCKETADDRESS him, int[] port) {
-        return NET_SockaddrToInetAddress(him, port);
-    }
-
-    static InetAddress NET_SockaddrToInetAddress(SOCKETADDRESS him, int[] port) {
-        InetAddress iaObj;
-        if (him.sa_family == AF_INET6) {
-            byte[] caddr = him.him6.sin6_addr;
-            if (NET_IsIPv4Mapped(caddr)) {
-                iaObj = new Inet4Address(null, NET_IPv4MappedToIPv4(caddr));
-            } else {
-                int scope = getScopeID(him);
-                iaObj = new Inet6Address(null, caddr, scope > 0 ? scope : -1);
-            }
-            port[0] = ntohs(him.him6.sin_port);
-        } else {
-            iaObj = new Inet4Address(null, ntohl(him.him4.sin_addr.s_addr));
-            port[0] = ntohs(him.him4.sin_port);
-        }
-        return iaObj;
-    }
-
-    static void NET_ThrowByNameWithLastError(JNIEnv env, String exceptionClass, String message) {
-        JNU_ThrowByName(env, exceptionClass, "errno: " + WSAGetLastError() + ", error: " + message + "\n");
-    }
-
-    static boolean IN_MULTICAST(int ipv4address) {
-        return ((ipv4address >> 24) & 0xf0) == 0xe0;
-    }
-
-    static boolean IN6_IS_ADDR_MULTICAST(in6_addr address) {
-        return (address.s6_bytes()[0] & 0xff) == 0xff;
-    }
-
-    static final class SOCKETADDRESS implements IIPEndPointWrapper {
-        final SOCKETADDRESS him = this;
-        final SOCKETADDRESS him4 = this;
-        final SOCKETADDRESS him6 = this;
-        final SOCKETADDRESS sin_addr = this;
-        int sa_family;
-        int sin_port;
-        int s_addr;
-        byte[] sin6_addr;
-        int sin6_scope_id;
-
-        public void set(IPEndPoint ep) {
-            if (ep == null) {
-                sa_family = 0;
-                sin_port = 0;
-                s_addr = 0;
-                sin6_addr = null;
-                sin6_scope_id = 0;
-            } else {
-                sa_family = ep.get_AddressFamily().Value;
-                sin_port = htons(ep.get_Port());
-                if (sa_family == AF_INET) {
-                    s_addr = (int)ep.get_Address().get_Address();
-                    sin6_addr = null;
-                    sin6_scope_id = 0;
-                } else {
-                    s_addr = 0;
-                    IPAddress addr = ep.get_Address();
-                    sin6_addr = addr.GetAddressBytes();
-                    sin6_scope_id = (int)addr.get_ScopeId();
-                }
-            }
-        }
-
-        public IPEndPoint get() {
-            if (sa_family == AF_INET) {
-                return new IPEndPoint(new IPAddress(s_addr & 0xFFFFFFFFL), ntohs(sin_port));
-            } else if (sa_family == AF_INET6) {
-                IPAddress addr;
-                if (sin6_addr == null) {
-                    addr = IPAddress.IPv6Any;
-                } else {
-                    addr = new IPAddress(sin6_addr, sin6_scope_id & 0xFFFFFFFFL);
-                }
-                return new IPEndPoint(addr, ntohs(sin_port));
-            } else {
-                return null;
-            }
-        }
-    }
-
-    static int GET_PORT(SOCKETADDRESS sockaddr) {
-        return sockaddr.sin_port;
-    }
-
-    static void Sleep(int ms) {
-        cli.System.Threading.Thread.Sleep(ms);
-    }
-
-    static cli.System.Net.Sockets.Socket NET_Socket (int domain, int type, int protocol) {
-        cli.System.Net.Sockets.Socket sock;
-        sock = socket (domain, type, protocol);
-        if (sock != INVALID_SOCKET) {
-            //SetHandleInformation((HANDLE)(uintptr_t)sock, HANDLE_FLAG_INHERIT, FALSE);
-        }
-        return sock;
-    }
-
-    static int getInetAddress_addr(JNIEnv env, InetAddress iaObj) {
-        return iaObj.address;
-    }
-
-    static int getInetAddress_family(JNIEnv env, InetAddress iaObj) {
-        return iaObj.family;
-    }
-}
diff --git a/openjdk/java/nio/Bits.java b/openjdk/java/nio/Bits.java
deleted file mode 100644
index cea374fc..00000000
--- a/openjdk/java/nio/Bits.java
+++ /dev/null
@@ -1,850 +0,0 @@
-/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.nio;
-
-import java.security.AccessController;
-import sun.misc.Unsafe;
-import sun.misc.VM;
-
-/**
- * Access to bits, native and otherwise.
- */
-
-class Bits {                            // package-private
-
-    private Bits() { }
-
-
-    // -- Swapping --
-
-    static short swap(short x) {
-        return Short.reverseBytes(x);
-    }
-
-    static char swap(char x) {
-        return Character.reverseBytes(x);
-    }
-
-    static int swap(int x) {
-        return Integer.reverseBytes(x);
-    }
-
-    static long swap(long x) {
-        return Long.reverseBytes(x);
-    }
-
-
-    // -- get/put char --
-
-    static private char makeChar(byte b1, byte b0) {
-        return (char)((b1 << 8) | (b0 & 0xff));
-    }
-
-    static char getCharL(ByteBuffer bb, int bi) {
-        return makeChar(bb._get(bi + 1),
-                        bb._get(bi    ));
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static char getCharL(long a) {
-        return makeChar(_get(a + 1),
-                        _get(a    ));
-    }
-
-    static char getCharB(ByteBuffer bb, int bi) {
-        return makeChar(bb._get(bi    ),
-                        bb._get(bi + 1));
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static char getCharB(long a) {
-        return makeChar(_get(a    ),
-                        _get(a + 1));
-    }
-
-    static char getChar(ByteBuffer bb, int bi, boolean bigEndian) {
-        return bigEndian ? getCharB(bb, bi) : getCharL(bb, bi);
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static char getChar(long a, boolean bigEndian) {
-        return bigEndian ? getCharB(a) : getCharL(a);
-    }
-
-    private static byte char1(char x) { return (byte)(x >> 8); }
-    private static byte char0(char x) { return (byte)(x     ); }
-
-    static void putCharL(ByteBuffer bb, int bi, char x) {
-        bb._put(bi    , char0(x));
-        bb._put(bi + 1, char1(x));
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static void putCharL(long a, char x) {
-        _put(a    , char0(x));
-        _put(a + 1, char1(x));
-    }
-
-    static void putCharB(ByteBuffer bb, int bi, char x) {
-        bb._put(bi    , char1(x));
-        bb._put(bi + 1, char0(x));
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static void putCharB(long a, char x) {
-        _put(a    , char1(x));
-        _put(a + 1, char0(x));
-    }
-
-    static void putChar(ByteBuffer bb, int bi, char x, boolean bigEndian) {
-        if (bigEndian)
-            putCharB(bb, bi, x);
-        else
-            putCharL(bb, bi, x);
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static void putChar(long a, char x, boolean bigEndian) {
-        if (bigEndian)
-            putCharB(a, x);
-        else
-            putCharL(a, x);
-    }
-
-
-    // -- get/put short --
-
-    static private short makeShort(byte b1, byte b0) {
-        return (short)((b1 << 8) | (b0 & 0xff));
-    }
-
-    static short getShortL(ByteBuffer bb, int bi) {
-        return makeShort(bb._get(bi + 1),
-                         bb._get(bi    ));
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static short getShortL(long a) {
-        return makeShort(_get(a + 1),
-                         _get(a    ));
-    }
-
-    static short getShortB(ByteBuffer bb, int bi) {
-        return makeShort(bb._get(bi    ),
-                         bb._get(bi + 1));
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static short getShortB(long a) {
-        return makeShort(_get(a    ),
-                         _get(a + 1));
-    }
-
-    static short getShort(ByteBuffer bb, int bi, boolean bigEndian) {
-        return bigEndian ? getShortB(bb, bi) : getShortL(bb, bi);
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static short getShort(long a, boolean bigEndian) {
-        return bigEndian ? getShortB(a) : getShortL(a);
-    }
-
-    private static byte short1(short x) { return (byte)(x >> 8); }
-    private static byte short0(short x) { return (byte)(x     ); }
-
-    static void putShortL(ByteBuffer bb, int bi, short x) {
-        bb._put(bi    , short0(x));
-        bb._put(bi + 1, short1(x));
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static void putShortL(long a, short x) {
-        _put(a    , short0(x));
-        _put(a + 1, short1(x));
-    }
-
-    static void putShortB(ByteBuffer bb, int bi, short x) {
-        bb._put(bi    , short1(x));
-        bb._put(bi + 1, short0(x));
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static void putShortB(long a, short x) {
-        _put(a    , short1(x));
-        _put(a + 1, short0(x));
-    }
-
-    static void putShort(ByteBuffer bb, int bi, short x, boolean bigEndian) {
-        if (bigEndian)
-            putShortB(bb, bi, x);
-        else
-            putShortL(bb, bi, x);
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static void putShort(long a, short x, boolean bigEndian) {
-        if (bigEndian)
-            putShortB(a, x);
-        else
-            putShortL(a, x);
-    }
-
-
-    // -- get/put int --
-
-    static private int makeInt(byte b3, byte b2, byte b1, byte b0) {
-        return (((b3       ) << 24) |
-                ((b2 & 0xff) << 16) |
-                ((b1 & 0xff) <<  8) |
-                ((b0 & 0xff)      ));
-    }
-
-    static int getIntL(ByteBuffer bb, int bi) {
-        return makeInt(bb._get(bi + 3),
-                       bb._get(bi + 2),
-                       bb._get(bi + 1),
-                       bb._get(bi    ));
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static int getIntL(long a) {
-        return makeInt(_get(a + 3),
-                       _get(a + 2),
-                       _get(a + 1),
-                       _get(a    ));
-    }
-
-    static int getIntB(ByteBuffer bb, int bi) {
-        return makeInt(bb._get(bi    ),
-                       bb._get(bi + 1),
-                       bb._get(bi + 2),
-                       bb._get(bi + 3));
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static int getIntB(long a) {
-        return makeInt(_get(a    ),
-                       _get(a + 1),
-                       _get(a + 2),
-                       _get(a + 3));
-    }
-
-    static int getInt(ByteBuffer bb, int bi, boolean bigEndian) {
-        return bigEndian ? getIntB(bb, bi) : getIntL(bb, bi) ;
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static int getInt(long a, boolean bigEndian) {
-        return bigEndian ? getIntB(a) : getIntL(a) ;
-    }
-
-    private static byte int3(int x) { return (byte)(x >> 24); }
-    private static byte int2(int x) { return (byte)(x >> 16); }
-    private static byte int1(int x) { return (byte)(x >>  8); }
-    private static byte int0(int x) { return (byte)(x      ); }
-
-    static void putIntL(ByteBuffer bb, int bi, int x) {
-        bb._put(bi + 3, int3(x));
-        bb._put(bi + 2, int2(x));
-        bb._put(bi + 1, int1(x));
-        bb._put(bi    , int0(x));
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static void putIntL(long a, int x) {
-        _put(a + 3, int3(x));
-        _put(a + 2, int2(x));
-        _put(a + 1, int1(x));
-        _put(a    , int0(x));
-    }
-
-    static void putIntB(ByteBuffer bb, int bi, int x) {
-        bb._put(bi    , int3(x));
-        bb._put(bi + 1, int2(x));
-        bb._put(bi + 2, int1(x));
-        bb._put(bi + 3, int0(x));
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static void putIntB(long a, int x) {
-        _put(a    , int3(x));
-        _put(a + 1, int2(x));
-        _put(a + 2, int1(x));
-        _put(a + 3, int0(x));
-    }
-
-    static void putInt(ByteBuffer bb, int bi, int x, boolean bigEndian) {
-        if (bigEndian)
-            putIntB(bb, bi, x);
-        else
-            putIntL(bb, bi, x);
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static void putInt(long a, int x, boolean bigEndian) {
-        if (bigEndian)
-            putIntB(a, x);
-        else
-            putIntL(a, x);
-    }
-
-
-    // -- get/put long --
-
-    static private long makeLong(byte b7, byte b6, byte b5, byte b4,
-                                 byte b3, byte b2, byte b1, byte b0)
-    {
-        return ((((long)b7       ) << 56) |
-                (((long)b6 & 0xff) << 48) |
-                (((long)b5 & 0xff) << 40) |
-                (((long)b4 & 0xff) << 32) |
-                (((long)b3 & 0xff) << 24) |
-                (((long)b2 & 0xff) << 16) |
-                (((long)b1 & 0xff) <<  8) |
-                (((long)b0 & 0xff)      ));
-    }
-
-    static long getLongL(ByteBuffer bb, int bi) {
-        return makeLong(bb._get(bi + 7),
-                        bb._get(bi + 6),
-                        bb._get(bi + 5),
-                        bb._get(bi + 4),
-                        bb._get(bi + 3),
-                        bb._get(bi + 2),
-                        bb._get(bi + 1),
-                        bb._get(bi    ));
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static long getLongL(long a) {
-        return makeLong(_get(a + 7),
-                        _get(a + 6),
-                        _get(a + 5),
-                        _get(a + 4),
-                        _get(a + 3),
-                        _get(a + 2),
-                        _get(a + 1),
-                        _get(a    ));
-    }
-
-    static long getLongB(ByteBuffer bb, int bi) {
-        return makeLong(bb._get(bi    ),
-                        bb._get(bi + 1),
-                        bb._get(bi + 2),
-                        bb._get(bi + 3),
-                        bb._get(bi + 4),
-                        bb._get(bi + 5),
-                        bb._get(bi + 6),
-                        bb._get(bi + 7));
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static long getLongB(long a) {
-        return makeLong(_get(a    ),
-                        _get(a + 1),
-                        _get(a + 2),
-                        _get(a + 3),
-                        _get(a + 4),
-                        _get(a + 5),
-                        _get(a + 6),
-                        _get(a + 7));
-    }
-
-    static long getLong(ByteBuffer bb, int bi, boolean bigEndian) {
-        return bigEndian ? getLongB(bb, bi) : getLongL(bb, bi);
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static long getLong(long a, boolean bigEndian) {
-        return bigEndian ? getLongB(a) : getLongL(a);
-    }
-
-    private static byte long7(long x) { return (byte)(x >> 56); }
-    private static byte long6(long x) { return (byte)(x >> 48); }
-    private static byte long5(long x) { return (byte)(x >> 40); }
-    private static byte long4(long x) { return (byte)(x >> 32); }
-    private static byte long3(long x) { return (byte)(x >> 24); }
-    private static byte long2(long x) { return (byte)(x >> 16); }
-    private static byte long1(long x) { return (byte)(x >>  8); }
-    private static byte long0(long x) { return (byte)(x      ); }
-
-    static void putLongL(ByteBuffer bb, int bi, long x) {
-        bb._put(bi + 7, long7(x));
-        bb._put(bi + 6, long6(x));
-        bb._put(bi + 5, long5(x));
-        bb._put(bi + 4, long4(x));
-        bb._put(bi + 3, long3(x));
-        bb._put(bi + 2, long2(x));
-        bb._put(bi + 1, long1(x));
-        bb._put(bi    , long0(x));
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static void putLongL(long a, long x) {
-        _put(a + 7, long7(x));
-        _put(a + 6, long6(x));
-        _put(a + 5, long5(x));
-        _put(a + 4, long4(x));
-        _put(a + 3, long3(x));
-        _put(a + 2, long2(x));
-        _put(a + 1, long1(x));
-        _put(a    , long0(x));
-    }
-
-    static void putLongB(ByteBuffer bb, int bi, long x) {
-        bb._put(bi    , long7(x));
-        bb._put(bi + 1, long6(x));
-        bb._put(bi + 2, long5(x));
-        bb._put(bi + 3, long4(x));
-        bb._put(bi + 4, long3(x));
-        bb._put(bi + 5, long2(x));
-        bb._put(bi + 6, long1(x));
-        bb._put(bi + 7, long0(x));
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static void putLongB(long a, long x) {
-        _put(a    , long7(x));
-        _put(a + 1, long6(x));
-        _put(a + 2, long5(x));
-        _put(a + 3, long4(x));
-        _put(a + 4, long3(x));
-        _put(a + 5, long2(x));
-        _put(a + 6, long1(x));
-        _put(a + 7, long0(x));
-    }
-
-    static void putLong(ByteBuffer bb, int bi, long x, boolean bigEndian) {
-        if (bigEndian)
-            putLongB(bb, bi, x);
-        else
-            putLongL(bb, bi, x);
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static void putLong(long a, long x, boolean bigEndian) {
-        if (bigEndian)
-            putLongB(a, x);
-        else
-            putLongL(a, x);
-    }
-
-
-    // -- get/put float --
-
-    static float getFloatL(ByteBuffer bb, int bi) {
-        return Float.intBitsToFloat(getIntL(bb, bi));
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static float getFloatL(long a) {
-        return Float.intBitsToFloat(getIntL(a));
-    }
-
-    static float getFloatB(ByteBuffer bb, int bi) {
-        return Float.intBitsToFloat(getIntB(bb, bi));
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static float getFloatB(long a) {
-        return Float.intBitsToFloat(getIntB(a));
-    }
-
-    static float getFloat(ByteBuffer bb, int bi, boolean bigEndian) {
-        return bigEndian ? getFloatB(bb, bi) : getFloatL(bb, bi);
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static float getFloat(long a, boolean bigEndian) {
-        return bigEndian ? getFloatB(a) : getFloatL(a);
-    }
-
-    static void putFloatL(ByteBuffer bb, int bi, float x) {
-        putIntL(bb, bi, Float.floatToRawIntBits(x));
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static void putFloatL(long a, float x) {
-        putIntL(a, Float.floatToRawIntBits(x));
-    }
-
-    static void putFloatB(ByteBuffer bb, int bi, float x) {
-        putIntB(bb, bi, Float.floatToRawIntBits(x));
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static void putFloatB(long a, float x) {
-        putIntB(a, Float.floatToRawIntBits(x));
-    }
-
-    static void putFloat(ByteBuffer bb, int bi, float x, boolean bigEndian) {
-        if (bigEndian)
-            putFloatB(bb, bi, x);
-        else
-            putFloatL(bb, bi, x);
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static void putFloat(long a, float x, boolean bigEndian) {
-        if (bigEndian)
-            putFloatB(a, x);
-        else
-            putFloatL(a, x);
-    }
-
-
-    // -- get/put double --
-
-    static double getDoubleL(ByteBuffer bb, int bi) {
-        return Double.longBitsToDouble(getLongL(bb, bi));
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static double getDoubleL(long a) {
-        return Double.longBitsToDouble(getLongL(a));
-    }
-
-    static double getDoubleB(ByteBuffer bb, int bi) {
-        return Double.longBitsToDouble(getLongB(bb, bi));
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static double getDoubleB(long a) {
-        return Double.longBitsToDouble(getLongB(a));
-    }
-
-    static double getDouble(ByteBuffer bb, int bi, boolean bigEndian) {
-        return bigEndian ? getDoubleB(bb, bi) : getDoubleL(bb, bi);
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static double getDouble(long a, boolean bigEndian) {
-        return bigEndian ? getDoubleB(a) : getDoubleL(a);
-    }
-
-    static void putDoubleL(ByteBuffer bb, int bi, double x) {
-        putLongL(bb, bi, Double.doubleToRawLongBits(x));
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static void putDoubleL(long a, double x) {
-        putLongL(a, Double.doubleToRawLongBits(x));
-    }
-
-    static void putDoubleB(ByteBuffer bb, int bi, double x) {
-        putLongB(bb, bi, Double.doubleToRawLongBits(x));
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static void putDoubleB(long a, double x) {
-        putLongB(a, Double.doubleToRawLongBits(x));
-    }
-
-    static void putDouble(ByteBuffer bb, int bi, double x, boolean bigEndian) {
-        if (bigEndian)
-            putDoubleB(bb, bi, x);
-        else
-            putDoubleL(bb, bi, x);
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static void putDouble(long a, double x, boolean bigEndian) {
-        if (bigEndian)
-            putDoubleB(a, x);
-        else
-            putDoubleL(a, x);
-    }
-
-
-    // -- Unsafe access --
-
-    private static final Unsafe unsafe = Unsafe.getUnsafe();
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    private static byte _get(long a) {
-        return unsafe.getByte(a);
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    private static void _put(long a, byte b) {
-        unsafe.putByte(a, b);
-    }
-
-    static Unsafe unsafe() {
-        return unsafe;
-    }
-
-
-    // -- Processor and memory-system properties --
-
-    private static final ByteOrder byteOrder;
-
-    static ByteOrder byteOrder() {
-        if (byteOrder == null)
-            throw new Error("Unknown byte order");
-        return byteOrder;
-    }
-
-    static {
-        if (cli.System.BitConverter.IsLittleEndian) {
-            byteOrder = ByteOrder.LITTLE_ENDIAN;
-        } else {
-            byteOrder = ByteOrder.BIG_ENDIAN;
-        }
-    }
-
-
-    private static int pageSize = -1;
-
-    static int pageSize() {
-        if (pageSize == -1)
-            pageSize = unsafe().pageSize();
-        return pageSize;
-    }
-
-    static int pageCount(long size) {
-        return (int)(size + (long)pageSize() - 1L) / pageSize();
-    }
-
-    private static boolean unaligned;
-    private static boolean unalignedKnown = false;
-
-    static boolean unaligned() {
-        if (unalignedKnown)
-            return unaligned;
-        String arch = AccessController.doPrivileged(
-            new sun.security.action.GetPropertyAction("os.arch"));
-        unaligned = arch.equals("i386") || arch.equals("x86")
-            || arch.equals("amd64") || arch.equals("x86_64");
-        unalignedKnown = true;
-        return unaligned;
-    }
-
-
-    // -- Direct memory management --
-
-    // A user-settable upper limit on the maximum amount of allocatable
-    // direct buffer memory.  This value may be changed during VM
-    // initialization if it is launched with "-XX:MaxDirectMemorySize=<size>".
-    private static volatile long maxMemory = VM.maxDirectMemory();
-    private static volatile long reservedMemory;
-    private static volatile long totalCapacity;
-    private static volatile long count;
-    private static boolean memoryLimitSet = false;
-
-    // These methods should be called whenever direct memory is allocated or
-    // freed.  They allow the user to control the amount of direct memory
-    // which a process may access.  All sizes are specified in bytes.
-    static void reserveMemory(long size, int cap) {
-        synchronized (Bits.class) {
-            if (!memoryLimitSet && VM.isBooted()) {
-                maxMemory = VM.maxDirectMemory();
-                memoryLimitSet = true;
-            }
-            // -XX:MaxDirectMemorySize limits the total capacity rather than the
-            // actual memory usage, which will differ when buffers are page
-            // aligned.
-            if (cap <= maxMemory - totalCapacity) {
-                reservedMemory += size;
-                totalCapacity += cap;
-                count++;
-                return;
-            }
-        }
-
-        System.gc();
-        try {
-            Thread.sleep(100);
-        } catch (InterruptedException x) {
-            // Restore interrupt status
-            Thread.currentThread().interrupt();
-        }
-        synchronized (Bits.class) {
-            if (totalCapacity + cap > maxMemory)
-                throw new OutOfMemoryError("Direct buffer memory");
-            reservedMemory += size;
-            totalCapacity += cap;
-            count++;
-        }
-
-    }
-
-    static synchronized void unreserveMemory(long size, int cap) {
-        if (reservedMemory > 0) {
-            reservedMemory -= size;
-            totalCapacity -= cap;
-            count--;
-            assert (reservedMemory > -1);
-        }
-    }
-
-    // -- Monitoring of direct buffer usage --
-
-    static {
-        // setup access to this package in SharedSecrets
-        sun.misc.SharedSecrets.setJavaNioAccess(
-            new sun.misc.JavaNioAccess() {
-                @Override
-                public sun.misc.JavaNioAccess.BufferPool getDirectBufferPool() {
-                    return new sun.misc.JavaNioAccess.BufferPool() {
-                        @Override
-                        public String getName() {
-                            return "direct";
-                        }
-                        @Override
-                        public long getCount() {
-                            return Bits.count;
-                        }
-                        @Override
-                        public long getTotalCapacity() {
-                            return Bits.totalCapacity;
-                        }
-                        @Override
-                        public long getMemoryUsed() {
-                            return Bits.reservedMemory;
-                        }
-                    };
-                }
-                @Override
-                public ByteBuffer newDirectByteBuffer(long addr, int cap, Object ob) {
-                    return new DirectByteBuffer(addr, cap, ob);
-                }
-                @Override
-                public void truncate(Buffer buf) {
-                    buf.truncate();
-                }
-        });
-    }
-
-    // -- Bulk get/put acceleration --
-
-    // These numbers represent the point at which we have empirically
-    // determined that the average cost of a JNI call exceeds the expense
-    // of an element by element copy.  These numbers may change over time.
-    static final int JNI_COPY_TO_ARRAY_THRESHOLD   = 6;
-    static final int JNI_COPY_FROM_ARRAY_THRESHOLD = 6;
-
-    // This number limits the number of bytes to copy per call to Unsafe's
-    // copyMemory method. A limit is imposed to allow for safepoint polling
-    // during a large copy
-    static final long UNSAFE_COPY_THRESHOLD = 1024L * 1024L;
-
-    // These methods do no bounds checking.  Verification that the copy will not
-    // result in memory corruption should be done prior to invocation.
-    // All positions and lengths are specified in bytes.
-
-    /**
-     * Copy from given source array to destination address.
-     *
-     * @param   src
-     *          source array
-     * @param   srcBaseOffset
-     *          offset of first element of storage in source array
-     * @param   srcPos
-     *          offset within source array of the first element to read
-     * @param   dstAddr
-     *          destination address
-     * @param   length
-     *          number of bytes to copy
-     */
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static void copyFromArray(Object src, long srcBaseOffset, long srcPos,
-                              long dstAddr, long length)
-    {
-        long offset = srcBaseOffset + srcPos;
-        while (length > 0) {
-            long size = (length > UNSAFE_COPY_THRESHOLD) ? UNSAFE_COPY_THRESHOLD : length;
-            unsafe.copyMemory(src, offset, null, dstAddr, size);
-            length -= size;
-            offset += size;
-            dstAddr += size;
-        }
-    }
-
-    /**
-     * Copy from source address into given destination array.
-     *
-     * @param   srcAddr
-     *          source address
-     * @param   dst
-     *          destination array
-     * @param   dstBaseOffset
-     *          offset of first element of storage in destination array
-     * @param   dstPos
-     *          offset within destination array of the first element to write
-     * @param   length
-     *          number of bytes to copy
-     */
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static void copyToArray(long srcAddr, Object dst, long dstBaseOffset, long dstPos,
-                            long length)
-    {
-        long offset = dstBaseOffset + dstPos;
-        while (length > 0) {
-            long size = (length > UNSAFE_COPY_THRESHOLD) ? UNSAFE_COPY_THRESHOLD : length;
-            unsafe.copyMemory(null, srcAddr, dst, offset, size);
-            length -= size;
-            srcAddr += size;
-            offset += size;
-        }
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static void copyFromCharArray(Object src, long srcPos, long dstAddr,
-                                  long length)
-    {
-        copyFromShortArray(src, srcPos, dstAddr, length);
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static void copyToCharArray(long srcAddr, Object dst, long dstPos,
-                                long length)
-    {
-        copyToShortArray(srcAddr, dst, dstPos, length);
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static native void copyFromShortArray(Object src, long srcPos, long dstAddr,
-                                          long length);
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static native void copyToShortArray(long srcAddr, Object dst, long dstPos,
-                                        long length);
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static native void copyFromIntArray(Object src, long srcPos, long dstAddr,
-                                        long length);
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static native void copyToIntArray(long srcAddr, Object dst, long dstPos,
-                                      long length);
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static native void copyFromLongArray(Object src, long srcPos, long dstAddr,
-                                         long length);
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static native void copyToLongArray(long srcAddr, Object dst, long dstPos,
-                                       long length);
-
-}
diff --git a/openjdk/java/security/AccessController.java b/openjdk/java/security/AccessController.java
deleted file mode 100644
index 19d4af96..00000000
--- a/openjdk/java/security/AccessController.java
+++ /dev/null
@@ -1,633 +0,0 @@
-/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.security;
-
-import ikvm.internal.CallerID;
-import sun.misc.Unsafe;
-import sun.security.util.Debug;
-import sun.reflect.CallerSensitive;
-import sun.reflect.Reflection;
-
-/**
- * <p> The AccessController class is used for access control operations
- * and decisions.
- *
- * <p> More specifically, the AccessController class is used for
- * three purposes:
- *
- * <ul>
- * <li> to decide whether an access to a critical system
- * resource is to be allowed or denied, based on the security policy
- * currently in effect,<p>
- * <li>to mark code as being "privileged", thus affecting subsequent
- * access determinations, and<p>
- * <li>to obtain a "snapshot" of the current calling context so
- * access-control decisions from a different context can be made with
- * respect to the saved context. </ul>
- *
- * <p> The {@link #checkPermission(Permission) checkPermission} method
- * determines whether the access request indicated by a specified
- * permission should be granted or denied. A sample call appears
- * below. In this example, <code>checkPermission</code> will determine
- * whether or not to grant "read" access to the file named "testFile" in
- * the "/temp" directory.
- *
- * <pre>
- *
- * FilePermission perm = new FilePermission("/temp/testFile", "read");
- * AccessController.checkPermission(perm);
- *
- * </pre>
- *
- * <p> If a requested access is allowed,
- * <code>checkPermission</code> returns quietly. If denied, an
- * AccessControlException is
- * thrown. AccessControlException can also be thrown if the requested
- * permission is of an incorrect type or contains an invalid value.
- * Such information is given whenever possible.
- *
- * Suppose the current thread traversed m callers, in the order of caller 1
- * to caller 2 to caller m. Then caller m invoked the
- * <code>checkPermission</code> method.
- * The <code>checkPermission </code>method determines whether access
- * is granted or denied based on the following algorithm:
- *
- *  <pre> {@code
- * for (int i = m; i > 0; i--) {
- *
- *     if (caller i's domain does not have the permission)
- *         throw AccessControlException
- *
- *     else if (caller i is marked as privileged) {
- *         if (a context was specified in the call to doPrivileged)
- *             context.checkPermission(permission)
- *         return;
- *     }
- * };
- *
- * // Next, check the context inherited when the thread was created.
- * // Whenever a new thread is created, the AccessControlContext at
- * // that time is stored and associated with the new thread, as the
- * // "inherited" context.
- *
- * inheritedContext.checkPermission(permission);
- * }</pre>
- *
- * <p> A caller can be marked as being "privileged"
- * (see {@link #doPrivileged(PrivilegedAction) doPrivileged} and below).
- * When making access control decisions, the <code>checkPermission</code>
- * method stops checking if it reaches a caller that
- * was marked as "privileged" via a <code>doPrivileged</code>
- * call without a context argument (see below for information about a
- * context argument). If that caller's domain has the
- * specified permission, no further checking is done and
- * <code>checkPermission</code>
- * returns quietly, indicating that the requested access is allowed.
- * If that domain does not have the specified permission, an exception
- * is thrown, as usual.
- *
- * <p> The normal use of the "privileged" feature is as follows. If you
- * don't need to return a value from within the "privileged" block, do
- * the following:
- *
- *  <pre> {@code
- * somemethod() {
- *     ...normal code here...
- *     AccessController.doPrivileged(new PrivilegedAction<Void>() {
- *         public Void run() {
- *             // privileged code goes here, for example:
- *             System.loadLibrary("awt");
- *             return null; // nothing to return
- *         }
- *     });
- *     ...normal code here...
- * }}</pre>
- *
- * <p>
- * PrivilegedAction is an interface with a single method, named
- * <code>run</code>.
- * The above example shows creation of an implementation
- * of that interface; a concrete implementation of the
- * <code>run</code> method is supplied.
- * When the call to <code>doPrivileged</code> is made, an
- * instance of the PrivilegedAction implementation is passed
- * to it. The <code>doPrivileged</code> method calls the
- * <code>run</code> method from the PrivilegedAction
- * implementation after enabling privileges, and returns the
- * <code>run</code> method's return value as the
- * <code>doPrivileged</code> return value (which is
- * ignored in this example).
- *
- * <p> If you need to return a value, you can do something like the following:
- *
- *  <pre> {@code
- * somemethod() {
- *     ...normal code here...
- *     String user = AccessController.doPrivileged(
- *         new PrivilegedAction<String>() {
- *         public String run() {
- *             return System.getProperty("user.name");
- *             }
- *         });
- *     ...normal code here...
- * }}</pre>
- *
- * <p>If the action performed in your <code>run</code> method could
- * throw a "checked" exception (those listed in the <code>throws</code> clause
- * of a method), then you need to use the
- * <code>PrivilegedExceptionAction</code> interface instead of the
- * <code>PrivilegedAction</code> interface:
- *
- *  <pre> {@code
- * somemethod() throws FileNotFoundException {
- *     ...normal code here...
- *     try {
- *         FileInputStream fis = AccessController.doPrivileged(
- *         new PrivilegedExceptionAction<FileInputStream>() {
- *             public FileInputStream run() throws FileNotFoundException {
- *                 return new FileInputStream("someFile");
- *             }
- *         });
- *     } catch (PrivilegedActionException e) {
- *         // e.getException() should be an instance of FileNotFoundException,
- *         // as only "checked" exceptions will be "wrapped" in a
- *         // PrivilegedActionException.
- *         throw (FileNotFoundException) e.getException();
- *     }
- *     ...normal code here...
- *  }}</pre>
- *
- * <p> Be *very* careful in your use of the "privileged" construct, and
- * always remember to make the privileged code section as small as possible.
- *
- * <p> Note that <code>checkPermission</code> always performs security checks
- * within the context of the currently executing thread.
- * Sometimes a security check that should be made within a given context
- * will actually need to be done from within a
- * <i>different</i> context (for example, from within a worker thread).
- * The {@link #getContext() getContext} method and
- * AccessControlContext class are provided
- * for this situation. The <code>getContext</code> method takes a "snapshot"
- * of the current calling context, and places
- * it in an AccessControlContext object, which it returns. A sample call is
- * the following:
- *
- * <pre>
- *
- * AccessControlContext acc = AccessController.getContext()
- *
- * </pre>
- *
- * <p>
- * AccessControlContext itself has a <code>checkPermission</code> method
- * that makes access decisions based on the context <i>it</i> encapsulates,
- * rather than that of the current execution thread.
- * Code within a different context can thus call that method on the
- * previously-saved AccessControlContext object. A sample call is the
- * following:
- *
- * <pre>
- *
- * acc.checkPermission(permission)
- *
- * </pre>
- *
- * <p> There are also times where you don't know a priori which permissions
- * to check the context against. In these cases you can use the
- * doPrivileged method that takes a context:
- *
- *  <pre> {@code
- * somemethod() {
- *     AccessController.doPrivileged(new PrivilegedAction<Object>() {
- *         public Object run() {
- *             // Code goes here. Any permission checks within this
- *             // run method will require that the intersection of the
- *             // callers protection domain and the snapshot's
- *             // context have the desired permission.
- *         }
- *     }, acc);
- *     ...normal code here...
- * }}</pre>
- *
- * @see AccessControlContext
- *
- * @author Li Gong
- * @author Roland Schemers
- */
-
-public final class AccessController {
-
-    @cli.System.ThreadStaticAttribute.Annotation
-    private static PrivilegedElement privileged_stack_top;
-
-    @ikvm.lang.Internal
-    public static final class LazyContext {
-        LazyContext parent;
-        CallerID callerID;
-        AccessControlContext context;
-        final cli.System.Diagnostics.StackTrace stackTrace = new cli.System.Diagnostics.StackTrace(1);
-    }
-
-    @ikvm.lang.Internal
-    public static LazyContext getLazyContext(LazyContext parent) {
-        LazyContext lc = new LazyContext();
-        lc.parent = parent;
-        if (privileged_stack_top != null) {
-            lc.callerID = privileged_stack_top.callerID;
-            lc.context = privileged_stack_top.context;
-        }
-        return lc;
-    }
-
-    private static final class PrivilegedElement {
-        CallerID callerID;
-        AccessControlContext context;
-    }
-
-    private static Object doPrivileged(Object action, AccessControlContext context, CallerID callerID) {
-        PrivilegedElement savedPrivilegedElement = privileged_stack_top;
-        try {
-            PrivilegedElement pi = new PrivilegedElement();
-            pi.callerID = callerID;
-            pi.context = context;
-            privileged_stack_top = pi;
-            try {
-                if (action instanceof PrivilegedAction) {
-                    return ((PrivilegedAction)action).run();
-                } else {
-                    return ((PrivilegedExceptionAction)action).run();
-                }
-            } catch (Exception x) {
-                if (!(x instanceof RuntimeException)) {
-                    Unsafe.getUnsafe().throwException(new PrivilegedActionException(x));
-                }
-                throw (RuntimeException)x;
-            }
-        } finally {
-            privileged_stack_top = savedPrivilegedElement;
-        }
-    }
-
-    /**
-     * Don't allow anyone to instantiate an AccessController
-     */
-    private AccessController() { }
-
-    /**
-     * Performs the specified <code>PrivilegedAction</code> with privileges
-     * enabled. The action is performed with <i>all</i> of the permissions
-     * possessed by the caller's protection domain.
-     *
-     * <p> If the action's <code>run</code> method throws an (unchecked)
-     * exception, it will propagate through this method.
-     *
-     * <p> Note that any DomainCombiner associated with the current
-     * AccessControlContext will be ignored while the action is performed.
-     *
-     * @param action the action to be performed.
-     *
-     * @return the value returned by the action's <code>run</code> method.
-     *
-     * @exception NullPointerException if the action is <code>null</code>
-     *
-     * @see #doPrivileged(PrivilegedAction,AccessControlContext)
-     * @see #doPrivileged(PrivilegedExceptionAction)
-     * @see #doPrivilegedWithCombiner(PrivilegedAction)
-     * @see java.security.DomainCombiner
-     */
-
-    @CallerSensitive
-    public static <T> T doPrivileged(PrivilegedAction<T> action) {
-        return (T)doPrivileged(action, null, CallerID.getCallerID());
-    }
-
-    /**
-     * Performs the specified <code>PrivilegedAction</code> with privileges
-     * enabled. The action is performed with <i>all</i> of the permissions
-     * possessed by the caller's protection domain.
-     *
-     * <p> If the action's <code>run</code> method throws an (unchecked)
-     * exception, it will propagate through this method.
-     *
-     * <p> This method preserves the current AccessControlContext's
-     * DomainCombiner (which may be null) while the action is performed.
-     *
-     * @param action the action to be performed.
-     *
-     * @return the value returned by the action's <code>run</code> method.
-     *
-     * @exception NullPointerException if the action is <code>null</code>
-     *
-     * @see #doPrivileged(PrivilegedAction)
-     * @see java.security.DomainCombiner
-     *
-     * @since 1.6
-     */
-    @CallerSensitive
-    public static <T> T doPrivilegedWithCombiner(PrivilegedAction<T> action) {
-        AccessControlContext acc = getStackAccessControlContext();
-        if (acc == null) {
-            return AccessController.doPrivileged(action);
-        }
-        DomainCombiner dc = acc.getAssignedCombiner();
-        return AccessController.doPrivileged(action, preserveCombiner(dc, Reflection.getCallerClass()));
-    }
-
-
-    /**
-     * Performs the specified <code>PrivilegedAction</code> with privileges
-     * enabled and restricted by the specified
-     * <code>AccessControlContext</code>.
-     * The action is performed with the intersection of the permissions
-     * possessed by the caller's protection domain, and those possessed
-     * by the domains represented by the specified
-     * <code>AccessControlContext</code>.
-     * <p>
-     * If the action's <code>run</code> method throws an (unchecked) exception,
-     * it will propagate through this method.
-     *
-     * @param action the action to be performed.
-     * @param context an <i>access control context</i>
-     *                representing the restriction to be applied to the
-     *                caller's domain's privileges before performing
-     *                the specified action.  If the context is
-     *                <code>null</code>,
-     *                then no additional restriction is applied.
-     *
-     * @return the value returned by the action's <code>run</code> method.
-     *
-     * @exception NullPointerException if the action is <code>null</code>
-     *
-     * @see #doPrivileged(PrivilegedAction)
-     * @see #doPrivileged(PrivilegedExceptionAction,AccessControlContext)
-     */
-    @CallerSensitive
-    public static <T> T doPrivileged(PrivilegedAction<T> action,
-                                     AccessControlContext context) {
-        return (T)doPrivileged(action, context, CallerID.getCallerID());
-    }
-
-    /**
-     * Performs the specified <code>PrivilegedExceptionAction</code> with
-     * privileges enabled.  The action is performed with <i>all</i> of the
-     * permissions possessed by the caller's protection domain.
-     *
-     * <p> If the action's <code>run</code> method throws an <i>unchecked</i>
-     * exception, it will propagate through this method.
-     *
-     * <p> Note that any DomainCombiner associated with the current
-     * AccessControlContext will be ignored while the action is performed.
-     *
-     * @param action the action to be performed
-     *
-     * @return the value returned by the action's <code>run</code> method
-     *
-     * @exception PrivilegedActionException if the specified action's
-     *         <code>run</code> method threw a <i>checked</i> exception
-     * @exception NullPointerException if the action is <code>null</code>
-     *
-     * @see #doPrivileged(PrivilegedAction)
-     * @see #doPrivileged(PrivilegedExceptionAction,AccessControlContext)
-     * @see #doPrivilegedWithCombiner(PrivilegedExceptionAction)
-     * @see java.security.DomainCombiner
-     */
-    @CallerSensitive
-    public static <T> T
-        doPrivileged(PrivilegedExceptionAction<T> action)
-        throws PrivilegedActionException {
-        return (T)doPrivileged(action, null, CallerID.getCallerID());
-    }
-
-
-    /**
-     * Performs the specified <code>PrivilegedExceptionAction</code> with
-     * privileges enabled.  The action is performed with <i>all</i> of the
-     * permissions possessed by the caller's protection domain.
-     *
-     * <p> If the action's <code>run</code> method throws an <i>unchecked</i>
-     * exception, it will propagate through this method.
-     *
-     * <p> This method preserves the current AccessControlContext's
-     * DomainCombiner (which may be null) while the action is performed.
-     *
-     * @param action the action to be performed.
-     *
-     * @return the value returned by the action's <code>run</code> method
-     *
-     * @exception PrivilegedActionException if the specified action's
-     *         <code>run</code> method threw a <i>checked</i> exception
-     * @exception NullPointerException if the action is <code>null</code>
-     *
-     * @see #doPrivileged(PrivilegedAction)
-     * @see #doPrivileged(PrivilegedExceptionAction,AccessControlContext)
-     * @see java.security.DomainCombiner
-     *
-     * @since 1.6
-     */
-    @CallerSensitive
-    public static <T> T doPrivilegedWithCombiner
-        (PrivilegedExceptionAction<T> action) throws PrivilegedActionException {
-
-        AccessControlContext acc = getStackAccessControlContext();
-        if (acc == null) {
-            return AccessController.doPrivileged(action);
-        }
-        DomainCombiner dc = acc.getAssignedCombiner();
-        return AccessController.doPrivileged(action, preserveCombiner(dc, Reflection.getCallerClass()));
-    }
-
-    /**
-     * preserve the combiner across the doPrivileged call
-     */
-    private static AccessControlContext preserveCombiner(DomainCombiner combiner,
-                                                         final Class<?> caller) {
-        ProtectionDomain callerPd = doPrivileged
-            (new PrivilegedAction<ProtectionDomain>() {
-            public ProtectionDomain run() {
-                return caller.getProtectionDomain();
-            }
-        });
-
-        // perform 'combine' on the caller of doPrivileged,
-        // even if the caller is from the bootclasspath
-        ProtectionDomain[] pds = new ProtectionDomain[] {callerPd};
-        if (combiner == null) {
-            return new AccessControlContext(pds);
-        } else {
-            return new AccessControlContext(combiner.combine(pds, null),
-                                            combiner);
-        }
-    }
-
-
-    /**
-     * Performs the specified <code>PrivilegedExceptionAction</code> with
-     * privileges enabled and restricted by the specified
-     * <code>AccessControlContext</code>.  The action is performed with the
-     * intersection of the permissions possessed by the caller's
-     * protection domain, and those possessed by the domains represented by the
-     * specified <code>AccessControlContext</code>.
-     * <p>
-     * If the action's <code>run</code> method throws an <i>unchecked</i>
-     * exception, it will propagate through this method.
-     *
-     * @param action the action to be performed
-     * @param context an <i>access control context</i>
-     *                representing the restriction to be applied to the
-     *                caller's domain's privileges before performing
-     *                the specified action.  If the context is
-     *                <code>null</code>,
-     *                then no additional restriction is applied.
-     *
-     * @return the value returned by the action's <code>run</code> method
-     *
-     * @exception PrivilegedActionException if the specified action's
-     *         <code>run</code> method
-     *         threw a <i>checked</i> exception
-     * @exception NullPointerException if the action is <code>null</code>
-     *
-     * @see #doPrivileged(PrivilegedAction)
-     * @see #doPrivileged(PrivilegedExceptionAction,AccessControlContext)
-     */
-    @CallerSensitive
-    public static <T> T
-        doPrivileged(PrivilegedExceptionAction<T> action,
-                     AccessControlContext context)
-        throws PrivilegedActionException {
-        return (T)doPrivileged(action, context, CallerID.getCallerID());
-    }
-
-    /**
-     * Returns the AccessControl context. i.e., it gets
-     * the protection domains of all the callers on the stack,
-     * starting at the first class with a non-null
-     * ProtectionDomain.
-     *
-     * @return the access control context based on the current stack or
-     *         null if there was only privileged system code.
-     */
-
-    private static AccessControlContext getStackAccessControlContext() {
-        AccessControlContext context = null;
-        CallerID callerID = null;
-        PrivilegedElement pi = privileged_stack_top;
-        if (pi != null) {
-            context = pi.context;
-            callerID = pi.callerID;
-        }
-        return getStackAccessControlContext(context, callerID);
-    }
-    
-    private static native AccessControlContext getStackAccessControlContext(AccessControlContext context, CallerID callerID);
-
-    /**
-     * Returns the "inherited" AccessControl context. This is the context
-     * that existed when the thread was created. Package private so
-     * AccessControlContext can use it.
-     */
-
-    static native AccessControlContext getInheritedAccessControlContext();
-
-    /**
-     * This method takes a "snapshot" of the current calling context, which
-     * includes the current Thread's inherited AccessControlContext,
-     * and places it in an AccessControlContext object. This context may then
-     * be checked at a later point, possibly in another thread.
-     *
-     * @see AccessControlContext
-     *
-     * @return the AccessControlContext based on the current context.
-     */
-
-    public static AccessControlContext getContext()
-    {
-        AccessControlContext acc = getStackAccessControlContext();
-        if (acc == null) {
-            // all we had was privileged system code. We don't want
-            // to return null though, so we construct a real ACC.
-            return new AccessControlContext(null, true);
-        } else {
-            return acc.optimize();
-        }
-    }
-
-    /**
-     * Determines whether the access request indicated by the
-     * specified permission should be allowed or denied, based on
-     * the current AccessControlContext and security policy.
-     * This method quietly returns if the access request
-     * is permitted, or throws an AccessControlException otherwise. The
-     * getPermission method of the AccessControlException returns the
-     * <code>perm</code> Permission object instance.
-     *
-     * @param perm the requested permission.
-     *
-     * @exception AccessControlException if the specified permission
-     *            is not permitted, based on the current security policy.
-     * @exception NullPointerException if the specified permission
-     *            is <code>null</code> and is checked based on the
-     *            security policy currently in effect.
-     */
-
-    public static void checkPermission(Permission perm)
-                 throws AccessControlException
-    {
-        //System.err.println("checkPermission "+perm);
-        //Thread.currentThread().dumpStack();
-
-        if (perm == null) {
-            throw new NullPointerException("permission can't be null");
-        }
-
-        AccessControlContext stack = getStackAccessControlContext();
-        // if context is null, we had privileged system code on the stack.
-        if (stack == null) {
-            Debug debug = AccessControlContext.getDebug();
-            boolean dumpDebug = false;
-            if (debug != null) {
-                dumpDebug = !Debug.isOn("codebase=");
-                dumpDebug &= !Debug.isOn("permission=") ||
-                    Debug.isOn("permission=" + perm.getClass().getCanonicalName());
-            }
-
-            if (dumpDebug && Debug.isOn("stack")) {
-                Thread.currentThread().dumpStack();
-            }
-
-            if (dumpDebug && Debug.isOn("domain")) {
-                debug.println("domain (context is null)");
-            }
-
-            if (dumpDebug) {
-                debug.println("access allowed "+perm);
-            }
-            return;
-        }
-
-        AccessControlContext acc = stack.optimize();
-        acc.checkPermission(perm);
-    }
-}
diff --git a/openjdk/java/security/ProtectionDomain.java b/openjdk/java/security/ProtectionDomain.java
deleted file mode 100644
index 3ceda027..00000000
--- a/openjdk/java/security/ProtectionDomain.java
+++ /dev/null
@@ -1,528 +0,0 @@
-/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.security;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Map;
-import java.util.WeakHashMap;
-import sun.misc.JavaSecurityProtectionDomainAccess;
-import static sun.misc.JavaSecurityProtectionDomainAccess.ProtectionDomainCache;
-import sun.misc.SharedSecrets;
-import sun.security.util.Debug;
-import sun.security.util.SecurityConstants;
-import sun.misc.JavaSecurityAccess;
-import sun.misc.SharedSecrets;
-
-/**
- *
- *<p>
- * This ProtectionDomain class encapsulates the characteristics of a domain,
- * which encloses a set of classes whose instances are granted a set
- * of permissions when being executed on behalf of a given set of Principals.
- * <p>
- * A static set of permissions can be bound to a ProtectionDomain when it is
- * constructed; such permissions are granted to the domain regardless of the
- * Policy in force. However, to support dynamic security policies, a
- * ProtectionDomain can also be constructed such that it is dynamically
- * mapped to a set of permissions by the current Policy whenever a permission
- * is checked.
- * <p>
- *
- * @author Li Gong
- * @author Roland Schemers
- * @author Gary Ellison
- */
-
-public class ProtectionDomain {
-
-    static {
-        // Set up JavaSecurityAccess in SharedSecrets
-        SharedSecrets.setJavaSecurityAccess(
-            new JavaSecurityAccess() {
-                public <T> T doIntersectionPrivilege(
-                    PrivilegedAction<T> action,
-                    final AccessControlContext stack,
-                    final AccessControlContext context)
-                {
-                    if (action == null) {
-                        throw new NullPointerException();
-                    }
-                    return AccessController.doPrivileged(
-                        action,
-                        new AccessControlContext(
-                            stack.getContext(), context).optimize()
-                    );
-                }
-
-                public <T> T doIntersectionPrivilege(
-                    PrivilegedAction<T> action,
-                    AccessControlContext context)
-                {
-                    return doIntersectionPrivilege(action,
-                        AccessController.getContext(), context);
-                }
-            }
-       );
-    }
-
-    /* CodeSource */
-    private CodeSource codesource ;
-
-    /* [IKVM] If this is a protection from an Assembly class loader, we lazily construct the codesource, classloader and permissions */
-    private cli.System.Reflection.Assembly assembly;
-
-    /* ClassLoader the protection domain was consed from */
-    private ClassLoader classloader;
-
-    /* Principals running-as within this protection domain */
-    private Principal[] principals;
-
-    /* the rights this protection domain is granted */
-    private PermissionCollection permissions;
-
-    /* if the permissions object has AllPermission */
-    private boolean hasAllPerm = false;
-
-    /* the PermissionCollection is static (pre 1.4 constructor)
-       or dynamic (via a policy refresh) */
-    private boolean staticPermissions;
-
-    /*
-     * An object used as a key when the ProtectionDomain is stored in a Map.
-     */
-    final Key key = new Key();
-
-    /* [IKVM] constructor for use by the runtime (AssemblyClassLoader) */
-    ProtectionDomain(cli.System.Reflection.Assembly assembly) {
-        this.assembly = assembly;
-        this.hasAllPerm = true;
-        this.staticPermissions = true;
-        this.principals = new Principal[0];
-    }
-
-    /* [IKVM] */
-    private void lazyInitClassLoader() {
-        if (classloader == null && assembly != null) {
-            classloader = ikvm.runtime.AssemblyClassLoader.getAssemblyClassLoader(assembly);
-        }
-    }
-
-    /* [IKVM] */
-    private void lazyInitPermissions() {
-        if (permissions == null && hasAllPerm) {
-            Permissions p = new Permissions();
-            p.add(new AllPermission());
-            p.setReadOnly();
-            // we lock on principals since that is a private object
-            synchronized (principals) {
-                if (permissions == null) {
-                    permissions = p;
-                }
-            }
-        }
-    }
-
-    /* [IKVM] */
-    private void lazyInitCodeSource() {
-        if (codesource == null && assembly != null) {
-            java.net.URL url;
-            try {
-                if (false) throw new cli.System.NotSupportedException();
-                url = new java.net.URL(assembly.get_EscapedCodeBase());
-            } catch (java.net.MalformedURLException _) {
-                url = null;
-            } catch (cli.System.NotSupportedException _) {
-                // dynamic assemblies don't have a codebase
-                url = null;
-            }
-            CodeSource cs = new CodeSource(url, (java.security.cert.Certificate[])null);
-            // we lock on principals since that is a private object
-            synchronized (principals) {
-                if (codesource == null) {
-                    codesource = cs;
-                }
-            }
-        }
-    }
-
-    /**
-     * Creates a new ProtectionDomain with the given CodeSource and
-     * Permissions. If the permissions object is not null, then
-     *  <code>setReadOnly())</code> will be called on the passed in
-     * Permissions object. The only permissions granted to this domain
-     * are the ones specified; the current Policy will not be consulted.
-     *
-     * @param codesource the codesource associated with this domain
-     * @param permissions the permissions granted to this domain
-     */
-    public ProtectionDomain(CodeSource codesource,
-                            PermissionCollection permissions) {
-        this.codesource = codesource;
-        if (permissions != null) {
-            this.permissions = permissions;
-            this.permissions.setReadOnly();
-            if (permissions instanceof Permissions &&
-                ((Permissions)permissions).allPermission != null) {
-                hasAllPerm = true;
-            }
-        }
-        this.classloader = null;
-        this.principals = new Principal[0];
-        staticPermissions = true;
-    }
-
-    /**
-     * Creates a new ProtectionDomain qualified by the given CodeSource,
-     * Permissions, ClassLoader and array of Principals. If the
-     * permissions object is not null, then <code>setReadOnly()</code>
-     * will be called on the passed in Permissions object.
-     * The permissions granted to this domain are dynamic; they include
-     * both the static permissions passed to this constructor, and any
-     * permissions granted to this domain by the current Policy at the
-     * time a permission is checked.
-     * <p>
-     * This constructor is typically used by
-     * {@link SecureClassLoader ClassLoaders}
-     * and {@link DomainCombiner DomainCombiners} which delegate to
-     * <code>Policy</code> to actively associate the permissions granted to
-     * this domain. This constructor affords the
-     * Policy provider the opportunity to augment the supplied
-     * PermissionCollection to reflect policy changes.
-     * <p>
-     *
-     * @param codesource the CodeSource associated with this domain
-     * @param permissions the permissions granted to this domain
-     * @param classloader the ClassLoader associated with this domain
-     * @param principals the array of Principals associated with this
-     * domain. The contents of the array are copied to protect against
-     * subsequent modification.
-     * @see Policy#refresh
-     * @see Policy#getPermissions(ProtectionDomain)
-     * @since 1.4
-     */
-    public ProtectionDomain(CodeSource codesource,
-                            PermissionCollection permissions,
-                            ClassLoader classloader,
-                            Principal[] principals) {
-        this.codesource = codesource;
-        if (permissions != null) {
-            this.permissions = permissions;
-            this.permissions.setReadOnly();
-            if (permissions instanceof Permissions &&
-                ((Permissions)permissions).allPermission != null) {
-                hasAllPerm = true;
-            }
-        }
-        this.classloader = classloader;
-        this.principals = (principals != null ? principals.clone():
-                           new Principal[0]);
-        staticPermissions = false;
-    }
-
-    /**
-     * Returns the CodeSource of this domain.
-     * @return the CodeSource of this domain which may be null.
-     * @since 1.2
-     */
-    public final CodeSource getCodeSource() {
-        lazyInitCodeSource();
-        return this.codesource;
-    }
-
-
-    /**
-     * Returns the ClassLoader of this domain.
-     * @return the ClassLoader of this domain which may be null.
-     *
-     * @since 1.4
-     */
-    public final ClassLoader getClassLoader() {
-        lazyInitClassLoader();
-        return this.classloader;
-    }
-
-
-    /**
-     * Returns an array of principals for this domain.
-     * @return a non-null array of principals for this domain.
-     * Returns a new array each time this method is called.
-     *
-     * @since 1.4
-     */
-    public final Principal[] getPrincipals() {
-        return this.principals.clone();
-    }
-
-    /**
-     * Returns the static permissions granted to this domain.
-     *
-     * @return the static set of permissions for this domain which may be null.
-     * @see Policy#refresh
-     * @see Policy#getPermissions(ProtectionDomain)
-     */
-    public final PermissionCollection getPermissions() {
-        lazyInitPermissions();
-        return permissions;
-    }
-
-    /**
-     * Check and see if this ProtectionDomain implies the permissions
-     * expressed in the Permission object.
-     * <p>
-     * The set of permissions evaluated is a function of whether the
-     * ProtectionDomain was constructed with a static set of permissions
-     * or it was bound to a dynamically mapped set of permissions.
-     * <p>
-     * If the ProtectionDomain was constructed to a
-     * {@link #ProtectionDomain(CodeSource, PermissionCollection)
-     * statically bound} PermissionCollection then the permission will
-     * only be checked against the PermissionCollection supplied at
-     * construction.
-     * <p>
-     * However, if the ProtectionDomain was constructed with
-     * the constructor variant which supports
-     * {@link #ProtectionDomain(CodeSource, PermissionCollection,
-     * ClassLoader, java.security.Principal[]) dynamically binding}
-     * permissions, then the permission will be checked against the
-     * combination of the PermissionCollection supplied at construction and
-     * the current Policy binding.
-     * <p>
-     *
-     * @param permission the Permission object to check.
-     *
-     * @return true if "permission" is implicit to this ProtectionDomain.
-     */
-    public boolean implies(Permission permission) {
-
-        if (hasAllPerm) {
-            // internal permission collection already has AllPermission -
-            // no need to go to policy
-            return true;
-        }
-
-        if (!staticPermissions &&
-            Policy.getPolicyNoCheck().implies(this, permission))
-            return true;
-        if (permissions != null)
-            return permissions.implies(permission);
-
-        return false;
-    }
-
-    /**
-     * Convert a ProtectionDomain to a String.
-     */
-    @Override public String toString() {
-        lazyInitCodeSource();
-        lazyInitClassLoader();
-        String pals = "<no principals>";
-        if (principals != null && principals.length > 0) {
-            StringBuilder palBuf = new StringBuilder("(principals ");
-
-            for (int i = 0; i < principals.length; i++) {
-                palBuf.append(principals[i].getClass().getName() +
-                            " \"" + principals[i].getName() +
-                            "\"");
-                if (i < principals.length-1)
-                    palBuf.append(",\n");
-                else
-                    palBuf.append(")\n");
-            }
-            pals = palBuf.toString();
-        }
-
-        // Check if policy is set; we don't want to load
-        // the policy prematurely here
-        PermissionCollection pc = Policy.isSet() && seeAllp() ?
-                                      mergePermissions():
-                                      getPermissions();
-
-        return "ProtectionDomain "+
-            " "+codesource+"\n"+
-            " "+classloader+"\n"+
-            " "+pals+"\n"+
-            " "+pc+"\n";
-    }
-
-    /**
-     * Return true (merge policy permissions) in the following cases:
-     *
-     * . SecurityManager is null
-     *
-     * . SecurityManager is not null,
-     *          debug is not null,
-     *          SecurityManager impelmentation is in bootclasspath,
-     *          Policy implementation is in bootclasspath
-     *          (the bootclasspath restrictions avoid recursion)
-     *
-     * . SecurityManager is not null,
-     *          debug is null,
-     *          caller has Policy.getPolicy permission
-     */
-    private static boolean seeAllp() {
-        SecurityManager sm = System.getSecurityManager();
-
-        if (sm == null) {
-            return true;
-        } else {
-            Debug debug = Debug.getInstance("domain");
-            if (debug != null) {
-                if (sm.getClass().getClassLoader() == null &&
-                    Policy.getPolicyNoCheck().getClass().getClassLoader()
-                                                                == null) {
-                    return true;
-                }
-            } else {
-                try {
-                    sm.checkPermission(SecurityConstants.GET_POLICY_PERMISSION);
-                    return true;
-                } catch (SecurityException se) {
-                    // fall thru and return false
-                }
-            }
-        }
-
-        return false;
-    }
-
-    private PermissionCollection mergePermissions() {
-        lazyInitPermissions();
-        if (staticPermissions)
-            return permissions;
-
-        PermissionCollection perms =
-            java.security.AccessController.doPrivileged
-            (new java.security.PrivilegedAction<PermissionCollection>() {
-                    public PermissionCollection run() {
-                        Policy p = Policy.getPolicyNoCheck();
-                        return p.getPermissions(ProtectionDomain.this);
-                    }
-                });
-
-        Permissions mergedPerms = new Permissions();
-        int swag = 32;
-        int vcap = 8;
-        Enumeration<Permission> e;
-        List<Permission> pdVector = new ArrayList<>(vcap);
-        List<Permission> plVector = new ArrayList<>(swag);
-
-        //
-        // Build a vector of domain permissions for subsequent merge
-        if (permissions != null) {
-            synchronized (permissions) {
-                e = permissions.elements();
-                while (e.hasMoreElements()) {
-                    pdVector.add(e.nextElement());
-                }
-            }
-        }
-
-        //
-        // Build a vector of Policy permissions for subsequent merge
-        if (perms != null) {
-            synchronized (perms) {
-                e = perms.elements();
-                while (e.hasMoreElements()) {
-                    plVector.add(e.nextElement());
-                    vcap++;
-                }
-            }
-        }
-
-        if (perms != null && permissions != null) {
-            //
-            // Weed out the duplicates from the policy. Unless a refresh
-            // has occured since the pd was consed this should result in
-            // an empty vector.
-            synchronized (permissions) {
-                e = permissions.elements();   // domain vs policy
-                while (e.hasMoreElements()) {
-                    Permission pdp = e.nextElement();
-                    Class pdpClass = pdp.getClass();
-                    String pdpActions = pdp.getActions();
-                    String pdpName = pdp.getName();
-                    for (int i = 0; i < plVector.size(); i++) {
-                        Permission pp = plVector.get(i);
-                        if (pdpClass.isInstance(pp)) {
-                            // The equals() method on some permissions
-                            // have some side effects so this manual
-                            // comparison is sufficient.
-                            if (pdpName.equals(pp.getName()) &&
-                                pdpActions.equals(pp.getActions())) {
-                                plVector.remove(i);
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        if (perms !=null) {
-            // the order of adding to merged perms and permissions
-            // needs to preserve the bugfix 4301064
-
-            for (int i = plVector.size()-1; i >= 0; i--) {
-                mergedPerms.add(plVector.get(i));
-            }
-        }
-        if (permissions != null) {
-            for (int i = pdVector.size()-1; i >= 0; i--) {
-                mergedPerms.add(pdVector.get(i));
-            }
-        }
-
-        return mergedPerms;
-    }
-
-    /**
-     * Used for storing ProtectionDomains as keys in a Map.
-     */
-    final class Key {}
-
-    static {
-        SharedSecrets.setJavaSecurityProtectionDomainAccess(
-            new JavaSecurityProtectionDomainAccess() {
-                public ProtectionDomainCache getProtectionDomainCache() {
-                    return new ProtectionDomainCache() {
-                        private final Map<Key, PermissionCollection> map =
-                            Collections.synchronizedMap
-                                (new WeakHashMap<Key, PermissionCollection>());
-                        public void put(ProtectionDomain pd,
-                            PermissionCollection pc) {
-                            map.put((pd == null ? null : pd.key), pc);
-                        }
-                        public PermissionCollection get(ProtectionDomain pd) {
-                            return pd == null ? map.get(null) : map.get(pd.key);
-                        }
-                    };
-                }
-            });
-    }
-}
diff --git a/openjdk/java/sql/DriverManager.java b/openjdk/java/sql/DriverManager.java
deleted file mode 100644
index 8698345c..00000000
--- a/openjdk/java/sql/DriverManager.java
+++ /dev/null
@@ -1,624 +0,0 @@
-/*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package java.sql;
-
-import java.util.Iterator;
-import java.util.ServiceLoader;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.concurrent.CopyOnWriteArrayList;
-import sun.reflect.CallerSensitive;
-import sun.reflect.Reflection;
-
-/**
- * <P>The basic service for managing a set of JDBC drivers.<br>
- * <B>NOTE:</B> The {@link <code>DataSource</code>} interface, new in the
- * JDBC 2.0 API, provides another way to connect to a data source.
- * The use of a <code>DataSource</code> object is the preferred means of
- * connecting to a data source.
- *
- * <P>As part of its initialization, the <code>DriverManager</code> class will
- * attempt to load the driver classes referenced in the "jdbc.drivers"
- * system property. This allows a user to customize the JDBC Drivers
- * used by their applications. For example in your
- * ~/.hotjava/properties file you might specify:
- * <pre>
- * <CODE>jdbc.drivers=foo.bah.Driver:wombat.sql.Driver:bad.taste.ourDriver</CODE>
- * </pre>
- *<P> The <code>DriverManager</code> methods <code>getConnection</code> and
- * <code>getDrivers</code> have been enhanced to support the Java Standard Edition
- * <a href="../../../technotes/guides/jar/jar.html#Service%20Provider">Service Provider</a> mechanism. JDBC 4.0 Drivers must
- * include the file <code>META-INF/services/java.sql.Driver</code>. This file contains the name of the JDBC drivers
- * implementation of <code>java.sql.Driver</code>.  For example, to load the <code>my.sql.Driver</code> class,
- * the <code>META-INF/services/java.sql.Driver</code> file would contain the entry:
- * <pre>
- * <code>my.sql.Driver</code>
- * </pre>
- *
- * <P>Applications no longer need to explictly load JDBC drivers using <code>Class.forName()</code>. Existing programs
- * which currently load JDBC drivers using <code>Class.forName()</code> will continue to work without
- * modification.
- *
- * <P>When the method <code>getConnection</code> is called,
- * the <code>DriverManager</code> will attempt to
- * locate a suitable driver from amongst those loaded at
- * initialization and those loaded explicitly using the same classloader
- * as the current applet or application.
- *
- * <P>
- * Starting with the Java 2 SDK, Standard Edition, version 1.3, a
- * logging stream can be set only if the proper
- * permission has been granted.  Normally this will be done with
- * the tool PolicyTool, which can be used to grant <code>permission
- * java.sql.SQLPermission "setLog"</code>.
- * @see Driver
- * @see Connection
- */
-public class DriverManager {
-
-
-    // List of registered JDBC drivers
-    private final static CopyOnWriteArrayList<DriverInfo> registeredDrivers = new CopyOnWriteArrayList<DriverInfo>();
-    private static volatile int loginTimeout = 0;
-    private static volatile java.io.PrintWriter logWriter = null;
-    private static volatile java.io.PrintStream logStream = null;
-    // Used in println() to synchronize logWriter
-    private final static  Object logSync = new Object();
-
-    /* Prevent the DriverManager class from being instantiated. */
-    private DriverManager(){}
-
-
-    /**
-     * Load the initial JDBC drivers by checking the System property
-     * jdbc.properties and then use the {@code ServiceLoader} mechanism
-     */
-    static {
-        loadInitialDrivers();
-        println("JDBC DriverManager initialized");
-    }
-
-    /**
-     * The <code>SQLPermission</code> constant that allows the
-     * setting of the logging stream.
-     * @since 1.3
-     */
-    final static SQLPermission SET_LOG_PERMISSION =
-        new SQLPermission("setLog");
-
-    //--------------------------JDBC 2.0-----------------------------
-
-    /**
-     * Retrieves the log writer.
-     *
-     * The <code>getLogWriter</code> and <code>setLogWriter</code>
-     * methods should be used instead
-     * of the <code>get/setlogStream</code> methods, which are deprecated.
-     * @return a <code>java.io.PrintWriter</code> object
-     * @see #setLogWriter
-     * @since 1.2
-     */
-    public static java.io.PrintWriter getLogWriter() {
-            return logWriter;
-    }
-
-    /**
-     * Sets the logging/tracing <code>PrintWriter</code> object
-     * that is used by the <code>DriverManager</code> and all drivers.
-     * <P>
-     * There is a minor versioning problem created by the introduction
-     * of the method <code>setLogWriter</code>.  The
-     * method <code>setLogWriter</code> cannot create a <code>PrintStream</code> object
-     * that will be returned by <code>getLogStream</code>---the Java platform does
-     * not provide a backward conversion.  As a result, a new application
-     * that uses <code>setLogWriter</code> and also uses a JDBC 1.0 driver that uses
-     * <code>getLogStream</code> will likely not see debugging information written
-     * by that driver.
-     *<P>
-     * Starting with the Java 2 SDK, Standard Edition, version 1.3 release, this method checks
-     * to see that there is an <code>SQLPermission</code> object before setting
-     * the logging stream.  If a <code>SecurityManager</code> exists and its
-     * <code>checkPermission</code> method denies setting the log writer, this
-     * method throws a <code>java.lang.SecurityException</code>.
-     *
-     * @param out the new logging/tracing <code>PrintStream</code> object;
-     *      <code>null</code> to disable logging and tracing
-     * @throws SecurityException
-     *    if a security manager exists and its
-     *    <code>checkPermission</code> method denies
-     *    setting the log writer
-     *
-     * @see SecurityManager#checkPermission
-     * @see #getLogWriter
-     * @since 1.2
-     */
-    public static void setLogWriter(java.io.PrintWriter out) {
-
-        SecurityManager sec = System.getSecurityManager();
-        if (sec != null) {
-            sec.checkPermission(SET_LOG_PERMISSION);
-        }
-            logStream = null;
-            logWriter = out;
-    }
-
-
-    //---------------------------------------------------------------
-
-    /**
-     * Attempts to establish a connection to the given database URL.
-     * The <code>DriverManager</code> attempts to select an appropriate driver from
-     * the set of registered JDBC drivers.
-     *
-     * @param url a database url of the form
-     * <code> jdbc:<em>subprotocol</em>:<em>subname</em></code>
-     * @param info a list of arbitrary string tag/value pairs as
-     * connection arguments; normally at least a "user" and
-     * "password" property should be included
-     * @return a Connection to the URL
-     * @exception SQLException if a database access error occurs
-     */
-    @CallerSensitive
-    public static Connection getConnection(String url,
-        java.util.Properties info) throws SQLException {
-        return (getConnection(url, info, Reflection.getCallerClass()));
-    }
-
-    /**
-     * Attempts to establish a connection to the given database URL.
-     * The <code>DriverManager</code> attempts to select an appropriate driver from
-     * the set of registered JDBC drivers.
-     *
-     * @param url a database url of the form
-     * <code>jdbc:<em>subprotocol</em>:<em>subname</em></code>
-     * @param user the database user on whose behalf the connection is being
-     *   made
-     * @param password the user's password
-     * @return a connection to the URL
-     * @exception SQLException if a database access error occurs
-     */
-    @CallerSensitive
-    public static Connection getConnection(String url,
-        String user, String password) throws SQLException {
-        java.util.Properties info = new java.util.Properties();
-
-        if (user != null) {
-            info.put("user", user);
-        }
-        if (password != null) {
-            info.put("password", password);
-        }
-
-        return (getConnection(url, info, Reflection.getCallerClass()));
-    }
-
-    /**
-     * Attempts to establish a connection to the given database URL.
-     * The <code>DriverManager</code> attempts to select an appropriate driver from
-     * the set of registered JDBC drivers.
-     *
-     * @param url a database url of the form
-     *  <code> jdbc:<em>subprotocol</em>:<em>subname</em></code>
-     * @return a connection to the URL
-     * @exception SQLException if a database access error occurs
-     */
-    @CallerSensitive
-    public static Connection getConnection(String url)
-        throws SQLException {
-
-        java.util.Properties info = new java.util.Properties();
-        return (getConnection(url, info, Reflection.getCallerClass()));
-    }
-
-    /**
-     * Attempts to locate a driver that understands the given URL.
-     * The <code>DriverManager</code> attempts to select an appropriate driver from
-     * the set of registered JDBC drivers.
-     *
-     * @param url a database URL of the form
-     *     <code>jdbc:<em>subprotocol</em>:<em>subname</em></code>
-     * @return a <code>Driver</code> object representing a driver
-     * that can connect to the given URL
-     * @exception SQLException if a database access error occurs
-     */
-    @CallerSensitive
-    public static Driver getDriver(String url)
-        throws SQLException {
-
-        println("DriverManager.getDriver(\"" + url + "\")");
-
-        Class<?> callerClass = Reflection.getCallerClass();
-
-        // Walk through the loaded registeredDrivers attempting to locate someone
-        // who understands the given URL.
-        for (DriverInfo aDriver : registeredDrivers) {
-            // If the caller does not have permission to load the driver then
-            // skip it.
-            if(isDriverAllowed(aDriver.driver, callerClass)) {
-                try {
-                    if(aDriver.driver.acceptsURL(url)) {
-                        // Success!
-                        println("getDriver returning " + aDriver.driver.getClass().getName());
-                    return (aDriver.driver);
-                    }
-
-                } catch(SQLException sqe) {
-                    // Drop through and try the next driver.
-                }
-            } else {
-                println("    skipping: " + aDriver.driver.getClass().getName());
-            }
-
-        }
-
-        println("getDriver: no suitable driver");
-        throw new SQLException("No suitable driver", "08001");
-    }
-
-
-    /**
-     * Registers the given driver with the <code>DriverManager</code>.
-     * A newly-loaded driver class should call
-     * the method <code>registerDriver</code> to make itself
-     * known to the <code>DriverManager</code>.
-     *
-     * @param driver the new JDBC Driver that is to be registered with the
-     *               <code>DriverManager</code>
-     * @exception SQLException if a database access error occurs
-     */
-    public static synchronized void registerDriver(java.sql.Driver driver)
-        throws SQLException {
-
-        /* Register the driver if it has not already been added to our list */
-        if(driver != null) {
-            registeredDrivers.addIfAbsent(new DriverInfo(driver));
-        } else {
-            // This is for compatibility with the original DriverManager
-            throw new NullPointerException();
-        }
-
-        println("registerDriver: " + driver);
-
-    }
-
-    /**
-     * Drops a driver from the <code>DriverManager</code>'s list.
-     *  Applets can only deregister drivers from their own classloaders.
-     *
-     * @param driver the JDBC Driver to drop
-     * @exception SQLException if a database access error occurs
-     */
-    @CallerSensitive
-    public static synchronized void deregisterDriver(Driver driver)
-        throws SQLException {
-        if (driver == null) {
-            return;
-        }
-
-        println("DriverManager.deregisterDriver: " + driver);
-
-        DriverInfo aDriver = new DriverInfo(driver);
-        if(registeredDrivers.contains(aDriver)) {
-            if (isDriverAllowed(driver, Reflection.getCallerClass())) {
-                 registeredDrivers.remove(aDriver);
-            } else {
-                // If the caller does not have permission to load the driver then
-                // throw a SecurityException.
-                throw new SecurityException();
-            }
-        } else {
-            println("    couldn't find driver to unload");
-        }
-    }
-
-    /**
-     * Retrieves an Enumeration with all of the currently loaded JDBC drivers
-     * to which the current caller has access.
-     *
-     * <P><B>Note:</B> The classname of a driver can be found using
-     * <CODE>d.getClass().getName()</CODE>
-     *
-     * @return the list of JDBC Drivers loaded by the caller's class loader
-     */
-    @CallerSensitive
-    public static java.util.Enumeration<Driver> getDrivers() {
-        java.util.Vector<Driver> result = new java.util.Vector<Driver>();
-
-        Class<?> callerClass = Reflection.getCallerClass();
-
-        // Walk through the loaded registeredDrivers.
-        for(DriverInfo aDriver : registeredDrivers) {
-            // If the caller does not have permission to load the driver then
-            // skip it.
-            if(isDriverAllowed(aDriver.driver, callerClass)) {
-                result.addElement(aDriver.driver);
-            } else {
-                println("    skipping: " + aDriver.getClass().getName());
-            }
-        }
-        return (result.elements());
-    }
-
-
-    /**
-     * Sets the maximum time in seconds that a driver will wait
-     * while attempting to connect to a database.
-     *
-     * @param seconds the login time limit in seconds; zero means there is no limit
-     * @see #getLoginTimeout
-     */
-    public static void setLoginTimeout(int seconds) {
-        loginTimeout = seconds;
-    }
-
-    /**
-     * Gets the maximum time in seconds that a driver can wait
-     * when attempting to log in to a database.
-     *
-     * @return the driver login time limit in seconds
-     * @see #setLoginTimeout
-     */
-    public static int getLoginTimeout() {
-        return (loginTimeout);
-    }
-
-    /**
-     * Sets the logging/tracing PrintStream that is used
-     * by the <code>DriverManager</code>
-     * and all drivers.
-     *<P>
-     * In the Java 2 SDK, Standard Edition, version 1.3 release, this method checks
-     * to see that there is an <code>SQLPermission</code> object before setting
-     * the logging stream.  If a <code>SecurityManager</code> exists and its
-     * <code>checkPermission</code> method denies setting the log writer, this
-     * method throws a <code>java.lang.SecurityException</code>.
-     *
-     * @param out the new logging/tracing PrintStream; to disable, set to <code>null</code>
-     * @deprecated
-     * @throws SecurityException if a security manager exists and its
-     *    <code>checkPermission</code> method denies setting the log stream
-     *
-     * @see SecurityManager#checkPermission
-     * @see #getLogStream
-     */
-    public static void setLogStream(java.io.PrintStream out) {
-
-        SecurityManager sec = System.getSecurityManager();
-        if (sec != null) {
-            sec.checkPermission(SET_LOG_PERMISSION);
-        }
-
-        logStream = out;
-        if ( out != null )
-            logWriter = new java.io.PrintWriter(out);
-        else
-            logWriter = null;
-    }
-
-    /**
-     * Retrieves the logging/tracing PrintStream that is used by the <code>DriverManager</code>
-     * and all drivers.
-     *
-     * @return the logging/tracing PrintStream; if disabled, is <code>null</code>
-     * @deprecated
-     * @see #setLogStream
-     */
-    public static java.io.PrintStream getLogStream() {
-        return logStream;
-    }
-
-    /**
-     * Prints a message to the current JDBC log stream.
-     *
-     * @param message a log or tracing message
-     */
-    public static void println(String message) {
-        synchronized (logSync) {
-            if (logWriter != null) {
-                logWriter.println(message);
-
-                // automatic flushing is never enabled, so we must do it ourselves
-                logWriter.flush();
-            }
-        }
-    }
-
-    //------------------------------------------------------------------------
-
-    // Indicates whether the class object that would be created if the code calling
-    // DriverManager is accessible.
-    private static boolean isDriverAllowed(Driver driver, Class<?> caller) {
-        ClassLoader callerCL = caller != null ? caller.getClassLoader() : null;
-        return isDriverAllowed(driver, callerCL);
-    }
-
-    private static boolean isDriverAllowed(Driver driver, ClassLoader classLoader) {
-        boolean result = false;
-        if(driver != null) {
-            Class<?> aClass = null;
-            try {
-                aClass =  Class.forName(driver.getClass().getName(), true, classLoader);
-            } catch (Exception ex) {
-                result = false;
-            }
-
-             result = ( aClass == driver.getClass() ) ? true : false;
-        }
-
-        return result;
-    }
-
-    private static void loadInitialDrivers() {
-        String drivers;
-        try {
-            drivers = AccessController.doPrivileged(new PrivilegedAction<String>() {
-                public String run() {
-                    return System.getProperty("jdbc.drivers");
-                }
-            });
-        } catch (Exception ex) {
-            drivers = null;
-        }
-        // If the driver is packaged as a Service Provider, load it.
-        // Get all the drivers through the classloader
-        // exposed as a java.sql.Driver.class service.
-        // ServiceLoader.load() replaces the sun.misc.Providers()
-
-        AccessController.doPrivileged(new PrivilegedAction<Void>() {
-            public Void run() {
-
-                ServiceLoader<Driver> loadedDrivers = ServiceLoader.load(Driver.class);
-                Iterator driversIterator = loadedDrivers.iterator();
-
-                /* Load these drivers, so that they can be instantiated.
-                 * It may be the case that the driver class may not be there
-                 * i.e. there may be a packaged driver with the service class
-                 * as implementation of java.sql.Driver but the actual class
-                 * may be missing. In that case a java.util.ServiceConfigurationError
-                 * will be thrown at runtime by the VM trying to locate
-                 * and load the service.
-                 *
-                 * Adding a try catch block to catch those runtime errors
-                 * if driver not available in classpath but it's
-                 * packaged as service and that service is there in classpath.
-                 */
-                try{
-                    while(driversIterator.hasNext()) {
-                        driversIterator.next();
-                    }
-                } catch(Throwable t) {
-                // Do nothing
-                }
-                return null;
-            }
-        });
-
-        println("DriverManager.initialize: jdbc.drivers = " + drivers);
-
-        if (drivers == null || drivers.equals("")) {
-            return;
-        }
-        String[] driversList = drivers.split(":");
-        println("number of Drivers:" + driversList.length);
-        for (String aDriver : driversList) {
-            try {
-                println("DriverManager.Initialize: loading " + aDriver);
-                Class.forName(aDriver, true,
-                        ClassLoader.getSystemClassLoader());
-            } catch (Exception ex) {
-                println("DriverManager.Initialize: load failed: " + ex);
-            }
-        }
-    }
-
-
-    //  Worker method called by the public getConnection() methods.
-    private static Connection getConnection(
-        String url, java.util.Properties info, Class<?> caller) throws SQLException {
-        /*
-         * When callerCl is null, we should check the application's
-         * (which is invoking this class indirectly)
-         * classloader, so that the JDBC driver class outside rt.jar
-         * can be loaded from here.
-         */
-        ClassLoader callerCL = caller != null ? caller.getClassLoader() : null;
-        synchronized (DriverManager.class) {
-            // synchronize loading of the correct classloader.
-            if (callerCL == null) {
-                callerCL = Thread.currentThread().getContextClassLoader();
-            }
-        }
-
-        if(url == null) {
-            throw new SQLException("The url cannot be null", "08001");
-        }
-
-        println("DriverManager.getConnection(\"" + url + "\")");
-
-        // Walk through the loaded registeredDrivers attempting to make a connection.
-        // Remember the first exception that gets raised so we can reraise it.
-        SQLException reason = null;
-
-        for(DriverInfo aDriver : registeredDrivers) {
-            // If the caller does not have permission to load the driver then
-            // skip it.
-            if(isDriverAllowed(aDriver.driver, callerCL)) {
-                try {
-                    println("    trying " + aDriver.driver.getClass().getName());
-                    Connection con = aDriver.driver.connect(url, info);
-                    if (con != null) {
-                        // Success!
-                        println("getConnection returning " + aDriver.driver.getClass().getName());
-                        return (con);
-                    }
-                } catch (SQLException ex) {
-                    if (reason == null) {
-                        reason = ex;
-                    }
-                }
-
-            } else {
-                println("    skipping: " + aDriver.getClass().getName());
-            }
-
-        }
-
-        // if we got here nobody could connect.
-        if (reason != null)    {
-            println("getConnection failed: " + reason);
-            throw reason;
-        }
-
-        println("getConnection: no suitable driver found for "+ url);
-        throw new SQLException("No suitable driver found for "+ url, "08001");
-    }
-}
-
-/*
- * Wrapper class for registered Drivers in order to not expose Driver.equals()
- * to avoid the capture of the Driver it being compared to as it might not
- * normally have access.
- */
-class DriverInfo {
-
-    final Driver driver;
-    DriverInfo(Driver driver) {
-        this.driver = driver;
-    }
-
-    public boolean equals(Object other) {
-        return (other instanceof DriverInfo)
-                && this.driver == ((DriverInfo) other).driver;
-    }
-
-    public int hashCode() {
-        return driver.hashCode();
-    }
-
-    public String toString() {
-        return ("driver[className="  + driver + "]");
-    }
-}
diff --git a/openjdk/java/util/ResourceBundle.java b/openjdk/java/util/ResourceBundle.java
deleted file mode 100644
index 98ee3c51..00000000
--- a/openjdk/java/util/ResourceBundle.java
+++ /dev/null
@@ -1,2912 +0,0 @@
-/*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved
- * (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved
- *
- * The original version of this source code and documentation
- * is copyrighted and owned by Taligent, Inc., a wholly-owned
- * subsidiary of IBM. These materials are provided under terms
- * of a License Agreement between Taligent and Sun. This technology
- * is protected by multiple US and International patents.
- *
- * This notice and attribution to Taligent may not be removed.
- * Taligent is a registered trademark of Taligent, Inc.
- *
- */
-
-package java.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.SoftReference;
-import java.lang.ref.WeakReference;
-import java.net.JarURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.jar.JarEntry;
-
-import sun.reflect.CallerSensitive;
-import sun.reflect.Reflection;
-import sun.util.locale.BaseLocale;
-import sun.util.locale.LocaleObjectCache;
-
-
-/**
- *
- * Resource bundles contain locale-specific objects.  When your program needs a
- * locale-specific resource, a <code>String</code> for example, your program can
- * load it from the resource bundle that is appropriate for the current user's
- * locale. In this way, you can write program code that is largely independent
- * of the user's locale isolating most, if not all, of the locale-specific
- * information in resource bundles.
- *
- * <p>
- * This allows you to write programs that can:
- * <UL type=SQUARE>
- * <LI> be easily localized, or translated, into different languages
- * <LI> handle multiple locales at once
- * <LI> be easily modified later to support even more locales
- * </UL>
- *
- * <P>
- * Resource bundles belong to families whose members share a common base
- * name, but whose names also have additional components that identify
- * their locales. For example, the base name of a family of resource
- * bundles might be "MyResources". The family should have a default
- * resource bundle which simply has the same name as its family -
- * "MyResources" - and will be used as the bundle of last resort if a
- * specific locale is not supported. The family can then provide as
- * many locale-specific members as needed, for example a German one
- * named "MyResources_de".
- *
- * <P>
- * Each resource bundle in a family contains the same items, but the items have
- * been translated for the locale represented by that resource bundle.
- * For example, both "MyResources" and "MyResources_de" may have a
- * <code>String</code> that's used on a button for canceling operations.
- * In "MyResources" the <code>String</code> may contain "Cancel" and in
- * "MyResources_de" it may contain "Abbrechen".
- *
- * <P>
- * If there are different resources for different countries, you
- * can make specializations: for example, "MyResources_de_CH" contains objects for
- * the German language (de) in Switzerland (CH). If you want to only
- * modify some of the resources
- * in the specialization, you can do so.
- *
- * <P>
- * When your program needs a locale-specific object, it loads
- * the <code>ResourceBundle</code> class using the
- * {@link #getBundle(java.lang.String, java.util.Locale) getBundle}
- * method:
- * <blockquote>
- * <pre>
- * ResourceBundle myResources =
- *      ResourceBundle.getBundle("MyResources", currentLocale);
- * </pre>
- * </blockquote>
- *
- * <P>
- * Resource bundles contain key/value pairs. The keys uniquely
- * identify a locale-specific object in the bundle. Here's an
- * example of a <code>ListResourceBundle</code> that contains
- * two key/value pairs:
- * <blockquote>
- * <pre>
- * public class MyResources extends ListResourceBundle {
- *     protected Object[][] getContents() {
- *         return new Object[][] {
- *             // LOCALIZE THE SECOND STRING OF EACH ARRAY (e.g., "OK")
- *             {"OkKey", "OK"},
- *             {"CancelKey", "Cancel"},
- *             // END OF MATERIAL TO LOCALIZE
- *        };
- *     }
- * }
- * </pre>
- * </blockquote>
- * Keys are always <code>String</code>s.
- * In this example, the keys are "OkKey" and "CancelKey".
- * In the above example, the values
- * are also <code>String</code>s--"OK" and "Cancel"--but
- * they don't have to be. The values can be any type of object.
- *
- * <P>
- * You retrieve an object from resource bundle using the appropriate
- * getter method. Because "OkKey" and "CancelKey"
- * are both strings, you would use <code>getString</code> to retrieve them:
- * <blockquote>
- * <pre>
- * button1 = new Button(myResources.getString("OkKey"));
- * button2 = new Button(myResources.getString("CancelKey"));
- * </pre>
- * </blockquote>
- * The getter methods all require the key as an argument and return
- * the object if found. If the object is not found, the getter method
- * throws a <code>MissingResourceException</code>.
- *
- * <P>
- * Besides <code>getString</code>, <code>ResourceBundle</code> also provides
- * a method for getting string arrays, <code>getStringArray</code>,
- * as well as a generic <code>getObject</code> method for any other
- * type of object. When using <code>getObject</code>, you'll
- * have to cast the result to the appropriate type. For example:
- * <blockquote>
- * <pre>
- * int[] myIntegers = (int[]) myResources.getObject("intList");
- * </pre>
- * </blockquote>
- *
- * <P>
- * The Java Platform provides two subclasses of <code>ResourceBundle</code>,
- * <code>ListResourceBundle</code> and <code>PropertyResourceBundle</code>,
- * that provide a fairly simple way to create resources.
- * As you saw briefly in a previous example, <code>ListResourceBundle</code>
- * manages its resource as a list of key/value pairs.
- * <code>PropertyResourceBundle</code> uses a properties file to manage
- * its resources.
- *
- * <p>
- * If <code>ListResourceBundle</code> or <code>PropertyResourceBundle</code>
- * do not suit your needs, you can write your own <code>ResourceBundle</code>
- * subclass.  Your subclasses must override two methods: <code>handleGetObject</code>
- * and <code>getKeys()</code>.
- *
- * <h4>ResourceBundle.Control</h4>
- *
- * The {@link ResourceBundle.Control} class provides information necessary
- * to perform the bundle loading process by the <code>getBundle</code>
- * factory methods that take a <code>ResourceBundle.Control</code>
- * instance. You can implement your own subclass in order to enable
- * non-standard resource bundle formats, change the search strategy, or
- * define caching parameters. Refer to the descriptions of the class and the
- * {@link #getBundle(String, Locale, ClassLoader, Control) getBundle}
- * factory method for details.
- *
- * <h4>Cache Management</h4>
- *
- * Resource bundle instances created by the <code>getBundle</code> factory
- * methods are cached by default, and the factory methods return the same
- * resource bundle instance multiple times if it has been
- * cached. <code>getBundle</code> clients may clear the cache, manage the
- * lifetime of cached resource bundle instances using time-to-live values,
- * or specify not to cache resource bundle instances. Refer to the
- * descriptions of the {@linkplain #getBundle(String, Locale, ClassLoader,
- * Control) <code>getBundle</code> factory method}, {@link
- * #clearCache(ClassLoader) clearCache}, {@link
- * Control#getTimeToLive(String, Locale)
- * ResourceBundle.Control.getTimeToLive}, and {@link
- * Control#needsReload(String, Locale, String, ClassLoader, ResourceBundle,
- * long) ResourceBundle.Control.needsReload} for details.
- *
- * <h4>Example</h4>
- *
- * The following is a very simple example of a <code>ResourceBundle</code>
- * subclass, <code>MyResources</code>, that manages two resources (for a larger number of
- * resources you would probably use a <code>Map</code>).
- * Notice that you don't need to supply a value if
- * a "parent-level" <code>ResourceBundle</code> handles the same
- * key with the same value (as for the okKey below).
- * <blockquote>
- * <pre>
- * // default (English language, United States)
- * public class MyResources extends ResourceBundle {
- *     public Object handleGetObject(String key) {
- *         if (key.equals("okKey")) return "Ok";
- *         if (key.equals("cancelKey")) return "Cancel";
- *         return null;
- *     }
- *
- *     public Enumeration&lt;String&gt; getKeys() {
- *         return Collections.enumeration(keySet());
- *     }
- *
- *     // Overrides handleKeySet() so that the getKeys() implementation
- *     // can rely on the keySet() value.
- *     protected Set&lt;String&gt; handleKeySet() {
- *         return new HashSet&lt;String&gt;(Arrays.asList("okKey", "cancelKey"));
- *     }
- * }
- *
- * // German language
- * public class MyResources_de extends MyResources {
- *     public Object handleGetObject(String key) {
- *         // don't need okKey, since parent level handles it.
- *         if (key.equals("cancelKey")) return "Abbrechen";
- *         return null;
- *     }
- *
- *     protected Set&lt;String&gt; handleKeySet() {
- *         return new HashSet&lt;String&gt;(Arrays.asList("cancelKey"));
- *     }
- * }
- * </pre>
- * </blockquote>
- * You do not have to restrict yourself to using a single family of
- * <code>ResourceBundle</code>s. For example, you could have a set of bundles for
- * exception messages, <code>ExceptionResources</code>
- * (<code>ExceptionResources_fr</code>, <code>ExceptionResources_de</code>, ...),
- * and one for widgets, <code>WidgetResource</code> (<code>WidgetResources_fr</code>,
- * <code>WidgetResources_de</code>, ...); breaking up the resources however you like.
- *
- * @see ListResourceBundle
- * @see PropertyResourceBundle
- * @see MissingResourceException
- * @since JDK1.1
- */
-public abstract class ResourceBundle {
-
-    /** initial size of the bundle cache */
-    private static final int INITIAL_CACHE_SIZE = 32;
-
-    /** constant indicating that no resource bundle exists */
-    private static final ResourceBundle NONEXISTENT_BUNDLE = new ResourceBundle() {
-            public Enumeration<String> getKeys() { return null; }
-            protected Object handleGetObject(String key) { return null; }
-            public String toString() { return "NONEXISTENT_BUNDLE"; }
-        };
-
-
-    /**
-     * The cache is a map from cache keys (with bundle base name, locale, and
-     * class loader) to either a resource bundle or NONEXISTENT_BUNDLE wrapped by a
-     * BundleReference.
-     *
-     * The cache is a ConcurrentMap, allowing the cache to be searched
-     * concurrently by multiple threads.  This will also allow the cache keys
-     * to be reclaimed along with the ClassLoaders they reference.
-     *
-     * This variable would be better named "cache", but we keep the old
-     * name for compatibility with some workarounds for bug 4212439.
-     */
-    private static final ConcurrentMap<CacheKey, BundleReference> cacheList
-        = new ConcurrentHashMap<>(INITIAL_CACHE_SIZE);
-
-    /**
-     * Queue for reference objects referring to class loaders or bundles.
-     */
-    private static final ReferenceQueue referenceQueue = new ReferenceQueue();
-
-    /**
-     * The parent bundle of this bundle.
-     * The parent bundle is searched by {@link #getObject getObject}
-     * when this bundle does not contain a particular resource.
-     */
-    protected ResourceBundle parent = null;
-
-    /**
-     * The locale for this bundle.
-     */
-    private Locale locale = null;
-
-    /**
-     * The base bundle name for this bundle.
-     */
-    private String name;
-
-    /**
-     * The flag indicating this bundle has expired in the cache.
-     */
-    private volatile boolean expired;
-
-    /**
-     * The back link to the cache key. null if this bundle isn't in
-     * the cache (yet) or has expired.
-     */
-    private volatile CacheKey cacheKey;
-
-    /**
-     * A Set of the keys contained only in this ResourceBundle.
-     */
-    private volatile Set<String> keySet;
-
-    /**
-     * Sole constructor.  (For invocation by subclass constructors, typically
-     * implicit.)
-     */
-    public ResourceBundle() {
-    }
-
-    /**
-     * Gets a string for the given key from this resource bundle or one of its parents.
-     * Calling this method is equivalent to calling
-     * <blockquote>
-     * <code>(String) {@link #getObject(java.lang.String) getObject}(key)</code>.
-     * </blockquote>
-     *
-     * @param key the key for the desired string
-     * @exception NullPointerException if <code>key</code> is <code>null</code>
-     * @exception MissingResourceException if no object for the given key can be found
-     * @exception ClassCastException if the object found for the given key is not a string
-     * @return the string for the given key
-     */
-    public final String getString(String key) {
-        return (String) getObject(key);
-    }
-
-    /**
-     * Gets a string array for the given key from this resource bundle or one of its parents.
-     * Calling this method is equivalent to calling
-     * <blockquote>
-     * <code>(String[]) {@link #getObject(java.lang.String) getObject}(key)</code>.
-     * </blockquote>
-     *
-     * @param key the key for the desired string array
-     * @exception NullPointerException if <code>key</code> is <code>null</code>
-     * @exception MissingResourceException if no object for the given key can be found
-     * @exception ClassCastException if the object found for the given key is not a string array
-     * @return the string array for the given key
-     */
-    public final String[] getStringArray(String key) {
-        return (String[]) getObject(key);
-    }
-
-    /**
-     * Gets an object for the given key from this resource bundle or one of its parents.
-     * This method first tries to obtain the object from this resource bundle using
-     * {@link #handleGetObject(java.lang.String) handleGetObject}.
-     * If not successful, and the parent resource bundle is not null,
-     * it calls the parent's <code>getObject</code> method.
-     * If still not successful, it throws a MissingResourceException.
-     *
-     * @param key the key for the desired object
-     * @exception NullPointerException if <code>key</code> is <code>null</code>
-     * @exception MissingResourceException if no object for the given key can be found
-     * @return the object for the given key
-     */
-    public final Object getObject(String key) {
-        Object obj = handleGetObject(key);
-        if (obj == null) {
-            if (parent != null) {
-                obj = parent.getObject(key);
-            }
-            if (obj == null)
-                throw new MissingResourceException("Can't find resource for bundle "
-                                                   +this.getClass().getName()
-                                                   +", key "+key,
-                                                   this.getClass().getName(),
-                                                   key);
-        }
-        return obj;
-    }
-
-    /**
-     * Returns the locale of this resource bundle. This method can be used after a
-     * call to getBundle() to determine whether the resource bundle returned really
-     * corresponds to the requested locale or is a fallback.
-     *
-     * @return the locale of this resource bundle
-     */
-    public Locale getLocale() {
-        return locale;
-    }
-
-    /*
-     * Automatic determination of the ClassLoader to be used to load
-     * resources on behalf of the client.
-     */
-    private static ClassLoader getLoader(Class<?> caller) {
-        ClassLoader cl = caller == null ? null : caller.getClassLoader();
-        if (cl == null) {
-            // When the caller's loader is the boot class loader, cl is null
-            // here. In that case, ClassLoader.getSystemClassLoader() may
-            // return the same class loader that the application is
-            // using. We therefore use a wrapper ClassLoader to create a
-            // separate scope for bundles loaded on behalf of the Java
-            // runtime so that these bundles cannot be returned from the
-            // cache to the application (5048280).
-            cl = RBClassLoader.INSTANCE;
-        }
-        return cl;
-    }
-
-    /**
-     * A wrapper of ClassLoader.getSystemClassLoader().
-     */
-    private static class RBClassLoader extends ClassLoader {
-        private static final RBClassLoader INSTANCE = AccessController.doPrivileged(
-                    new PrivilegedAction<RBClassLoader>() {
-                        public RBClassLoader run() {
-                            return new RBClassLoader();
-                        }
-                    });
-        private static final ClassLoader loader = ClassLoader.getSystemClassLoader();
-
-        private RBClassLoader() {
-        }
-        public Class<?> loadClass(String name) throws ClassNotFoundException {
-            if (loader != null) {
-                return loader.loadClass(name);
-            }
-            return Class.forName(name);
-        }
-        public URL getResource(String name) {
-            if (loader != null) {
-                return loader.getResource(name);
-            }
-            return ClassLoader.getSystemResource(name);
-        }
-        public InputStream getResourceAsStream(String name) {
-            if (loader != null) {
-                return loader.getResourceAsStream(name);
-            }
-            return ClassLoader.getSystemResourceAsStream(name);
-        }
-    }
-
-    /**
-     * Sets the parent bundle of this bundle.
-     * The parent bundle is searched by {@link #getObject getObject}
-     * when this bundle does not contain a particular resource.
-     *
-     * @param parent this bundle's parent bundle.
-     */
-    protected void setParent(ResourceBundle parent) {
-        assert parent != NONEXISTENT_BUNDLE;
-        this.parent = parent;
-    }
-
-    /**
-     * Key used for cached resource bundles.  The key checks the base
-     * name, the locale, and the class loader to determine if the
-     * resource is a match to the requested one. The loader may be
-     * null, but the base name and the locale must have a non-null
-     * value.
-     */
-    private static final class CacheKey implements Cloneable {
-        // These three are the actual keys for lookup in Map.
-        private String name;
-        private Locale locale;
-        private LoaderReference loaderRef;
-
-        // bundle format which is necessary for calling
-        // Control.needsReload().
-        private String format;
-
-        // These time values are in CacheKey so that NONEXISTENT_BUNDLE
-        // doesn't need to be cloned for caching.
-
-        // The time when the bundle has been loaded
-        private volatile long loadTime;
-
-        // The time when the bundle expires in the cache, or either
-        // Control.TTL_DONT_CACHE or Control.TTL_NO_EXPIRATION_CONTROL.
-        private volatile long expirationTime;
-
-        // Placeholder for an error report by a Throwable
-        private Throwable cause;
-
-        // Hash code value cache to avoid recalculating the hash code
-        // of this instance.
-        private int hashCodeCache;
-
-        CacheKey(String baseName, Locale locale, ClassLoader loader) {
-            this.name = baseName;
-            this.locale = locale;
-            if (loader == null) {
-                this.loaderRef = null;
-            } else {
-                loaderRef = new LoaderReference(loader, referenceQueue, this);
-            }
-            calculateHashCode();
-        }
-
-        String getName() {
-            return name;
-        }
-
-        CacheKey setName(String baseName) {
-            if (!this.name.equals(baseName)) {
-                this.name = baseName;
-                calculateHashCode();
-            }
-            return this;
-        }
-
-        Locale getLocale() {
-            return locale;
-        }
-
-        CacheKey setLocale(Locale locale) {
-            if (!this.locale.equals(locale)) {
-                this.locale = locale;
-                calculateHashCode();
-            }
-            return this;
-        }
-
-        ClassLoader getLoader() {
-            return (loaderRef != null) ? loaderRef.get() : null;
-        }
-
-        public boolean equals(Object other) {
-            if (this == other) {
-                return true;
-            }
-            try {
-                final CacheKey otherEntry = (CacheKey)other;
-                //quick check to see if they are not equal
-                if (hashCodeCache != otherEntry.hashCodeCache) {
-                    return false;
-                }
-                //are the names the same?
-                if (!name.equals(otherEntry.name)) {
-                    return false;
-                }
-                // are the locales the same?
-                if (!locale.equals(otherEntry.locale)) {
-                    return false;
-                }
-                //are refs (both non-null) or (both null)?
-                if (loaderRef == null) {
-                    return otherEntry.loaderRef == null;
-                }
-                ClassLoader loader = loaderRef.get();
-                return (otherEntry.loaderRef != null)
-                        // with a null reference we can no longer find
-                        // out which class loader was referenced; so
-                        // treat it as unequal
-                        && (loader != null)
-                        && (loader == otherEntry.loaderRef.get());
-            } catch (NullPointerException e) {
-            } catch (ClassCastException e) {
-            }
-            return false;
-        }
-
-        public int hashCode() {
-            return hashCodeCache;
-        }
-
-        private void calculateHashCode() {
-            hashCodeCache = name.hashCode() << 3;
-            hashCodeCache ^= locale.hashCode();
-            ClassLoader loader = getLoader();
-            if (loader != null) {
-                hashCodeCache ^= loader.hashCode();
-            }
-        }
-
-        public Object clone() {
-            try {
-                CacheKey clone = (CacheKey) super.clone();
-                if (loaderRef != null) {
-                    clone.loaderRef = new LoaderReference(loaderRef.get(),
-                                                          referenceQueue, clone);
-                }
-                // Clear the reference to a Throwable
-                clone.cause = null;
-                return clone;
-            } catch (CloneNotSupportedException e) {
-                //this should never happen
-                throw new InternalError();
-            }
-        }
-
-        String getFormat() {
-            return format;
-        }
-
-        void setFormat(String format) {
-            this.format = format;
-        }
-
-        private void setCause(Throwable cause) {
-            if (this.cause == null) {
-                this.cause = cause;
-            } else {
-                // Override the cause if the previous one is
-                // ClassNotFoundException.
-                if (this.cause instanceof ClassNotFoundException) {
-                    this.cause = cause;
-                }
-            }
-        }
-
-        private Throwable getCause() {
-            return cause;
-        }
-
-        public String toString() {
-            String l = locale.toString();
-            if (l.length() == 0) {
-                if (locale.getVariant().length() != 0) {
-                    l = "__" + locale.getVariant();
-                } else {
-                    l = "\"\"";
-                }
-            }
-            return "CacheKey[" + name + ", lc=" + l + ", ldr=" + getLoader()
-                + "(format=" + format + ")]";
-        }
-    }
-
-    /**
-     * The common interface to get a CacheKey in LoaderReference and
-     * BundleReference.
-     */
-    private static interface CacheKeyReference {
-        public CacheKey getCacheKey();
-    }
-
-    /**
-     * References to class loaders are weak references, so that they can be
-     * garbage collected when nobody else is using them. The ResourceBundle
-     * class has no reason to keep class loaders alive.
-     */
-    private static final class LoaderReference extends WeakReference<ClassLoader>
-                                               implements CacheKeyReference {
-        private CacheKey cacheKey;
-
-        LoaderReference(ClassLoader referent, ReferenceQueue q, CacheKey key) {
-            super(referent, q);
-            cacheKey = key;
-        }
-
-        public CacheKey getCacheKey() {
-            return cacheKey;
-        }
-    }
-
-    /**
-     * References to bundles are soft references so that they can be garbage
-     * collected when they have no hard references.
-     */
-    private static final class BundleReference extends SoftReference<ResourceBundle>
-                                               implements CacheKeyReference {
-        private CacheKey cacheKey;
-
-        BundleReference(ResourceBundle referent, ReferenceQueue q, CacheKey key) {
-            super(referent, q);
-            cacheKey = key;
-        }
-
-        public CacheKey getCacheKey() {
-            return cacheKey;
-        }
-    }
-
-    /**
-     * Gets a resource bundle using the specified base name, the default locale,
-     * and the caller's class loader. Calling this method is equivalent to calling
-     * <blockquote>
-     * <code>getBundle(baseName, Locale.getDefault(), this.getClass().getClassLoader())</code>,
-     * </blockquote>
-     * except that <code>getClassLoader()</code> is run with the security
-     * privileges of <code>ResourceBundle</code>.
-     * See {@link #getBundle(String, Locale, ClassLoader) getBundle}
-     * for a complete description of the search and instantiation strategy.
-     *
-     * @param baseName the base name of the resource bundle, a fully qualified class name
-     * @exception java.lang.NullPointerException
-     *     if <code>baseName</code> is <code>null</code>
-     * @exception MissingResourceException
-     *     if no resource bundle for the specified base name can be found
-     * @return a resource bundle for the given base name and the default locale
-     */
-    @CallerSensitive
-    public static final ResourceBundle getBundle(String baseName)
-    {
-        return getBundleImpl(baseName, Locale.getDefault(),
-                             /* must determine loader here, else we break stack invariant */
-                             getLoader(Reflection.getCallerClass()),
-                             Control.INSTANCE);
-    }
-
-    /**
-     * Returns a resource bundle using the specified base name, the
-     * default locale and the specified control. Calling this method
-     * is equivalent to calling
-     * <pre>
-     * getBundle(baseName, Locale.getDefault(),
-     *           this.getClass().getClassLoader(), control),
-     * </pre>
-     * except that <code>getClassLoader()</code> is run with the security
-     * privileges of <code>ResourceBundle</code>.  See {@link
-     * #getBundle(String, Locale, ClassLoader, Control) getBundle} for the
-     * complete description of the resource bundle loading process with a
-     * <code>ResourceBundle.Control</code>.
-     *
-     * @param baseName
-     *        the base name of the resource bundle, a fully qualified class
-     *        name
-     * @param control
-     *        the control which gives information for the resource bundle
-     *        loading process
-     * @return a resource bundle for the given base name and the default
-     *        locale
-     * @exception NullPointerException
-     *        if <code>baseName</code> or <code>control</code> is
-     *        <code>null</code>
-     * @exception MissingResourceException
-     *        if no resource bundle for the specified base name can be found
-     * @exception IllegalArgumentException
-     *        if the given <code>control</code> doesn't perform properly
-     *        (e.g., <code>control.getCandidateLocales</code> returns null.)
-     *        Note that validation of <code>control</code> is performed as
-     *        needed.
-     * @since 1.6
-     */
-    @CallerSensitive
-    public static final ResourceBundle getBundle(String baseName,
-                                                 Control control) {
-        return getBundleImpl(baseName, Locale.getDefault(),
-                             /* must determine loader here, else we break stack invariant */
-                             getLoader(Reflection.getCallerClass()),
-                             control);
-    }
-
-    /**
-     * Gets a resource bundle using the specified base name and locale,
-     * and the caller's class loader. Calling this method is equivalent to calling
-     * <blockquote>
-     * <code>getBundle(baseName, locale, this.getClass().getClassLoader())</code>,
-     * </blockquote>
-     * except that <code>getClassLoader()</code> is run with the security
-     * privileges of <code>ResourceBundle</code>.
-     * See {@link #getBundle(String, Locale, ClassLoader) getBundle}
-     * for a complete description of the search and instantiation strategy.
-     *
-     * @param baseName
-     *        the base name of the resource bundle, a fully qualified class name
-     * @param locale
-     *        the locale for which a resource bundle is desired
-     * @exception NullPointerException
-     *        if <code>baseName</code> or <code>locale</code> is <code>null</code>
-     * @exception MissingResourceException
-     *        if no resource bundle for the specified base name can be found
-     * @return a resource bundle for the given base name and locale
-     */
-    @CallerSensitive
-    public static final ResourceBundle getBundle(String baseName,
-                                                 Locale locale)
-    {
-        return getBundleImpl(baseName, locale,
-                             /* must determine loader here, else we break stack invariant */
-                             getLoader(Reflection.getCallerClass()),
-                             Control.INSTANCE);
-    }
-
-    /**
-     * Returns a resource bundle using the specified base name, target
-     * locale and control, and the caller's class loader. Calling this
-     * method is equivalent to calling
-     * <pre>
-     * getBundle(baseName, targetLocale, this.getClass().getClassLoader(),
-     *           control),
-     * </pre>
-     * except that <code>getClassLoader()</code> is run with the security
-     * privileges of <code>ResourceBundle</code>.  See {@link
-     * #getBundle(String, Locale, ClassLoader, Control) getBundle} for the
-     * complete description of the resource bundle loading process with a
-     * <code>ResourceBundle.Control</code>.
-     *
-     * @param baseName
-     *        the base name of the resource bundle, a fully qualified
-     *        class name
-     * @param targetLocale
-     *        the locale for which a resource bundle is desired
-     * @param control
-     *        the control which gives information for the resource
-     *        bundle loading process
-     * @return a resource bundle for the given base name and a
-     *        <code>Locale</code> in <code>locales</code>
-     * @exception NullPointerException
-     *        if <code>baseName</code>, <code>locales</code> or
-     *        <code>control</code> is <code>null</code>
-     * @exception MissingResourceException
-     *        if no resource bundle for the specified base name in any
-     *        of the <code>locales</code> can be found.
-     * @exception IllegalArgumentException
-     *        if the given <code>control</code> doesn't perform properly
-     *        (e.g., <code>control.getCandidateLocales</code> returns null.)
-     *        Note that validation of <code>control</code> is performed as
-     *        needed.
-     * @since 1.6
-     */
-    @CallerSensitive
-    public static final ResourceBundle getBundle(String baseName, Locale targetLocale,
-                                                 Control control) {
-        return getBundleImpl(baseName, targetLocale,
-                             /* must determine loader here, else we break stack invariant */
-                             getLoader(Reflection.getCallerClass()),
-                             control);
-    }
-
-    /**
-     * Gets a resource bundle using the specified base name, locale, and class
-     * loader.
-     *
-     * <p><a name="default_behavior"/>This method behaves the same as calling
-     * {@link #getBundle(String, Locale, ClassLoader, Control)} passing a
-     * default instance of {@link Control}. The following describes this behavior.
-     *
-     * <p><code>getBundle</code> uses the base name, the specified locale, and
-     * the default locale (obtained from {@link java.util.Locale#getDefault()
-     * Locale.getDefault}) to generate a sequence of <a
-     * name="candidates"><em>candidate bundle names</em></a>.  If the specified
-     * locale's language, script, country, and variant are all empty strings,
-     * then the base name is the only candidate bundle name.  Otherwise, a list
-     * of candidate locales is generated from the attribute values of the
-     * specified locale (language, script, country and variant) and appended to
-     * the base name.  Typically, this will look like the following:
-     *
-     * <pre>
-     *     baseName + "_" + language + "_" + script + "_" + country + "_" + variant
-     *     baseName + "_" + language + "_" + script + "_" + country
-     *     baseName + "_" + language + "_" + script
-     *     baseName + "_" + language + "_" + country + "_" + variant
-     *     baseName + "_" + language + "_" + country
-     *     baseName + "_" + language
-     * </pre>
-     *
-     * <p>Candidate bundle names where the final component is an empty string
-     * are omitted, along with the underscore.  For example, if country is an
-     * empty string, the second and the fifth candidate bundle names above
-     * would be omitted.  Also, if script is an empty string, the candidate names
-     * including script are omitted.  For example, a locale with language "de"
-     * and variant "JAVA" will produce candidate names with base name
-     * "MyResource" below.
-     *
-     * <pre>
-     *     MyResource_de__JAVA
-     *     MyResource_de
-     * </pre>
-     *
-     * In the case that the variant contains one or more underscores ('_'), a
-     * sequence of bundle names generated by truncating the last underscore and
-     * the part following it is inserted after a candidate bundle name with the
-     * original variant.  For example, for a locale with language "en", script
-     * "Latn, country "US" and variant "WINDOWS_VISTA", and bundle base name
-     * "MyResource", the list of candidate bundle names below is generated:
-     *
-     * <pre>
-     * MyResource_en_Latn_US_WINDOWS_VISTA
-     * MyResource_en_Latn_US_WINDOWS
-     * MyResource_en_Latn_US
-     * MyResource_en_Latn
-     * MyResource_en_US_WINDOWS_VISTA
-     * MyResource_en_US_WINDOWS
-     * MyResource_en_US
-     * MyResource_en
-     * </pre>
-     *
-     * <blockquote><b>Note:</b> For some <code>Locale</code>s, the list of
-     * candidate bundle names contains extra names, or the order of bundle names
-     * is slightly modified.  See the description of the default implementation
-     * of {@link Control#getCandidateLocales(String, Locale)
-     * getCandidateLocales} for details.</blockquote>
-     *
-     * <p><code>getBundle</code> then iterates over the candidate bundle names
-     * to find the first one for which it can <em>instantiate</em> an actual
-     * resource bundle. It uses the default controls' {@link Control#getFormats
-     * getFormats} method, which generates two bundle names for each generated
-     * name, the first a class name and the second a properties file name. For
-     * each candidate bundle name, it attempts to create a resource bundle:
-     *
-     * <ul><li>First, it attempts to load a class using the generated class name.
-     * If such a class can be found and loaded using the specified class
-     * loader, is assignment compatible with ResourceBundle, is accessible from
-     * ResourceBundle, and can be instantiated, <code>getBundle</code> creates a
-     * new instance of this class and uses it as the <em>result resource
-     * bundle</em>.
-     *
-     * <li>Otherwise, <code>getBundle</code> attempts to locate a property
-     * resource file using the generated properties file name.  It generates a
-     * path name from the candidate bundle name by replacing all "." characters
-     * with "/" and appending the string ".properties".  It attempts to find a
-     * "resource" with this name using {@link
-     * java.lang.ClassLoader#getResource(java.lang.String)
-     * ClassLoader.getResource}.  (Note that a "resource" in the sense of
-     * <code>getResource</code> has nothing to do with the contents of a
-     * resource bundle, it is just a container of data, such as a file.)  If it
-     * finds a "resource", it attempts to create a new {@link
-     * PropertyResourceBundle} instance from its contents.  If successful, this
-     * instance becomes the <em>result resource bundle</em>.  </ul>
-     *
-     * <p>This continues until a result resource bundle is instantiated or the
-     * list of candidate bundle names is exhausted.  If no matching resource
-     * bundle is found, the default control's {@link Control#getFallbackLocale
-     * getFallbackLocale} method is called, which returns the current default
-     * locale.  A new sequence of candidate locale names is generated using this
-     * locale and and searched again, as above.
-     *
-     * <p>If still no result bundle is found, the base name alone is looked up. If
-     * this still fails, a <code>MissingResourceException</code> is thrown.
-     *
-     * <p><a name="parent_chain"/> Once a result resource bundle has been found,
-     * its <em>parent chain</em> is instantiated.  If the result bundle already
-     * has a parent (perhaps because it was returned from a cache) the chain is
-     * complete.
-     *
-     * <p>Otherwise, <code>getBundle</code> examines the remainder of the
-     * candidate locale list that was used during the pass that generated the
-     * result resource bundle.  (As before, candidate bundle names where the
-     * final component is an empty string are omitted.)  When it comes to the
-     * end of the candidate list, it tries the plain bundle name.  With each of the
-     * candidate bundle names it attempts to instantiate a resource bundle (first
-     * looking for a class and then a properties file, as described above).
-     *
-     * <p>Whenever it succeeds, it calls the previously instantiated resource
-     * bundle's {@link #setParent(java.util.ResourceBundle) setParent} method
-     * with the new resource bundle.  This continues until the list of names
-     * is exhausted or the current bundle already has a non-null parent.
-     *
-     * <p>Once the parent chain is complete, the bundle is returned.
-     *
-     * <p><b>Note:</b> <code>getBundle</code> caches instantiated resource
-     * bundles and might return the same resource bundle instance multiple times.
-     *
-     * <p><b>Note:</b>The <code>baseName</code> argument should be a fully
-     * qualified class name. However, for compatibility with earlier versions,
-     * Sun's Java SE Runtime Environments do not verify this, and so it is
-     * possible to access <code>PropertyResourceBundle</code>s by specifying a
-     * path name (using "/") instead of a fully qualified class name (using
-     * ".").
-     *
-     * <p><a name="default_behavior_example"/>
-     * <strong>Example:</strong>
-     * <p>
-     * The following class and property files are provided:
-     * <pre>
-     *     MyResources.class
-     *     MyResources.properties
-     *     MyResources_fr.properties
-     *     MyResources_fr_CH.class
-     *     MyResources_fr_CH.properties
-     *     MyResources_en.properties
-     *     MyResources_es_ES.class
-     * </pre>
-     *
-     * The contents of all files are valid (that is, public non-abstract
-     * subclasses of <code>ResourceBundle</code> for the ".class" files,
-     * syntactically correct ".properties" files).  The default locale is
-     * <code>Locale("en", "GB")</code>.
-     *
-     * <p>Calling <code>getBundle</code> with the locale arguments below will
-     * instantiate resource bundles as follows:
-     *
-     * <table>
-     * <tr><td>Locale("fr", "CH")</td><td>MyResources_fr_CH.class, parent MyResources_fr.properties, parent MyResources.class</td></tr>
-     * <tr><td>Locale("fr", "FR")</td><td>MyResources_fr.properties, parent MyResources.class</td></tr>
-     * <tr><td>Locale("de", "DE")</td><td>MyResources_en.properties, parent MyResources.class</td></tr>
-     * <tr><td>Locale("en", "US")</td><td>MyResources_en.properties, parent MyResources.class</td></tr>
-     * <tr><td>Locale("es", "ES")</td><td>MyResources_es_ES.class, parent MyResources.class</td></tr>
-     * </table>
-     *
-     * <p>The file MyResources_fr_CH.properties is never used because it is
-     * hidden by the MyResources_fr_CH.class. Likewise, MyResources.properties
-     * is also hidden by MyResources.class.
-     *
-     * @param baseName the base name of the resource bundle, a fully qualified class name
-     * @param locale the locale for which a resource bundle is desired
-     * @param loader the class loader from which to load the resource bundle
-     * @return a resource bundle for the given base name and locale
-     * @exception java.lang.NullPointerException
-     *        if <code>baseName</code>, <code>locale</code>, or <code>loader</code> is <code>null</code>
-     * @exception MissingResourceException
-     *        if no resource bundle for the specified base name can be found
-     * @since 1.2
-     */
-    public static ResourceBundle getBundle(String baseName, Locale locale,
-                                           ClassLoader loader)
-    {
-        if (loader == null) {
-            throw new NullPointerException();
-        }
-        return getBundleImpl(baseName, locale, loader, Control.INSTANCE);
-    }
-
-    /**
-     * Returns a resource bundle using the specified base name, target
-     * locale, class loader and control. Unlike the {@linkplain
-     * #getBundle(String, Locale, ClassLoader) <code>getBundle</code>
-     * factory methods with no <code>control</code> argument}, the given
-     * <code>control</code> specifies how to locate and instantiate resource
-     * bundles. Conceptually, the bundle loading process with the given
-     * <code>control</code> is performed in the following steps.
-     *
-     * <p>
-     * <ol>
-     * <li>This factory method looks up the resource bundle in the cache for
-     * the specified <code>baseName</code>, <code>targetLocale</code> and
-     * <code>loader</code>.  If the requested resource bundle instance is
-     * found in the cache and the time-to-live periods of the instance and
-     * all of its parent instances have not expired, the instance is returned
-     * to the caller. Otherwise, this factory method proceeds with the
-     * loading process below.</li>
-     *
-     * <li>The {@link ResourceBundle.Control#getFormats(String)
-     * control.getFormats} method is called to get resource bundle formats
-     * to produce bundle or resource names. The strings
-     * <code>"java.class"</code> and <code>"java.properties"</code>
-     * designate class-based and {@linkplain PropertyResourceBundle
-     * property}-based resource bundles, respectively. Other strings
-     * starting with <code>"java."</code> are reserved for future extensions
-     * and must not be used for application-defined formats. Other strings
-     * designate application-defined formats.</li>
-     *
-     * <li>The {@link ResourceBundle.Control#getCandidateLocales(String,
-     * Locale) control.getCandidateLocales} method is called with the target
-     * locale to get a list of <em>candidate <code>Locale</code>s</em> for
-     * which resource bundles are searched.</li>
-     *
-     * <li>The {@link ResourceBundle.Control#newBundle(String, Locale,
-     * String, ClassLoader, boolean) control.newBundle} method is called to
-     * instantiate a <code>ResourceBundle</code> for the base bundle name, a
-     * candidate locale, and a format. (Refer to the note on the cache
-     * lookup below.) This step is iterated over all combinations of the
-     * candidate locales and formats until the <code>newBundle</code> method
-     * returns a <code>ResourceBundle</code> instance or the iteration has
-     * used up all the combinations. For example, if the candidate locales
-     * are <code>Locale("de", "DE")</code>, <code>Locale("de")</code> and
-     * <code>Locale("")</code> and the formats are <code>"java.class"</code>
-     * and <code>"java.properties"</code>, then the following is the
-     * sequence of locale-format combinations to be used to call
-     * <code>control.newBundle</code>.
-     *
-     * <table style="width: 50%; text-align: left; margin-left: 40px;"
-     *  border="0" cellpadding="2" cellspacing="2">
-     * <tbody><code>
-     * <tr>
-     * <td
-     * style="vertical-align: top; text-align: left; font-weight: bold; width: 50%;">Locale<br>
-     * </td>
-     * <td
-     * style="vertical-align: top; text-align: left; font-weight: bold; width: 50%;">format<br>
-     * </td>
-     * </tr>
-     * <tr>
-     * <td style="vertical-align: top; width: 50%;">Locale("de", "DE")<br>
-     * </td>
-     * <td style="vertical-align: top; width: 50%;">java.class<br>
-     * </td>
-     * </tr>
-     * <tr>
-     * <td style="vertical-align: top; width: 50%;">Locale("de", "DE")</td>
-     * <td style="vertical-align: top; width: 50%;">java.properties<br>
-     * </td>
-     * </tr>
-     * <tr>
-     * <td style="vertical-align: top; width: 50%;">Locale("de")</td>
-     * <td style="vertical-align: top; width: 50%;">java.class</td>
-     * </tr>
-     * <tr>
-     * <td style="vertical-align: top; width: 50%;">Locale("de")</td>
-     * <td style="vertical-align: top; width: 50%;">java.properties</td>
-     * </tr>
-     * <tr>
-     * <td style="vertical-align: top; width: 50%;">Locale("")<br>
-     * </td>
-     * <td style="vertical-align: top; width: 50%;">java.class</td>
-     * </tr>
-     * <tr>
-     * <td style="vertical-align: top; width: 50%;">Locale("")</td>
-     * <td style="vertical-align: top; width: 50%;">java.properties</td>
-     * </tr>
-     * </code></tbody>
-     * </table>
-     * </li>
-     *
-     * <li>If the previous step has found no resource bundle, proceed to
-     * Step 6. If a bundle has been found that is a base bundle (a bundle
-     * for <code>Locale("")</code>), and the candidate locale list only contained
-     * <code>Locale("")</code>, return the bundle to the caller. If a bundle
-     * has been found that is a base bundle, but the candidate locale list
-     * contained locales other than Locale(""), put the bundle on hold and
-     * proceed to Step 6. If a bundle has been found that is not a base
-     * bundle, proceed to Step 7.</li>
-     *
-     * <li>The {@link ResourceBundle.Control#getFallbackLocale(String,
-     * Locale) control.getFallbackLocale} method is called to get a fallback
-     * locale (alternative to the current target locale) to try further
-     * finding a resource bundle. If the method returns a non-null locale,
-     * it becomes the next target locale and the loading process starts over
-     * from Step 3. Otherwise, if a base bundle was found and put on hold in
-     * a previous Step 5, it is returned to the caller now. Otherwise, a
-     * MissingResourceException is thrown.</li>
-     *
-     * <li>At this point, we have found a resource bundle that's not the
-     * base bundle. If this bundle set its parent during its instantiation,
-     * it is returned to the caller. Otherwise, its <a
-     * href="./ResourceBundle.html#parent_chain">parent chain</a> is
-     * instantiated based on the list of candidate locales from which it was
-     * found. Finally, the bundle is returned to the caller.</li>
-     * </ol>
-     *
-     * <p>During the resource bundle loading process above, this factory
-     * method looks up the cache before calling the {@link
-     * Control#newBundle(String, Locale, String, ClassLoader, boolean)
-     * control.newBundle} method.  If the time-to-live period of the
-     * resource bundle found in the cache has expired, the factory method
-     * calls the {@link ResourceBundle.Control#needsReload(String, Locale,
-     * String, ClassLoader, ResourceBundle, long) control.needsReload}
-     * method to determine whether the resource bundle needs to be reloaded.
-     * If reloading is required, the factory method calls
-     * <code>control.newBundle</code> to reload the resource bundle.  If
-     * <code>control.newBundle</code> returns <code>null</code>, the factory
-     * method puts a dummy resource bundle in the cache as a mark of
-     * nonexistent resource bundles in order to avoid lookup overhead for
-     * subsequent requests. Such dummy resource bundles are under the same
-     * expiration control as specified by <code>control</code>.
-     *
-     * <p>All resource bundles loaded are cached by default. Refer to
-     * {@link Control#getTimeToLive(String,Locale)
-     * control.getTimeToLive} for details.
-     *
-     * <p>The following is an example of the bundle loading process with the
-     * default <code>ResourceBundle.Control</code> implementation.
-     *
-     * <p>Conditions:
-     * <ul>
-     * <li>Base bundle name: <code>foo.bar.Messages</code>
-     * <li>Requested <code>Locale</code>: {@link Locale#ITALY}</li>
-     * <li>Default <code>Locale</code>: {@link Locale#FRENCH}</li>
-     * <li>Available resource bundles:
-     * <code>foo/bar/Messages_fr.properties</code> and
-     * <code>foo/bar/Messages.properties</code></li>
-     * </ul>
-     *
-     * <p>First, <code>getBundle</code> tries loading a resource bundle in
-     * the following sequence.
-     *
-     * <ul>
-     * <li>class <code>foo.bar.Messages_it_IT</code>
-     * <li>file <code>foo/bar/Messages_it_IT.properties</code>
-     * <li>class <code>foo.bar.Messages_it</code></li>
-     * <li>file <code>foo/bar/Messages_it.properties</code></li>
-     * <li>class <code>foo.bar.Messages</code></li>
-     * <li>file <code>foo/bar/Messages.properties</code></li>
-     * </ul>
-     *
-     * <p>At this point, <code>getBundle</code> finds
-     * <code>foo/bar/Messages.properties</code>, which is put on hold
-     * because it's the base bundle.  <code>getBundle</code> calls {@link
-     * Control#getFallbackLocale(String, Locale)
-     * control.getFallbackLocale("foo.bar.Messages", Locale.ITALY)} which
-     * returns <code>Locale.FRENCH</code>. Next, <code>getBundle</code>
-     * tries loading a bundle in the following sequence.
-     *
-     * <ul>
-     * <li>class <code>foo.bar.Messages_fr</code></li>
-     * <li>file <code>foo/bar/Messages_fr.properties</code></li>
-     * <li>class <code>foo.bar.Messages</code></li>
-     * <li>file <code>foo/bar/Messages.properties</code></li>
-     * </ul>
-     *
-     * <p><code>getBundle</code> finds
-     * <code>foo/bar/Messages_fr.properties</code> and creates a
-     * <code>ResourceBundle</code> instance. Then, <code>getBundle</code>
-     * sets up its parent chain from the list of the candiate locales.  Only
-     * <code>foo/bar/Messages.properties</code> is found in the list and
-     * <code>getBundle</code> creates a <code>ResourceBundle</code> instance
-     * that becomes the parent of the instance for
-     * <code>foo/bar/Messages_fr.properties</code>.
-     *
-     * @param baseName
-     *        the base name of the resource bundle, a fully qualified
-     *        class name
-     * @param targetLocale
-     *        the locale for which a resource bundle is desired
-     * @param loader
-     *        the class loader from which to load the resource bundle
-     * @param control
-     *        the control which gives information for the resource
-     *        bundle loading process
-     * @return a resource bundle for the given base name and locale
-     * @exception NullPointerException
-     *        if <code>baseName</code>, <code>targetLocale</code>,
-     *        <code>loader</code>, or <code>control</code> is
-     *        <code>null</code>
-     * @exception MissingResourceException
-     *        if no resource bundle for the specified base name can be found
-     * @exception IllegalArgumentException
-     *        if the given <code>control</code> doesn't perform properly
-     *        (e.g., <code>control.getCandidateLocales</code> returns null.)
-     *        Note that validation of <code>control</code> is performed as
-     *        needed.
-     * @since 1.6
-     */
-    public static ResourceBundle getBundle(String baseName, Locale targetLocale,
-                                           ClassLoader loader, Control control) {
-        if (loader == null || control == null) {
-            throw new NullPointerException();
-        }
-        return getBundleImpl(baseName, targetLocale, loader, control);
-    }
-
-    private static ResourceBundle getBundleImpl(String baseName, Locale locale,
-                                                ClassLoader loader, Control control) {
-        if (locale == null || control == null) {
-            throw new NullPointerException();
-        }
-
-        // We create a CacheKey here for use by this call. The base
-        // name and loader will never change during the bundle loading
-        // process. We have to make sure that the locale is set before
-        // using it as a cache key.
-        CacheKey cacheKey = new CacheKey(baseName, locale, loader);
-        ResourceBundle bundle = null;
-
-        // Quick lookup of the cache.
-        BundleReference bundleRef = cacheList.get(cacheKey);
-        if (bundleRef != null) {
-            bundle = bundleRef.get();
-            bundleRef = null;
-        }
-
-        // If this bundle and all of its parents are valid (not expired),
-        // then return this bundle. If any of the bundles is expired, we
-        // don't call control.needsReload here but instead drop into the
-        // complete loading process below.
-        if (isValidBundle(bundle) && hasValidParentChain(bundle)) {
-            return bundle;
-        }
-
-        // No valid bundle was found in the cache, so we need to load the
-        // resource bundle and its parents.
-
-        boolean isKnownControl = (control == Control.INSTANCE) ||
-                                   (control instanceof SingleFormatControl);
-        List<String> formats = control.getFormats(baseName);
-        if (!isKnownControl && !checkList(formats)) {
-            throw new IllegalArgumentException("Invalid Control: getFormats");
-        }
-
-        ResourceBundle baseBundle = null;
-        for (Locale targetLocale = locale;
-             targetLocale != null;
-             targetLocale = control.getFallbackLocale(baseName, targetLocale)) {
-            List<Locale> candidateLocales = control.getCandidateLocales(baseName, targetLocale);
-            if (!isKnownControl && !checkList(candidateLocales)) {
-                throw new IllegalArgumentException("Invalid Control: getCandidateLocales");
-            }
-
-            bundle = findBundle(cacheKey, candidateLocales, formats, 0, control, baseBundle);
-
-            // If the loaded bundle is the base bundle and exactly for the
-            // requested locale or the only candidate locale, then take the
-            // bundle as the resulting one. If the loaded bundle is the base
-            // bundle, it's put on hold until we finish processing all
-            // fallback locales.
-            if (isValidBundle(bundle)) {
-                boolean isBaseBundle = Locale.ROOT.equals(bundle.locale);
-                if (!isBaseBundle || bundle.locale.equals(locale)
-                    || (candidateLocales.size() == 1
-                        && bundle.locale.equals(candidateLocales.get(0)))) {
-                    break;
-                }
-
-                // If the base bundle has been loaded, keep the reference in
-                // baseBundle so that we can avoid any redundant loading in case
-                // the control specify not to cache bundles.
-                if (isBaseBundle && baseBundle == null) {
-                    baseBundle = bundle;
-                }
-            }
-        }
-
-        if (bundle == null) {
-            if (baseBundle == null) {
-                throwMissingResourceException(baseName, locale, cacheKey.getCause());
-            }
-            bundle = baseBundle;
-        }
-
-        return bundle;
-    }
-
-    /**
-     * Checks if the given <code>List</code> is not null, not empty,
-     * not having null in its elements.
-     */
-    private static final boolean checkList(List a) {
-        boolean valid = (a != null && a.size() != 0);
-        if (valid) {
-            int size = a.size();
-            for (int i = 0; valid && i < size; i++) {
-                valid = (a.get(i) != null);
-            }
-        }
-        return valid;
-    }
-
-    private static final ResourceBundle findBundle(CacheKey cacheKey,
-                                                   List<Locale> candidateLocales,
-                                                   List<String> formats,
-                                                   int index,
-                                                   Control control,
-                                                   ResourceBundle baseBundle) {
-        Locale targetLocale = candidateLocales.get(index);
-        ResourceBundle parent = null;
-        if (index != candidateLocales.size() - 1) {
-            parent = findBundle(cacheKey, candidateLocales, formats, index + 1,
-                                control, baseBundle);
-        } else if (baseBundle != null && Locale.ROOT.equals(targetLocale)) {
-            return baseBundle;
-        }
-
-        // Before we do the real loading work, see whether we need to
-        // do some housekeeping: If references to class loaders or
-        // resource bundles have been nulled out, remove all related
-        // information from the cache.
-        Object ref;
-        while ((ref = referenceQueue.poll()) != null) {
-            cacheList.remove(((CacheKeyReference)ref).getCacheKey());
-        }
-
-        // flag indicating the resource bundle has expired in the cache
-        boolean expiredBundle = false;
-
-        // First, look up the cache to see if it's in the cache, without
-        // attempting to load bundle.
-        cacheKey.setLocale(targetLocale);
-        ResourceBundle bundle = findBundleInCache(cacheKey, control);
-        if (isValidBundle(bundle)) {
-            expiredBundle = bundle.expired;
-            if (!expiredBundle) {
-                // If its parent is the one asked for by the candidate
-                // locales (the runtime lookup path), we can take the cached
-                // one. (If it's not identical, then we'd have to check the
-                // parent's parents to be consistent with what's been
-                // requested.)
-                if (bundle.parent == parent) {
-                    return bundle;
-                }
-                // Otherwise, remove the cached one since we can't keep
-                // the same bundles having different parents.
-                BundleReference bundleRef = cacheList.get(cacheKey);
-                if (bundleRef != null && bundleRef.get() == bundle) {
-                    cacheList.remove(cacheKey, bundleRef);
-                }
-            }
-        }
-
-        if (bundle != NONEXISTENT_BUNDLE) {
-            CacheKey constKey = (CacheKey) cacheKey.clone();
-
-            try {
-                bundle = loadBundle(cacheKey, formats, control, expiredBundle);
-                if (bundle != null) {
-                    if (bundle.parent == null) {
-                        bundle.setParent(parent);
-                    }
-                    bundle.locale = targetLocale;
-                    bundle = putBundleInCache(cacheKey, bundle, control);
-                    return bundle;
-                }
-
-                // Put NONEXISTENT_BUNDLE in the cache as a mark that there's no bundle
-                // instance for the locale.
-                putBundleInCache(cacheKey, NONEXISTENT_BUNDLE, control);
-            } finally {
-                if (constKey.getCause() instanceof InterruptedException) {
-                    Thread.currentThread().interrupt();
-                }
-            }
-        }
-        return parent;
-    }
-
-    private static final ResourceBundle loadBundle(CacheKey cacheKey,
-                                                   List<String> formats,
-                                                   Control control,
-                                                   boolean reload) {
-
-        // Here we actually load the bundle in the order of formats
-        // specified by the getFormats() value.
-        Locale targetLocale = cacheKey.getLocale();
-
-        ResourceBundle bundle = null;
-        int size = formats.size();
-        for (int i = 0; i < size; i++) {
-            String format = formats.get(i);
-            try {
-                bundle = control.newBundle(cacheKey.getName(), targetLocale, format,
-                                           cacheKey.getLoader(), reload);
-            } catch (LinkageError error) {
-                // We need to handle the LinkageError case due to
-                // inconsistent case-sensitivity in ClassLoader.
-                // See 6572242 for details.
-                cacheKey.setCause(error);
-            } catch (Exception cause) {
-                cacheKey.setCause(cause);
-            }
-            if (bundle != null) {
-                // Set the format in the cache key so that it can be
-                // used when calling needsReload later.
-                cacheKey.setFormat(format);
-                bundle.name = cacheKey.getName();
-                bundle.locale = targetLocale;
-                // Bundle provider might reuse instances. So we should make
-                // sure to clear the expired flag here.
-                bundle.expired = false;
-                break;
-            }
-        }
-
-        return bundle;
-    }
-
-    private static final boolean isValidBundle(ResourceBundle bundle) {
-        return bundle != null && bundle != NONEXISTENT_BUNDLE;
-    }
-
-    /**
-     * Determines whether any of resource bundles in the parent chain,
-     * including the leaf, have expired.
-     */
-    private static final boolean hasValidParentChain(ResourceBundle bundle) {
-        long now = System.currentTimeMillis();
-        while (bundle != null) {
-            if (bundle.expired) {
-                return false;
-            }
-            CacheKey key = bundle.cacheKey;
-            if (key != null) {
-                long expirationTime = key.expirationTime;
-                if (expirationTime >= 0 && expirationTime <= now) {
-                    return false;
-                }
-            }
-            bundle = bundle.parent;
-        }
-        return true;
-    }
-
-    /**
-     * Throw a MissingResourceException with proper message
-     */
-    private static final void throwMissingResourceException(String baseName,
-                                                            Locale locale,
-                                                            Throwable cause) {
-        // If the cause is a MissingResourceException, avoid creating
-        // a long chain. (6355009)
-        if (cause instanceof MissingResourceException) {
-            cause = null;
-        }
-        throw new MissingResourceException("Can't find bundle for base name "
-                                           + baseName + ", locale " + locale,
-                                           baseName + "_" + locale, // className
-                                           "",                      // key
-                                           cause);
-    }
-
-    /**
-     * Finds a bundle in the cache. Any expired bundles are marked as
-     * `expired' and removed from the cache upon return.
-     *
-     * @param cacheKey the key to look up the cache
-     * @param control the Control to be used for the expiration control
-     * @return the cached bundle, or null if the bundle is not found in the
-     * cache or its parent has expired. <code>bundle.expire</code> is true
-     * upon return if the bundle in the cache has expired.
-     */
-    private static final ResourceBundle findBundleInCache(CacheKey cacheKey,
-                                                          Control control) {
-        BundleReference bundleRef = cacheList.get(cacheKey);
-        if (bundleRef == null) {
-            return null;
-        }
-        ResourceBundle bundle = bundleRef.get();
-        if (bundle == null) {
-            return null;
-        }
-        ResourceBundle p = bundle.parent;
-        assert p != NONEXISTENT_BUNDLE;
-        // If the parent has expired, then this one must also expire. We
-        // check only the immediate parent because the actual loading is
-        // done from the root (base) to leaf (child) and the purpose of
-        // checking is to propagate expiration towards the leaf. For
-        // example, if the requested locale is ja_JP_JP and there are
-        // bundles for all of the candidates in the cache, we have a list,
-        //
-        // base <- ja <- ja_JP <- ja_JP_JP
-        //
-        // If ja has expired, then it will reload ja and the list becomes a
-        // tree.
-        //
-        // base <- ja (new)
-        //  "   <- ja (expired) <- ja_JP <- ja_JP_JP
-        //
-        // When looking up ja_JP in the cache, it finds ja_JP in the cache
-        // which references to the expired ja. Then, ja_JP is marked as
-        // expired and removed from the cache. This will be propagated to
-        // ja_JP_JP.
-        //
-        // Now, it's possible, for example, that while loading new ja_JP,
-        // someone else has started loading the same bundle and finds the
-        // base bundle has expired. Then, what we get from the first
-        // getBundle call includes the expired base bundle. However, if
-        // someone else didn't start its loading, we wouldn't know if the
-        // base bundle has expired at the end of the loading process. The
-        // expiration control doesn't guarantee that the returned bundle and
-        // its parents haven't expired.
-        //
-        // We could check the entire parent chain to see if there's any in
-        // the chain that has expired. But this process may never end. An
-        // extreme case would be that getTimeToLive returns 0 and
-        // needsReload always returns true.
-        if (p != null && p.expired) {
-            assert bundle != NONEXISTENT_BUNDLE;
-            bundle.expired = true;
-            bundle.cacheKey = null;
-            cacheList.remove(cacheKey, bundleRef);
-            bundle = null;
-        } else {
-            CacheKey key = bundleRef.getCacheKey();
-            long expirationTime = key.expirationTime;
-            if (!bundle.expired && expirationTime >= 0 &&
-                expirationTime <= System.currentTimeMillis()) {
-                // its TTL period has expired.
-                if (bundle != NONEXISTENT_BUNDLE) {
-                    // Synchronize here to call needsReload to avoid
-                    // redundant concurrent calls for the same bundle.
-                    synchronized (bundle) {
-                        expirationTime = key.expirationTime;
-                        if (!bundle.expired && expirationTime >= 0 &&
-                            expirationTime <= System.currentTimeMillis()) {
-                            try {
-                                bundle.expired = control.needsReload(key.getName(),
-                                                                     key.getLocale(),
-                                                                     key.getFormat(),
-                                                                     key.getLoader(),
-                                                                     bundle,
-                                                                     key.loadTime);
-                            } catch (Exception e) {
-                                cacheKey.setCause(e);
-                            }
-                            if (bundle.expired) {
-                                // If the bundle needs to be reloaded, then
-                                // remove the bundle from the cache, but
-                                // return the bundle with the expired flag
-                                // on.
-                                bundle.cacheKey = null;
-                                cacheList.remove(cacheKey, bundleRef);
-                            } else {
-                                // Update the expiration control info. and reuse
-                                // the same bundle instance
-                                setExpirationTime(key, control);
-                            }
-                        }
-                    }
-                } else {
-                    // We just remove NONEXISTENT_BUNDLE from the cache.
-                    cacheList.remove(cacheKey, bundleRef);
-                    bundle = null;
-                }
-            }
-        }
-        return bundle;
-    }
-
-    /**
-     * Put a new bundle in the cache.
-     *
-     * @param cacheKey the key for the resource bundle
-     * @param bundle the resource bundle to be put in the cache
-     * @return the ResourceBundle for the cacheKey; if someone has put
-     * the bundle before this call, the one found in the cache is
-     * returned.
-     */
-    private static final ResourceBundle putBundleInCache(CacheKey cacheKey,
-                                                         ResourceBundle bundle,
-                                                         Control control) {
-        setExpirationTime(cacheKey, control);
-        if (cacheKey.expirationTime != Control.TTL_DONT_CACHE) {
-            CacheKey key = (CacheKey) cacheKey.clone();
-            BundleReference bundleRef = new BundleReference(bundle, referenceQueue, key);
-            bundle.cacheKey = key;
-
-            // Put the bundle in the cache if it's not been in the cache.
-            BundleReference result = cacheList.putIfAbsent(key, bundleRef);
-
-            // If someone else has put the same bundle in the cache before
-            // us and it has not expired, we should use the one in the cache.
-            if (result != null) {
-                ResourceBundle rb = result.get();
-                if (rb != null && !rb.expired) {
-                    // Clear the back link to the cache key
-                    bundle.cacheKey = null;
-                    bundle = rb;
-                    // Clear the reference in the BundleReference so that
-                    // it won't be enqueued.
-                    bundleRef.clear();
-                } else {
-                    // Replace the invalid (garbage collected or expired)
-                    // instance with the valid one.
-                    cacheList.put(key, bundleRef);
-                }
-            }
-        }
-        return bundle;
-    }
-
-    private static final void setExpirationTime(CacheKey cacheKey, Control control) {
-        long ttl = control.getTimeToLive(cacheKey.getName(),
-                                         cacheKey.getLocale());
-        if (ttl >= 0) {
-            // If any expiration time is specified, set the time to be
-            // expired in the cache.
-            long now = System.currentTimeMillis();
-            cacheKey.loadTime = now;
-            cacheKey.expirationTime = now + ttl;
-        } else if (ttl >= Control.TTL_NO_EXPIRATION_CONTROL) {
-            cacheKey.expirationTime = ttl;
-        } else {
-            throw new IllegalArgumentException("Invalid Control: TTL=" + ttl);
-        }
-    }
-
-    /**
-     * Removes all resource bundles from the cache that have been loaded
-     * using the caller's class loader.
-     *
-     * @since 1.6
-     * @see ResourceBundle.Control#getTimeToLive(String,Locale)
-     */
-    @CallerSensitive
-    public static final void clearCache() {
-        clearCache(getLoader(Reflection.getCallerClass()));
-    }
-
-    /**
-     * Removes all resource bundles from the cache that have been loaded
-     * using the given class loader.
-     *
-     * @param loader the class loader
-     * @exception NullPointerException if <code>loader</code> is null
-     * @since 1.6
-     * @see ResourceBundle.Control#getTimeToLive(String,Locale)
-     */
-    public static final void clearCache(ClassLoader loader) {
-        if (loader == null) {
-            throw new NullPointerException();
-        }
-        Set<CacheKey> set = cacheList.keySet();
-        for (CacheKey key : set) {
-            if (key.getLoader() == loader) {
-                set.remove(key);
-            }
-        }
-    }
-
-    /**
-     * Gets an object for the given key from this resource bundle.
-     * Returns null if this resource bundle does not contain an
-     * object for the given key.
-     *
-     * @param key the key for the desired object
-     * @exception NullPointerException if <code>key</code> is <code>null</code>
-     * @return the object for the given key, or null
-     */
-    protected abstract Object handleGetObject(String key);
-
-    /**
-     * Returns an enumeration of the keys.
-     *
-     * @return an <code>Enumeration</code> of the keys contained in
-     *         this <code>ResourceBundle</code> and its parent bundles.
-     */
-    public abstract Enumeration<String> getKeys();
-
-    /**
-     * Determines whether the given <code>key</code> is contained in
-     * this <code>ResourceBundle</code> or its parent bundles.
-     *
-     * @param key
-     *        the resource <code>key</code>
-     * @return <code>true</code> if the given <code>key</code> is
-     *        contained in this <code>ResourceBundle</code> or its
-     *        parent bundles; <code>false</code> otherwise.
-     * @exception NullPointerException
-     *         if <code>key</code> is <code>null</code>
-     * @since 1.6
-     */
-    public boolean containsKey(String key) {
-        if (key == null) {
-            throw new NullPointerException();
-        }
-        for (ResourceBundle rb = this; rb != null; rb = rb.parent) {
-            if (rb.handleKeySet().contains(key)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Returns a <code>Set</code> of all keys contained in this
-     * <code>ResourceBundle</code> and its parent bundles.
-     *
-     * @return a <code>Set</code> of all keys contained in this
-     *         <code>ResourceBundle</code> and its parent bundles.
-     * @since 1.6
-     */
-    public Set<String> keySet() {
-        Set<String> keys = new HashSet<>();
-        for (ResourceBundle rb = this; rb != null; rb = rb.parent) {
-            keys.addAll(rb.handleKeySet());
-        }
-        return keys;
-    }
-
-    /**
-     * Returns a <code>Set</code> of the keys contained <em>only</em>
-     * in this <code>ResourceBundle</code>.
-     *
-     * <p>The default implementation returns a <code>Set</code> of the
-     * keys returned by the {@link #getKeys() getKeys} method except
-     * for the ones for which the {@link #handleGetObject(String)
-     * handleGetObject} method returns <code>null</code>. Once the
-     * <code>Set</code> has been created, the value is kept in this
-     * <code>ResourceBundle</code> in order to avoid producing the
-     * same <code>Set</code> in subsequent calls. Subclasses can
-     * override this method for faster handling.
-     *
-     * @return a <code>Set</code> of the keys contained only in this
-     *        <code>ResourceBundle</code>
-     * @since 1.6
-     */
-    protected Set<String> handleKeySet() {
-        if (keySet == null) {
-            synchronized (this) {
-                if (keySet == null) {
-                    Set<String> keys = new HashSet<>();
-                    Enumeration<String> enumKeys = getKeys();
-                    while (enumKeys.hasMoreElements()) {
-                        String key = enumKeys.nextElement();
-                        if (handleGetObject(key) != null) {
-                            keys.add(key);
-                        }
-                    }
-                    keySet = keys;
-                }
-            }
-        }
-        return keySet;
-    }
-
-
-
-    /**
-     * <code>ResourceBundle.Control</code> defines a set of callback methods
-     * that are invoked by the {@link ResourceBundle#getBundle(String,
-     * Locale, ClassLoader, Control) ResourceBundle.getBundle} factory
-     * methods during the bundle loading process. In other words, a
-     * <code>ResourceBundle.Control</code> collaborates with the factory
-     * methods for loading resource bundles. The default implementation of
-     * the callback methods provides the information necessary for the
-     * factory methods to perform the <a
-     * href="./ResourceBundle.html#default_behavior">default behavior</a>.
-     *
-     * <p>In addition to the callback methods, the {@link
-     * #toBundleName(String, Locale) toBundleName} and {@link
-     * #toResourceName(String, String) toResourceName} methods are defined
-     * primarily for convenience in implementing the callback
-     * methods. However, the <code>toBundleName</code> method could be
-     * overridden to provide different conventions in the organization and
-     * packaging of localized resources.  The <code>toResourceName</code>
-     * method is <code>final</code> to avoid use of wrong resource and class
-     * name separators.
-     *
-     * <p>Two factory methods, {@link #getControl(List)} and {@link
-     * #getNoFallbackControl(List)}, provide
-     * <code>ResourceBundle.Control</code> instances that implement common
-     * variations of the default bundle loading process.
-     *
-     * <p>The formats returned by the {@link Control#getFormats(String)
-     * getFormats} method and candidate locales returned by the {@link
-     * ResourceBundle.Control#getCandidateLocales(String, Locale)
-     * getCandidateLocales} method must be consistent in all
-     * <code>ResourceBundle.getBundle</code> invocations for the same base
-     * bundle. Otherwise, the <code>ResourceBundle.getBundle</code> methods
-     * may return unintended bundles. For example, if only
-     * <code>"java.class"</code> is returned by the <code>getFormats</code>
-     * method for the first call to <code>ResourceBundle.getBundle</code>
-     * and only <code>"java.properties"</code> for the second call, then the
-     * second call will return the class-based one that has been cached
-     * during the first call.
-     *
-     * <p>A <code>ResourceBundle.Control</code> instance must be thread-safe
-     * if it's simultaneously used by multiple threads.
-     * <code>ResourceBundle.getBundle</code> does not synchronize to call
-     * the <code>ResourceBundle.Control</code> methods. The default
-     * implementations of the methods are thread-safe.
-     *
-     * <p>Applications can specify <code>ResourceBundle.Control</code>
-     * instances returned by the <code>getControl</code> factory methods or
-     * created from a subclass of <code>ResourceBundle.Control</code> to
-     * customize the bundle loading process. The following are examples of
-     * changing the default bundle loading process.
-     *
-     * <p><b>Example 1</b>
-     *
-     * <p>The following code lets <code>ResourceBundle.getBundle</code> look
-     * up only properties-based resources.
-     *
-     * <pre>
-     * import java.util.*;
-     * import static java.util.ResourceBundle.Control.*;
-     * ...
-     * ResourceBundle bundle =
-     *   ResourceBundle.getBundle("MyResources", new Locale("fr", "CH"),
-     *                            ResourceBundle.Control.getControl(FORMAT_PROPERTIES));
-     * </pre>
-     *
-     * Given the resource bundles in the <a
-     * href="./ResourceBundle.html#default_behavior_example">example</a> in
-     * the <code>ResourceBundle.getBundle</code> description, this
-     * <code>ResourceBundle.getBundle</code> call loads
-     * <code>MyResources_fr_CH.properties</code> whose parent is
-     * <code>MyResources_fr.properties</code> whose parent is
-     * <code>MyResources.properties</code>. (<code>MyResources_fr_CH.properties</code>
-     * is not hidden, but <code>MyResources_fr_CH.class</code> is.)
-     *
-     * <p><b>Example 2</b>
-     *
-     * <p>The following is an example of loading XML-based bundles
-     * using {@link Properties#loadFromXML(java.io.InputStream)
-     * Properties.loadFromXML}.
-     *
-     * <pre>
-     * ResourceBundle rb = ResourceBundle.getBundle("Messages",
-     *     new ResourceBundle.Control() {
-     *         public List&lt;String&gt; getFormats(String baseName) {
-     *             if (baseName == null)
-     *                 throw new NullPointerException();
-     *             return Arrays.asList("xml");
-     *         }
-     *         public ResourceBundle newBundle(String baseName,
-     *                                         Locale locale,
-     *                                         String format,
-     *                                         ClassLoader loader,
-     *                                         boolean reload)
-     *                          throws IllegalAccessException,
-     *                                 InstantiationException,
-     *                                 IOException {
-     *             if (baseName == null || locale == null
-     *                   || format == null || loader == null)
-     *                 throw new NullPointerException();
-     *             ResourceBundle bundle = null;
-     *             if (format.equals("xml")) {
-     *                 String bundleName = toBundleName(baseName, locale);
-     *                 String resourceName = toResourceName(bundleName, format);
-     *                 InputStream stream = null;
-     *                 if (reload) {
-     *                     URL url = loader.getResource(resourceName);
-     *                     if (url != null) {
-     *                         URLConnection connection = url.openConnection();
-     *                         if (connection != null) {
-     *                             // Disable caches to get fresh data for
-     *                             // reloading.
-     *                             connection.setUseCaches(false);
-     *                             stream = connection.getInputStream();
-     *                         }
-     *                     }
-     *                 } else {
-     *                     stream = loader.getResourceAsStream(resourceName);
-     *                 }
-     *                 if (stream != null) {
-     *                     BufferedInputStream bis = new BufferedInputStream(stream);
-     *                     bundle = new XMLResourceBundle(bis);
-     *                     bis.close();
-     *                 }
-     *             }
-     *             return bundle;
-     *         }
-     *     });
-     *
-     * ...
-     *
-     * private static class XMLResourceBundle extends ResourceBundle {
-     *     private Properties props;
-     *     XMLResourceBundle(InputStream stream) throws IOException {
-     *         props = new Properties();
-     *         props.loadFromXML(stream);
-     *     }
-     *     protected Object handleGetObject(String key) {
-     *         return props.getProperty(key);
-     *     }
-     *     public Enumeration&lt;String&gt; getKeys() {
-     *         ...
-     *     }
-     * }
-     * </pre>
-     *
-     * @since 1.6
-     */
-    public static class Control {
-        /**
-         * The default format <code>List</code>, which contains the strings
-         * <code>"java.class"</code> and <code>"java.properties"</code>, in
-         * this order. This <code>List</code> is {@linkplain
-         * Collections#unmodifiableList(List) unmodifiable}.
-         *
-         * @see #getFormats(String)
-         */
-        public static final List<String> FORMAT_DEFAULT
-            = Collections.unmodifiableList(Arrays.asList("java.class",
-                                                         "java.properties"));
-
-        /**
-         * The class-only format <code>List</code> containing
-         * <code>"java.class"</code>. This <code>List</code> is {@linkplain
-         * Collections#unmodifiableList(List) unmodifiable}.
-         *
-         * @see #getFormats(String)
-         */
-        public static final List<String> FORMAT_CLASS
-            = Collections.unmodifiableList(Arrays.asList("java.class"));
-
-        /**
-         * The properties-only format <code>List</code> containing
-         * <code>"java.properties"</code>. This <code>List</code> is
-         * {@linkplain Collections#unmodifiableList(List) unmodifiable}.
-         *
-         * @see #getFormats(String)
-         */
-        public static final List<String> FORMAT_PROPERTIES
-            = Collections.unmodifiableList(Arrays.asList("java.properties"));
-
-        /**
-         * The time-to-live constant for not caching loaded resource bundle
-         * instances.
-         *
-         * @see #getTimeToLive(String, Locale)
-         */
-        public static final long TTL_DONT_CACHE = -1;
-
-        /**
-         * The time-to-live constant for disabling the expiration control
-         * for loaded resource bundle instances in the cache.
-         *
-         * @see #getTimeToLive(String, Locale)
-         */
-        public static final long TTL_NO_EXPIRATION_CONTROL = -2;
-
-        private static final Control INSTANCE = new Control();
-
-        /**
-         * Sole constructor. (For invocation by subclass constructors,
-         * typically implicit.)
-         */
-        protected Control() {
-        }
-
-        /**
-         * Returns a <code>ResourceBundle.Control</code> in which the {@link
-         * #getFormats(String) getFormats} method returns the specified
-         * <code>formats</code>. The <code>formats</code> must be equal to
-         * one of {@link Control#FORMAT_PROPERTIES}, {@link
-         * Control#FORMAT_CLASS} or {@link
-         * Control#FORMAT_DEFAULT}. <code>ResourceBundle.Control</code>
-         * instances returned by this method are singletons and thread-safe.
-         *
-         * <p>Specifying {@link Control#FORMAT_DEFAULT} is equivalent to
-         * instantiating the <code>ResourceBundle.Control</code> class,
-         * except that this method returns a singleton.
-         *
-         * @param formats
-         *        the formats to be returned by the
-         *        <code>ResourceBundle.Control.getFormats</code> method
-         * @return a <code>ResourceBundle.Control</code> supporting the
-         *        specified <code>formats</code>
-         * @exception NullPointerException
-         *        if <code>formats</code> is <code>null</code>
-         * @exception IllegalArgumentException
-         *        if <code>formats</code> is unknown
-         */
-        public static final Control getControl(List<String> formats) {
-            if (formats.equals(Control.FORMAT_PROPERTIES)) {
-                return SingleFormatControl.PROPERTIES_ONLY;
-            }
-            if (formats.equals(Control.FORMAT_CLASS)) {
-                return SingleFormatControl.CLASS_ONLY;
-            }
-            if (formats.equals(Control.FORMAT_DEFAULT)) {
-                return Control.INSTANCE;
-            }
-            throw new IllegalArgumentException();
-        }
-
-        /**
-         * Returns a <code>ResourceBundle.Control</code> in which the {@link
-         * #getFormats(String) getFormats} method returns the specified
-         * <code>formats</code> and the {@link
-         * Control#getFallbackLocale(String, Locale) getFallbackLocale}
-         * method returns <code>null</code>. The <code>formats</code> must
-         * be equal to one of {@link Control#FORMAT_PROPERTIES}, {@link
-         * Control#FORMAT_CLASS} or {@link Control#FORMAT_DEFAULT}.
-         * <code>ResourceBundle.Control</code> instances returned by this
-         * method are singletons and thread-safe.
-         *
-         * @param formats
-         *        the formats to be returned by the
-         *        <code>ResourceBundle.Control.getFormats</code> method
-         * @return a <code>ResourceBundle.Control</code> supporting the
-         *        specified <code>formats</code> with no fallback
-         *        <code>Locale</code> support
-         * @exception NullPointerException
-         *        if <code>formats</code> is <code>null</code>
-         * @exception IllegalArgumentException
-         *        if <code>formats</code> is unknown
-         */
-        public static final Control getNoFallbackControl(List<String> formats) {
-            if (formats.equals(Control.FORMAT_DEFAULT)) {
-                return NoFallbackControl.NO_FALLBACK;
-            }
-            if (formats.equals(Control.FORMAT_PROPERTIES)) {
-                return NoFallbackControl.PROPERTIES_ONLY_NO_FALLBACK;
-            }
-            if (formats.equals(Control.FORMAT_CLASS)) {
-                return NoFallbackControl.CLASS_ONLY_NO_FALLBACK;
-            }
-            throw new IllegalArgumentException();
-        }
-
-        /**
-         * Returns a <code>List</code> of <code>String</code>s containing
-         * formats to be used to load resource bundles for the given
-         * <code>baseName</code>. The <code>ResourceBundle.getBundle</code>
-         * factory method tries to load resource bundles with formats in the
-         * order specified by the list. The list returned by this method
-         * must have at least one <code>String</code>. The predefined
-         * formats are <code>"java.class"</code> for class-based resource
-         * bundles and <code>"java.properties"</code> for {@linkplain
-         * PropertyResourceBundle properties-based} ones. Strings starting
-         * with <code>"java."</code> are reserved for future extensions and
-         * must not be used by application-defined formats.
-         *
-         * <p>It is not a requirement to return an immutable (unmodifiable)
-         * <code>List</code>.  However, the returned <code>List</code> must
-         * not be mutated after it has been returned by
-         * <code>getFormats</code>.
-         *
-         * <p>The default implementation returns {@link #FORMAT_DEFAULT} so
-         * that the <code>ResourceBundle.getBundle</code> factory method
-         * looks up first class-based resource bundles, then
-         * properties-based ones.
-         *
-         * @param baseName
-         *        the base name of the resource bundle, a fully qualified class
-         *        name
-         * @return a <code>List</code> of <code>String</code>s containing
-         *        formats for loading resource bundles.
-         * @exception NullPointerException
-         *        if <code>baseName</code> is null
-         * @see #FORMAT_DEFAULT
-         * @see #FORMAT_CLASS
-         * @see #FORMAT_PROPERTIES
-         */
-        public List<String> getFormats(String baseName) {
-            if (baseName == null) {
-                throw new NullPointerException();
-            }
-            return FORMAT_DEFAULT;
-        }
-
-        /**
-         * Returns a <code>List</code> of <code>Locale</code>s as candidate
-         * locales for <code>baseName</code> and <code>locale</code>. This
-         * method is called by the <code>ResourceBundle.getBundle</code>
-         * factory method each time the factory method tries finding a
-         * resource bundle for a target <code>Locale</code>.
-         *
-         * <p>The sequence of the candidate locales also corresponds to the
-         * runtime resource lookup path (also known as the <I>parent
-         * chain</I>), if the corresponding resource bundles for the
-         * candidate locales exist and their parents are not defined by
-         * loaded resource bundles themselves.  The last element of the list
-         * must be a {@linkplain Locale#ROOT root locale} if it is desired to
-         * have the base bundle as the terminal of the parent chain.
-         *
-         * <p>If the given locale is equal to <code>Locale.ROOT</code> (the
-         * root locale), a <code>List</code> containing only the root
-         * <code>Locale</code> must be returned. In this case, the
-         * <code>ResourceBundle.getBundle</code> factory method loads only
-         * the base bundle as the resulting resource bundle.
-         *
-         * <p>It is not a requirement to return an immutable (unmodifiable)
-         * <code>List</code>. However, the returned <code>List</code> must not
-         * be mutated after it has been returned by
-         * <code>getCandidateLocales</code>.
-         *
-         * <p>The default implementation returns a <code>List</code> containing
-         * <code>Locale</code>s using the rules described below.  In the
-         * description below, <em>L</em>, <em>S</em>, <em>C</em> and <em>V</em>
-         * respectively represent non-empty language, script, country, and
-         * variant.  For example, [<em>L</em>, <em>C</em>] represents a
-         * <code>Locale</code> that has non-empty values only for language and
-         * country.  The form <em>L</em>("xx") represents the (non-empty)
-         * language value is "xx".  For all cases, <code>Locale</code>s whose
-         * final component values are empty strings are omitted.
-         *
-         * <ol><li>For an input <code>Locale</code> with an empty script value,
-         * append candidate <code>Locale</code>s by omitting the final component
-         * one by one as below:
-         *
-         * <ul>
-         * <li> [<em>L</em>, <em>C</em>, <em>V</em>]
-         * <li> [<em>L</em>, <em>C</em>]
-         * <li> [<em>L</em>]
-         * <li> <code>Locale.ROOT</code>
-         * </ul>
-         *
-         * <li>For an input <code>Locale</code> with a non-empty script value,
-         * append candidate <code>Locale</code>s by omitting the final component
-         * up to language, then append candidates generated from the
-         * <code>Locale</code> with country and variant restored:
-         *
-         * <ul>
-         * <li> [<em>L</em>, <em>S</em>, <em>C</em>, <em>V</em>]
-         * <li> [<em>L</em>, <em>S</em>, <em>C</em>]
-         * <li> [<em>L</em>, <em>S</em>]
-         * <li> [<em>L</em>, <em>C</em>, <em>V</em>]
-         * <li> [<em>L</em>, <em>C</em>]
-         * <li> [<em>L</em>]
-         * <li> <code>Locale.ROOT</code>
-         * </ul>
-         *
-         * <li>For an input <code>Locale</code> with a variant value consisting
-         * of multiple subtags separated by underscore, generate candidate
-         * <code>Locale</code>s by omitting the variant subtags one by one, then
-         * insert them after every occurence of <code> Locale</code>s with the
-         * full variant value in the original list.  For example, if the
-         * the variant consists of two subtags <em>V1</em> and <em>V2</em>:
-         *
-         * <ul>
-         * <li> [<em>L</em>, <em>S</em>, <em>C</em>, <em>V1</em>, <em>V2</em>]
-         * <li> [<em>L</em>, <em>S</em>, <em>C</em>, <em>V1</em>]
-         * <li> [<em>L</em>, <em>S</em>, <em>C</em>]
-         * <li> [<em>L</em>, <em>S</em>]
-         * <li> [<em>L</em>, <em>C</em>, <em>V1</em>, <em>V2</em>]
-         * <li> [<em>L</em>, <em>C</em>, <em>V1</em>]
-         * <li> [<em>L</em>, <em>C</em>]
-         * <li> [<em>L</em>]
-         * <li> <code>Locale.ROOT</code>
-         * </ul>
-         *
-         * <li>Special cases for Chinese.  When an input <code>Locale</code> has the
-         * language "zh" (Chinese) and an empty script value, either "Hans" (Simplified) or
-         * "Hant" (Traditional) might be supplied, depending on the country.
-         * When the country is "CN" (China) or "SG" (Singapore), "Hans" is supplied.
-         * When the country is "HK" (Hong Kong SAR China), "MO" (Macau SAR China),
-         * or "TW" (Taiwan), "Hant" is supplied.  For all other countries or when the country
-         * is empty, no script is supplied.  For example, for <code>Locale("zh", "CN")
-         * </code>, the candidate list will be:
-         * <ul>
-         * <li> [<em>L</em>("zh"), <em>S</em>("Hans"), <em>C</em>("CN")]
-         * <li> [<em>L</em>("zh"), <em>S</em>("Hans")]
-         * <li> [<em>L</em>("zh"), <em>C</em>("CN")]
-         * <li> [<em>L</em>("zh")]
-         * <li> <code>Locale.ROOT</code>
-         * </ul>
-         *
-         * For <code>Locale("zh", "TW")</code>, the candidate list will be:
-         * <ul>
-         * <li> [<em>L</em>("zh"), <em>S</em>("Hant"), <em>C</em>("TW")]
-         * <li> [<em>L</em>("zh"), <em>S</em>("Hant")]
-         * <li> [<em>L</em>("zh"), <em>C</em>("TW")]
-         * <li> [<em>L</em>("zh")]
-         * <li> <code>Locale.ROOT</code>
-         * </ul>
-         *
-         * <li>Special cases for Norwegian.  Both <code>Locale("no", "NO",
-         * "NY")</code> and <code>Locale("nn", "NO")</code> represent Norwegian
-         * Nynorsk.  When a locale's language is "nn", the standard candidate
-         * list is generated up to [<em>L</em>("nn")], and then the following
-         * candidates are added:
-         *
-         * <ul><li> [<em>L</em>("no"), <em>C</em>("NO"), <em>V</em>("NY")]
-         * <li> [<em>L</em>("no"), <em>C</em>("NO")]
-         * <li> [<em>L</em>("no")]
-         * <li> <code>Locale.ROOT</code>
-         * </ul>
-         *
-         * If the locale is exactly <code>Locale("no", "NO", "NY")</code>, it is first
-         * converted to <code>Locale("nn", "NO")</code> and then the above procedure is
-         * followed.
-         *
-         * <p>Also, Java treats the language "no" as a synonym of Norwegian
-         * Bokm&#xE5;l "nb".  Except for the single case <code>Locale("no",
-         * "NO", "NY")</code> (handled above), when an input <code>Locale</code>
-         * has language "no" or "nb", candidate <code>Locale</code>s with
-         * language code "no" and "nb" are interleaved, first using the
-         * requested language, then using its synonym. For example,
-         * <code>Locale("nb", "NO", "POSIX")</code> generates the following
-         * candidate list:
-         *
-         * <ul>
-         * <li> [<em>L</em>("nb"), <em>C</em>("NO"), <em>V</em>("POSIX")]
-         * <li> [<em>L</em>("no"), <em>C</em>("NO"), <em>V</em>("POSIX")]
-         * <li> [<em>L</em>("nb"), <em>C</em>("NO")]
-         * <li> [<em>L</em>("no"), <em>C</em>("NO")]
-         * <li> [<em>L</em>("nb")]
-         * <li> [<em>L</em>("no")]
-         * <li> <code>Locale.ROOT</code>
-         * </ul>
-         *
-         * <code>Locale("no", "NO", "POSIX")</code> would generate the same list
-         * except that locales with "no" would appear before the corresponding
-         * locales with "nb".</li>
-         *
-         * </li>
-         * </ol>
-         *
-         * <p>The default implementation uses an {@link ArrayList} that
-         * overriding implementations may modify before returning it to the
-         * caller. However, a subclass must not modify it after it has
-         * been returned by <code>getCandidateLocales</code>.
-         *
-         * <p>For example, if the given <code>baseName</code> is "Messages"
-         * and the given <code>locale</code> is
-         * <code>Locale("ja",&nbsp;"",&nbsp;"XX")</code>, then a
-         * <code>List</code> of <code>Locale</code>s:
-         * <pre>
-         *     Locale("ja", "", "XX")
-         *     Locale("ja")
-         *     Locale.ROOT
-         * </pre>
-         * is returned. And if the resource bundles for the "ja" and
-         * "" <code>Locale</code>s are found, then the runtime resource
-         * lookup path (parent chain) is:
-         * <pre>
-         *     Messages_ja -> Messages
-         * </pre>
-         *
-         * @param baseName
-         *        the base name of the resource bundle, a fully
-         *        qualified class name
-         * @param locale
-         *        the locale for which a resource bundle is desired
-         * @return a <code>List</code> of candidate
-         *        <code>Locale</code>s for the given <code>locale</code>
-         * @exception NullPointerException
-         *        if <code>baseName</code> or <code>locale</code> is
-         *        <code>null</code>
-         */
-        public List<Locale> getCandidateLocales(String baseName, Locale locale) {
-            if (baseName == null) {
-                throw new NullPointerException();
-            }
-            return new ArrayList<>(CANDIDATES_CACHE.get(locale.getBaseLocale()));
-        }
-
-        private static final CandidateListCache CANDIDATES_CACHE = new CandidateListCache();
-
-        private static class CandidateListCache extends LocaleObjectCache<BaseLocale, List<Locale>> {
-            protected List<Locale> createObject(BaseLocale base) {
-                String language = base.getLanguage();
-                String script = base.getScript();
-                String region = base.getRegion();
-                String variant = base.getVariant();
-
-                // Special handling for Norwegian
-                boolean isNorwegianBokmal = false;
-                boolean isNorwegianNynorsk = false;
-                if (language.equals("no")) {
-                    if (region.equals("NO") && variant.equals("NY")) {
-                        variant = "";
-                        isNorwegianNynorsk = true;
-                    } else {
-                        isNorwegianBokmal = true;
-                    }
-                }
-                if (language.equals("nb") || isNorwegianBokmal) {
-                    List<Locale> tmpList = getDefaultList("nb", script, region, variant);
-                    // Insert a locale replacing "nb" with "no" for every list entry
-                    List<Locale> bokmalList = new LinkedList<>();
-                    for (Locale l : tmpList) {
-                        bokmalList.add(l);
-                        if (l.getLanguage().length() == 0) {
-                            break;
-                        }
-                        bokmalList.add(Locale.getInstance("no", l.getScript(), l.getCountry(),
-                                l.getVariant(), null));
-                    }
-                    return bokmalList;
-                } else if (language.equals("nn") || isNorwegianNynorsk) {
-                    // Insert no_NO_NY, no_NO, no after nn
-                    List<Locale> nynorskList = getDefaultList("nn", script, region, variant);
-                    int idx = nynorskList.size() - 1;
-                    nynorskList.add(idx++, Locale.getInstance("no", "NO", "NY"));
-                    nynorskList.add(idx++, Locale.getInstance("no", "NO", ""));
-                    nynorskList.add(idx++, Locale.getInstance("no", "", ""));
-                    return nynorskList;
-                }
-                // Special handling for Chinese
-                else if (language.equals("zh")) {
-                    if (script.length() == 0 && region.length() > 0) {
-                        // Supply script for users who want to use zh_Hans/zh_Hant
-                        // as bundle names (recommended for Java7+)
-                        if (region.equals("TW") || region.equals("HK") || region.equals("MO")) {
-                            script = "Hant";
-                        } else if (region.equals("CN") || region.equals("SG")) {
-                            script = "Hans";
-                        }
-                    } else if (script.length() > 0 && region.length() == 0) {
-                        // Supply region(country) for users who still package Chinese
-                        // bundles using old convension.
-                        if (script.equals("Hans")) {
-                            region = "CN";
-                        } else if (script.equals("Hant")) {
-                            region = "TW";
-                        }
-                    }
-                }
-
-                return getDefaultList(language, script, region, variant);
-            }
-
-            private static List<Locale> getDefaultList(String language, String script, String region, String variant) {
-                List<String> variants = null;
-
-                if (variant.length() > 0) {
-                    variants = new LinkedList<>();
-                    int idx = variant.length();
-                    while (idx != -1) {
-                        variants.add(variant.substring(0, idx));
-                        idx = variant.lastIndexOf('_', --idx);
-                    }
-                }
-
-                List<Locale> list = new LinkedList<>();
-
-                if (variants != null) {
-                    for (String v : variants) {
-                        list.add(Locale.getInstance(language, script, region, v, null));
-                    }
-                }
-                if (region.length() > 0) {
-                    list.add(Locale.getInstance(language, script, region, "", null));
-                }
-                if (script.length() > 0) {
-                    list.add(Locale.getInstance(language, script, "", "", null));
-
-                    // With script, after truncating variant, region and script,
-                    // start over without script.
-                    if (variants != null) {
-                        for (String v : variants) {
-                            list.add(Locale.getInstance(language, "", region, v, null));
-                        }
-                    }
-                    if (region.length() > 0) {
-                        list.add(Locale.getInstance(language, "", region, "", null));
-                    }
-                }
-                if (language.length() > 0) {
-                    list.add(Locale.getInstance(language, "", "", "", null));
-                }
-                // Add root locale at the end
-                list.add(Locale.ROOT);
-
-                return list;
-            }
-        }
-
-        /**
-         * Returns a <code>Locale</code> to be used as a fallback locale for
-         * further resource bundle searches by the
-         * <code>ResourceBundle.getBundle</code> factory method. This method
-         * is called from the factory method every time when no resulting
-         * resource bundle has been found for <code>baseName</code> and
-         * <code>locale</code>, where locale is either the parameter for
-         * <code>ResourceBundle.getBundle</code> or the previous fallback
-         * locale returned by this method.
-         *
-         * <p>The method returns <code>null</code> if no further fallback
-         * search is desired.
-         *
-         * <p>The default implementation returns the {@linkplain
-         * Locale#getDefault() default <code>Locale</code>} if the given
-         * <code>locale</code> isn't the default one.  Otherwise,
-         * <code>null</code> is returned.
-         *
-         * @param baseName
-         *        the base name of the resource bundle, a fully
-         *        qualified class name for which
-         *        <code>ResourceBundle.getBundle</code> has been
-         *        unable to find any resource bundles (except for the
-         *        base bundle)
-         * @param locale
-         *        the <code>Locale</code> for which
-         *        <code>ResourceBundle.getBundle</code> has been
-         *        unable to find any resource bundles (except for the
-         *        base bundle)
-         * @return a <code>Locale</code> for the fallback search,
-         *        or <code>null</code> if no further fallback search
-         *        is desired.
-         * @exception NullPointerException
-         *        if <code>baseName</code> or <code>locale</code>
-         *        is <code>null</code>
-         */
-        public Locale getFallbackLocale(String baseName, Locale locale) {
-            if (baseName == null) {
-                throw new NullPointerException();
-            }
-            Locale defaultLocale = Locale.getDefault();
-            return locale.equals(defaultLocale) ? null : defaultLocale;
-        }
-
-        /**
-         * Instantiates a resource bundle for the given bundle name of the
-         * given format and locale, using the given class loader if
-         * necessary. This method returns <code>null</code> if there is no
-         * resource bundle available for the given parameters. If a resource
-         * bundle can't be instantiated due to an unexpected error, the
-         * error must be reported by throwing an <code>Error</code> or
-         * <code>Exception</code> rather than simply returning
-         * <code>null</code>.
-         *
-         * <p>If the <code>reload</code> flag is <code>true</code>, it
-         * indicates that this method is being called because the previously
-         * loaded resource bundle has expired.
-         *
-         * <p>The default implementation instantiates a
-         * <code>ResourceBundle</code> as follows.
-         *
-         * <ul>
-         *
-         * <li>The bundle name is obtained by calling {@link
-         * #toBundleName(String, Locale) toBundleName(baseName,
-         * locale)}.</li>
-         *
-         * <li>If <code>format</code> is <code>"java.class"</code>, the
-         * {@link Class} specified by the bundle name is loaded by calling
-         * {@link ClassLoader#loadClass(String)}. Then, a
-         * <code>ResourceBundle</code> is instantiated by calling {@link
-         * Class#newInstance()}.  Note that the <code>reload</code> flag is
-         * ignored for loading class-based resource bundles in this default
-         * implementation.</li>
-         *
-         * <li>If <code>format</code> is <code>"java.properties"</code>,
-         * {@link #toResourceName(String, String) toResourceName(bundlename,
-         * "properties")} is called to get the resource name.
-         * If <code>reload</code> is <code>true</code>, {@link
-         * ClassLoader#getResource(String) load.getResource} is called
-         * to get a {@link URL} for creating a {@link
-         * URLConnection}. This <code>URLConnection</code> is used to
-         * {@linkplain URLConnection#setUseCaches(boolean) disable the
-         * caches} of the underlying resource loading layers,
-         * and to {@linkplain URLConnection#getInputStream() get an
-         * <code>InputStream</code>}.
-         * Otherwise, {@link ClassLoader#getResourceAsStream(String)
-         * loader.getResourceAsStream} is called to get an {@link
-         * InputStream}. Then, a {@link
-         * PropertyResourceBundle} is constructed with the
-         * <code>InputStream</code>.</li>
-         *
-         * <li>If <code>format</code> is neither <code>"java.class"</code>
-         * nor <code>"java.properties"</code>, an
-         * <code>IllegalArgumentException</code> is thrown.</li>
-         *
-         * </ul>
-         *
-         * @param baseName
-         *        the base bundle name of the resource bundle, a fully
-         *        qualified class name
-         * @param locale
-         *        the locale for which the resource bundle should be
-         *        instantiated
-         * @param format
-         *        the resource bundle format to be loaded
-         * @param loader
-         *        the <code>ClassLoader</code> to use to load the bundle
-         * @param reload
-         *        the flag to indicate bundle reloading; <code>true</code>
-         *        if reloading an expired resource bundle,
-         *        <code>false</code> otherwise
-         * @return the resource bundle instance,
-         *        or <code>null</code> if none could be found.
-         * @exception NullPointerException
-         *        if <code>bundleName</code>, <code>locale</code>,
-         *        <code>format</code>, or <code>loader</code> is
-         *        <code>null</code>, or if <code>null</code> is returned by
-         *        {@link #toBundleName(String, Locale) toBundleName}
-         * @exception IllegalArgumentException
-         *        if <code>format</code> is unknown, or if the resource
-         *        found for the given parameters contains malformed data.
-         * @exception ClassCastException
-         *        if the loaded class cannot be cast to <code>ResourceBundle</code>
-         * @exception IllegalAccessException
-         *        if the class or its nullary constructor is not
-         *        accessible.
-         * @exception InstantiationException
-         *        if the instantiation of a class fails for some other
-         *        reason.
-         * @exception ExceptionInInitializerError
-         *        if the initialization provoked by this method fails.
-         * @exception SecurityException
-         *        If a security manager is present and creation of new
-         *        instances is denied. See {@link Class#newInstance()}
-         *        for details.
-         * @exception IOException
-         *        if an error occurred when reading resources using
-         *        any I/O operations
-         */
-        public ResourceBundle newBundle(String baseName, Locale locale, String format,
-                                        ClassLoader loader, boolean reload)
-                    throws IllegalAccessException, InstantiationException, IOException {
-            String bundleName = toBundleName(baseName, locale);
-            ResourceBundle bundle = null;
-            if (format.equals("java.class")) {
-                try {
-                    Class<? extends ResourceBundle> bundleClass
-                        = (Class<? extends ResourceBundle>)loader.loadClass(bundleName);
-
-                    // If the class isn't a ResourceBundle subclass, throw a
-                    // ClassCastException.
-                    if (ResourceBundle.class.isAssignableFrom(bundleClass)) {
-                        bundle = bundleClass.newInstance();
-                    } else {
-                        throw new ClassCastException(bundleClass.getName()
-                                     + " cannot be cast to ResourceBundle");
-                    }
-                } catch (ClassNotFoundException e) {
-                }
-            } else if (format.equals("java.properties")) {
-                final String resourceName = toResourceName(bundleName, "properties");
-                final ClassLoader classLoader = loader;
-                final boolean reloadFlag = reload;
-                InputStream stream = null;
-                try {
-                    stream = AccessController.doPrivileged(
-                        new PrivilegedExceptionAction<InputStream>() {
-                            public InputStream run() throws IOException {
-                                InputStream is = null;
-                                if (reloadFlag) {
-                                    URL url = classLoader.getResource(resourceName);
-                                    if (url != null) {
-                                        URLConnection connection = url.openConnection();
-                                        if (connection != null) {
-                                            // Disable caches to get fresh data for
-                                            // reloading.
-                                            connection.setUseCaches(false);
-                                            is = connection.getInputStream();
-                                        }
-                                    }
-                                } else {
-                                    is = classLoader.getResourceAsStream(resourceName);
-                                }
-                                return is;
-                            }
-                        });
-                } catch (PrivilegedActionException e) {
-                    throw (IOException) e.getException();
-                }
-                if (stream != null) {
-                    try {
-                        bundle = new PropertyResourceBundle(stream);
-                    } finally {
-                        stream.close();
-                    }
-                }
-            } else {
-                throw new IllegalArgumentException("unknown format: " + format);
-            }
-            return bundle;
-        }
-
-        /**
-         * Returns the time-to-live (TTL) value for resource bundles that
-         * are loaded under this
-         * <code>ResourceBundle.Control</code>. Positive time-to-live values
-         * specify the number of milliseconds a bundle can remain in the
-         * cache without being validated against the source data from which
-         * it was constructed. The value 0 indicates that a bundle must be
-         * validated each time it is retrieved from the cache. {@link
-         * #TTL_DONT_CACHE} specifies that loaded resource bundles are not
-         * put in the cache. {@link #TTL_NO_EXPIRATION_CONTROL} specifies
-         * that loaded resource bundles are put in the cache with no
-         * expiration control.
-         *
-         * <p>The expiration affects only the bundle loading process by the
-         * <code>ResourceBundle.getBundle</code> factory method.  That is,
-         * if the factory method finds a resource bundle in the cache that
-         * has expired, the factory method calls the {@link
-         * #needsReload(String, Locale, String, ClassLoader, ResourceBundle,
-         * long) needsReload} method to determine whether the resource
-         * bundle needs to be reloaded. If <code>needsReload</code> returns
-         * <code>true</code>, the cached resource bundle instance is removed
-         * from the cache. Otherwise, the instance stays in the cache,
-         * updated with the new TTL value returned by this method.
-         *
-         * <p>All cached resource bundles are subject to removal from the
-         * cache due to memory constraints of the runtime environment.
-         * Returning a large positive value doesn't mean to lock loaded
-         * resource bundles in the cache.
-         *
-         * <p>The default implementation returns {@link #TTL_NO_EXPIRATION_CONTROL}.
-         *
-         * @param baseName
-         *        the base name of the resource bundle for which the
-         *        expiration value is specified.
-         * @param locale
-         *        the locale of the resource bundle for which the
-         *        expiration value is specified.
-         * @return the time (0 or a positive millisecond offset from the
-         *        cached time) to get loaded bundles expired in the cache,
-         *        {@link #TTL_NO_EXPIRATION_CONTROL} to disable the
-         *        expiration control, or {@link #TTL_DONT_CACHE} to disable
-         *        caching.
-         * @exception NullPointerException
-         *        if <code>baseName</code> or <code>locale</code> is
-         *        <code>null</code>
-         */
-        public long getTimeToLive(String baseName, Locale locale) {
-            if (baseName == null || locale == null) {
-                throw new NullPointerException();
-            }
-            return TTL_NO_EXPIRATION_CONTROL;
-        }
-
-        /**
-         * Determines if the expired <code>bundle</code> in the cache needs
-         * to be reloaded based on the loading time given by
-         * <code>loadTime</code> or some other criteria. The method returns
-         * <code>true</code> if reloading is required; <code>false</code>
-         * otherwise. <code>loadTime</code> is a millisecond offset since
-         * the <a href="Calendar.html#Epoch"> <code>Calendar</code>
-         * Epoch</a>.
-         *
-         * The calling <code>ResourceBundle.getBundle</code> factory method
-         * calls this method on the <code>ResourceBundle.Control</code>
-         * instance used for its current invocation, not on the instance
-         * used in the invocation that originally loaded the resource
-         * bundle.
-         *
-         * <p>The default implementation compares <code>loadTime</code> and
-         * the last modified time of the source data of the resource
-         * bundle. If it's determined that the source data has been modified
-         * since <code>loadTime</code>, <code>true</code> is
-         * returned. Otherwise, <code>false</code> is returned. This
-         * implementation assumes that the given <code>format</code> is the
-         * same string as its file suffix if it's not one of the default
-         * formats, <code>"java.class"</code> or
-         * <code>"java.properties"</code>.
-         *
-         * @param baseName
-         *        the base bundle name of the resource bundle, a
-         *        fully qualified class name
-         * @param locale
-         *        the locale for which the resource bundle
-         *        should be instantiated
-         * @param format
-         *        the resource bundle format to be loaded
-         * @param loader
-         *        the <code>ClassLoader</code> to use to load the bundle
-         * @param bundle
-         *        the resource bundle instance that has been expired
-         *        in the cache
-         * @param loadTime
-         *        the time when <code>bundle</code> was loaded and put
-         *        in the cache
-         * @return <code>true</code> if the expired bundle needs to be
-         *        reloaded; <code>false</code> otherwise.
-         * @exception NullPointerException
-         *        if <code>baseName</code>, <code>locale</code>,
-         *        <code>format</code>, <code>loader</code>, or
-         *        <code>bundle</code> is <code>null</code>
-         */
-        public boolean needsReload(String baseName, Locale locale,
-                                   String format, ClassLoader loader,
-                                   ResourceBundle bundle, long loadTime) {
-            if (bundle == null) {
-                throw new NullPointerException();
-            }
-            if (format.equals("java.class") || format.equals("java.properties")) {
-                format = format.substring(5);
-            }
-            boolean result = false;
-            try {
-                String resourceName = toResourceName(toBundleName(baseName, locale), format);
-                URL url = loader.getResource(resourceName);
-                if (url != null) {
-                    long lastModified = 0;
-                    URLConnection connection = url.openConnection();
-                    if (connection != null) {
-                        // disable caches to get the correct data
-                        connection.setUseCaches(false);
-                        if (connection instanceof JarURLConnection) {
-                            JarEntry ent = ((JarURLConnection)connection).getJarEntry();
-                            if (ent != null) {
-                                lastModified = ent.getTime();
-                                if (lastModified == -1) {
-                                    lastModified = 0;
-                                }
-                            }
-                        } else {
-                            lastModified = connection.getLastModified();
-                        }
-                    }
-                    result = lastModified >= loadTime;
-                }
-            } catch (NullPointerException npe) {
-                throw npe;
-            } catch (Exception e) {
-                // ignore other exceptions
-            }
-            return result;
-        }
-
-        /**
-         * Converts the given <code>baseName</code> and <code>locale</code>
-         * to the bundle name. This method is called from the default
-         * implementation of the {@link #newBundle(String, Locale, String,
-         * ClassLoader, boolean) newBundle} and {@link #needsReload(String,
-         * Locale, String, ClassLoader, ResourceBundle, long) needsReload}
-         * methods.
-         *
-         * <p>This implementation returns the following value:
-         * <pre>
-         *     baseName + "_" + language + "_" + script + "_" + country + "_" + variant
-         * </pre>
-         * where <code>language</code>, <code>script</code>, <code>country</code>,
-         * and <code>variant</code> are the language, script, country, and variant
-         * values of <code>locale</code>, respectively. Final component values that
-         * are empty Strings are omitted along with the preceding '_'.  When the
-         * script is empty, the script value is ommitted along with the preceding '_'.
-         * If all of the values are empty strings, then <code>baseName</code>
-         * is returned.
-         *
-         * <p>For example, if <code>baseName</code> is
-         * <code>"baseName"</code> and <code>locale</code> is
-         * <code>Locale("ja",&nbsp;"",&nbsp;"XX")</code>, then
-         * <code>"baseName_ja_&thinsp;_XX"</code> is returned. If the given
-         * locale is <code>Locale("en")</code>, then
-         * <code>"baseName_en"</code> is returned.
-         *
-         * <p>Overriding this method allows applications to use different
-         * conventions in the organization and packaging of localized
-         * resources.
-         *
-         * @param baseName
-         *        the base name of the resource bundle, a fully
-         *        qualified class name
-         * @param locale
-         *        the locale for which a resource bundle should be
-         *        loaded
-         * @return the bundle name for the resource bundle
-         * @exception NullPointerException
-         *        if <code>baseName</code> or <code>locale</code>
-         *        is <code>null</code>
-         */
-        public String toBundleName(String baseName, Locale locale) {
-            if (locale == Locale.ROOT) {
-                return baseName;
-            }
-
-            String language = locale.getLanguage();
-            String script = locale.getScript();
-            String country = locale.getCountry();
-            String variant = locale.getVariant();
-
-            if (language == "" && country == "" && variant == "") {
-                return baseName;
-            }
-
-            StringBuilder sb = new StringBuilder(baseName);
-            sb.append('_');
-            if (script != "") {
-                if (variant != "") {
-                    sb.append(language).append('_').append(script).append('_').append(country).append('_').append(variant);
-                } else if (country != "") {
-                    sb.append(language).append('_').append(script).append('_').append(country);
-                } else {
-                    sb.append(language).append('_').append(script);
-                }
-            } else {
-                if (variant != "") {
-                    sb.append(language).append('_').append(country).append('_').append(variant);
-                } else if (country != "") {
-                    sb.append(language).append('_').append(country);
-                } else {
-                    sb.append(language);
-                }
-            }
-            return sb.toString();
-
-        }
-
-        /**
-         * Converts the given <code>bundleName</code> to the form required
-         * by the {@link ClassLoader#getResource ClassLoader.getResource}
-         * method by replacing all occurrences of <code>'.'</code> in
-         * <code>bundleName</code> with <code>'/'</code> and appending a
-         * <code>'.'</code> and the given file <code>suffix</code>. For
-         * example, if <code>bundleName</code> is
-         * <code>"foo.bar.MyResources_ja_JP"</code> and <code>suffix</code>
-         * is <code>"properties"</code>, then
-         * <code>"foo/bar/MyResources_ja_JP.properties"</code> is returned.
-         *
-         * @param bundleName
-         *        the bundle name
-         * @param suffix
-         *        the file type suffix
-         * @return the converted resource name
-         * @exception NullPointerException
-         *         if <code>bundleName</code> or <code>suffix</code>
-         *         is <code>null</code>
-         */
-        public final String toResourceName(String bundleName, String suffix) {
-            StringBuilder sb = new StringBuilder(bundleName.length() + 1 + suffix.length());
-            sb.append(bundleName.replace('.', '/')).append('.').append(suffix);
-            return sb.toString();
-        }
-    }
-
-    private static class SingleFormatControl extends Control {
-        private static final Control PROPERTIES_ONLY
-            = new SingleFormatControl(FORMAT_PROPERTIES);
-
-        private static final Control CLASS_ONLY
-            = new SingleFormatControl(FORMAT_CLASS);
-
-        private final List<String> formats;
-
-        protected SingleFormatControl(List<String> formats) {
-            this.formats = formats;
-        }
-
-        public List<String> getFormats(String baseName) {
-            if (baseName == null) {
-                throw new NullPointerException();
-            }
-            return formats;
-        }
-    }
-
-    private static final class NoFallbackControl extends SingleFormatControl {
-        private static final Control NO_FALLBACK
-            = new NoFallbackControl(FORMAT_DEFAULT);
-
-        private static final Control PROPERTIES_ONLY_NO_FALLBACK
-            = new NoFallbackControl(FORMAT_PROPERTIES);
-
-        private static final Control CLASS_ONLY_NO_FALLBACK
-            = new NoFallbackControl(FORMAT_CLASS);
-
-        protected NoFallbackControl(List<String> formats) {
-            super(formats);
-        }
-
-        public Locale getFallbackLocale(String baseName, Locale locale) {
-            if (baseName == null || locale == null) {
-                throw new NullPointerException();
-            }
-            return null;
-        }
-    }
-}
diff --git a/openjdk/java/util/TimeZone.java b/openjdk/java/util/TimeZone.java
deleted file mode 100644
index 63f1028c..00000000
--- a/openjdk/java/util/TimeZone.java
+++ /dev/null
@@ -1,922 +0,0 @@
-/*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * (C) Copyright Taligent, Inc. 1996 - All Rights Reserved
- * (C) Copyright IBM Corp. 1996 - All Rights Reserved
- *
- *   The original version of this source code and documentation is copyrighted
- * and owned by Taligent, Inc., a wholly-owned subsidiary of IBM. These
- * materials are provided under terms of a License Agreement between Taligent
- * and Sun. This technology is protected by multiple US and International
- * patents. This notice and attribution to Taligent may not be removed.
- *   Taligent is a registered trademark of Taligent, Inc.
- *
- */
-
-package java.util;
-
-import java.io.Serializable;
-import java.lang.ref.SoftReference;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.concurrent.ConcurrentHashMap;
-import sun.misc.SharedSecrets;
-import sun.misc.JavaAWTAccess;
-import sun.security.action.GetPropertyAction;
-import sun.util.TimeZoneNameUtility;
-import sun.util.calendar.ZoneInfo;
-import sun.util.calendar.ZoneInfoFile;
-
-/**
- * <code>TimeZone</code> represents a time zone offset, and also figures out daylight
- * savings.
- *
- * <p>
- * Typically, you get a <code>TimeZone</code> using <code>getDefault</code>
- * which creates a <code>TimeZone</code> based on the time zone where the program
- * is running. For example, for a program running in Japan, <code>getDefault</code>
- * creates a <code>TimeZone</code> object based on Japanese Standard Time.
- *
- * <p>
- * You can also get a <code>TimeZone</code> using <code>getTimeZone</code>
- * along with a time zone ID. For instance, the time zone ID for the
- * U.S. Pacific Time zone is "America/Los_Angeles". So, you can get a
- * U.S. Pacific Time <code>TimeZone</code> object with:
- * <blockquote><pre>
- * TimeZone tz = TimeZone.getTimeZone("America/Los_Angeles");
- * </pre></blockquote>
- * You can use the <code>getAvailableIDs</code> method to iterate through
- * all the supported time zone IDs. You can then choose a
- * supported ID to get a <code>TimeZone</code>.
- * If the time zone you want is not represented by one of the
- * supported IDs, then a custom time zone ID can be specified to
- * produce a TimeZone. The syntax of a custom time zone ID is:
- *
- * <blockquote><pre>
- * <a name="CustomID"><i>CustomID:</i></a>
- *         <code>GMT</code> <i>Sign</i> <i>Hours</i> <code>:</code> <i>Minutes</i>
- *         <code>GMT</code> <i>Sign</i> <i>Hours</i> <i>Minutes</i>
- *         <code>GMT</code> <i>Sign</i> <i>Hours</i>
- * <i>Sign:</i> one of
- *         <code>+ -</code>
- * <i>Hours:</i>
- *         <i>Digit</i>
- *         <i>Digit</i> <i>Digit</i>
- * <i>Minutes:</i>
- *         <i>Digit</i> <i>Digit</i>
- * <i>Digit:</i> one of
- *         <code>0 1 2 3 4 5 6 7 8 9</code>
- * </pre></blockquote>
- *
- * <i>Hours</i> must be between 0 to 23 and <i>Minutes</i> must be
- * between 00 to 59.  For example, "GMT+10" and "GMT+0010" mean ten
- * hours and ten minutes ahead of GMT, respectively.
- * <p>
- * The format is locale independent and digits must be taken from the
- * Basic Latin block of the Unicode standard. No daylight saving time
- * transition schedule can be specified with a custom time zone ID. If
- * the specified string doesn't match the syntax, <code>"GMT"</code>
- * is used.
- * <p>
- * When creating a <code>TimeZone</code>, the specified custom time
- * zone ID is normalized in the following syntax:
- * <blockquote><pre>
- * <a name="NormalizedCustomID"><i>NormalizedCustomID:</i></a>
- *         <code>GMT</code> <i>Sign</i> <i>TwoDigitHours</i> <code>:</code> <i>Minutes</i>
- * <i>Sign:</i> one of
- *         <code>+ -</code>
- * <i>TwoDigitHours:</i>
- *         <i>Digit</i> <i>Digit</i>
- * <i>Minutes:</i>
- *         <i>Digit</i> <i>Digit</i>
- * <i>Digit:</i> one of
- *         <code>0 1 2 3 4 5 6 7 8 9</code>
- * </pre></blockquote>
- * For example, TimeZone.getTimeZone("GMT-8").getID() returns "GMT-08:00".
- *
- * <h4>Three-letter time zone IDs</h4>
- *
- * For compatibility with JDK 1.1.x, some other three-letter time zone IDs
- * (such as "PST", "CTT", "AST") are also supported. However, <strong>their
- * use is deprecated</strong> because the same abbreviation is often used
- * for multiple time zones (for example, "CST" could be U.S. "Central Standard
- * Time" and "China Standard Time"), and the Java platform can then only
- * recognize one of them.
- *
- *
- * @see          Calendar
- * @see          GregorianCalendar
- * @see          SimpleTimeZone
- * @author       Mark Davis, David Goldsmith, Chen-Lieh Huang, Alan Liu
- * @since        JDK1.1
- */
-abstract public class TimeZone implements Serializable, Cloneable {
-    /**
-     * Sole constructor.  (For invocation by subclass constructors, typically
-     * implicit.)
-     */
-    public TimeZone() {
-    }
-
-    /**
-     * A style specifier for <code>getDisplayName()</code> indicating
-     * a short name, such as "PST."
-     * @see #LONG
-     * @since 1.2
-     */
-    public static final int SHORT = 0;
-
-    /**
-     * A style specifier for <code>getDisplayName()</code> indicating
-     * a long name, such as "Pacific Standard Time."
-     * @see #SHORT
-     * @since 1.2
-     */
-    public static final int LONG  = 1;
-
-    // Constants used internally; unit is milliseconds
-    private static final int ONE_MINUTE = 60*1000;
-    private static final int ONE_HOUR   = 60*ONE_MINUTE;
-    private static final int ONE_DAY    = 24*ONE_HOUR;
-
-    // Proclaim serialization compatibility with JDK 1.1
-    static final long serialVersionUID = 3581463369166924961L;
-
-    /**
-     * Gets the time zone offset, for current date, modified in case of
-     * daylight savings. This is the offset to add to UTC to get local time.
-     * <p>
-     * This method returns a historically correct offset if an
-     * underlying <code>TimeZone</code> implementation subclass
-     * supports historical Daylight Saving Time schedule and GMT
-     * offset changes.
-     *
-     * @param era the era of the given date.
-     * @param year the year in the given date.
-     * @param month the month in the given date.
-     * Month is 0-based. e.g., 0 for January.
-     * @param day the day-in-month of the given date.
-     * @param dayOfWeek the day-of-week of the given date.
-     * @param milliseconds the milliseconds in day in <em>standard</em>
-     * local time.
-     *
-     * @return the offset in milliseconds to add to GMT to get local time.
-     *
-     * @see Calendar#ZONE_OFFSET
-     * @see Calendar#DST_OFFSET
-     */
-    public abstract int getOffset(int era, int year, int month, int day,
-                                  int dayOfWeek, int milliseconds);
-
-    /**
-     * Returns the offset of this time zone from UTC at the specified
-     * date. If Daylight Saving Time is in effect at the specified
-     * date, the offset value is adjusted with the amount of daylight
-     * saving.
-     * <p>
-     * This method returns a historically correct offset value if an
-     * underlying TimeZone implementation subclass supports historical
-     * Daylight Saving Time schedule and GMT offset changes.
-     *
-     * @param date the date represented in milliseconds since January 1, 1970 00:00:00 GMT
-     * @return the amount of time in milliseconds to add to UTC to get local time.
-     *
-     * @see Calendar#ZONE_OFFSET
-     * @see Calendar#DST_OFFSET
-     * @since 1.4
-     */
-    public int getOffset(long date) {
-        if (inDaylightTime(new Date(date))) {
-            return getRawOffset() + getDSTSavings();
-        }
-        return getRawOffset();
-    }
-
-    /**
-     * Gets the raw GMT offset and the amount of daylight saving of this
-     * time zone at the given time.
-     * @param date the milliseconds (since January 1, 1970,
-     * 00:00:00.000 GMT) at which the time zone offset and daylight
-     * saving amount are found
-     * @param offset an array of int where the raw GMT offset
-     * (offset[0]) and daylight saving amount (offset[1]) are stored,
-     * or null if those values are not needed. The method assumes that
-     * the length of the given array is two or larger.
-     * @return the total amount of the raw GMT offset and daylight
-     * saving at the specified date.
-     *
-     * @see Calendar#ZONE_OFFSET
-     * @see Calendar#DST_OFFSET
-     */
-    int getOffsets(long date, int[] offsets) {
-        int rawoffset = getRawOffset();
-        int dstoffset = 0;
-        if (inDaylightTime(new Date(date))) {
-            dstoffset = getDSTSavings();
-        }
-        if (offsets != null) {
-            offsets[0] = rawoffset;
-            offsets[1] = dstoffset;
-        }
-        return rawoffset + dstoffset;
-    }
-
-    /**
-     * Sets the base time zone offset to GMT.
-     * This is the offset to add to UTC to get local time.
-     * <p>
-     * If an underlying <code>TimeZone</code> implementation subclass
-     * supports historical GMT offset changes, the specified GMT
-     * offset is set as the latest GMT offset and the difference from
-     * the known latest GMT offset value is used to adjust all
-     * historical GMT offset values.
-     *
-     * @param offsetMillis the given base time zone offset to GMT.
-     */
-    abstract public void setRawOffset(int offsetMillis);
-
-    /**
-     * Returns the amount of time in milliseconds to add to UTC to get
-     * standard time in this time zone. Because this value is not
-     * affected by daylight saving time, it is called <I>raw
-     * offset</I>.
-     * <p>
-     * If an underlying <code>TimeZone</code> implementation subclass
-     * supports historical GMT offset changes, the method returns the
-     * raw offset value of the current date. In Honolulu, for example,
-     * its raw offset changed from GMT-10:30 to GMT-10:00 in 1947, and
-     * this method always returns -36000000 milliseconds (i.e., -10
-     * hours).
-     *
-     * @return the amount of raw offset time in milliseconds to add to UTC.
-     * @see Calendar#ZONE_OFFSET
-     */
-    public abstract int getRawOffset();
-
-    /**
-     * Gets the ID of this time zone.
-     * @return the ID of this time zone.
-     */
-    public String getID()
-    {
-        return ID;
-    }
-
-    /**
-     * Sets the time zone ID. This does not change any other data in
-     * the time zone object.
-     * @param ID the new time zone ID.
-     */
-    public void setID(String ID)
-    {
-        if (ID == null) {
-            throw new NullPointerException();
-        }
-        this.ID = ID;
-    }
-
-    /**
-     * Returns a long standard time name of this {@code TimeZone} suitable for
-     * presentation to the user in the default locale.
-     *
-     * <p>This method is equivalent to:
-     * <pre><blockquote>
-     * getDisplayName(false, {@link #LONG},
-     *                Locale.getDefault({@link Locale.Category#DISPLAY}))
-     * </blockquote></pre>
-     *
-     * @return the human-readable name of this time zone in the default locale.
-     * @since 1.2
-     * @see #getDisplayName(boolean, int, Locale)
-     * @see Locale#getDefault(Locale.Category)
-     * @see Locale.Category
-     */
-    public final String getDisplayName() {
-        return getDisplayName(false, LONG,
-                              Locale.getDefault(Locale.Category.DISPLAY));
-    }
-
-    /**
-     * Returns a long standard time name of this {@code TimeZone} suitable for
-     * presentation to the user in the specified {@code locale}.
-     *
-     * <p>This method is equivalent to:
-     * <pre><blockquote>
-     * getDisplayName(false, {@link #LONG}, locale)
-     * </blockquote></pre>
-     *
-     * @param locale the locale in which to supply the display name.
-     * @return the human-readable name of this time zone in the given locale.
-     * @exception NullPointerException if {@code locale} is {@code null}.
-     * @since 1.2
-     * @see #getDisplayName(boolean, int, Locale)
-     */
-    public final String getDisplayName(Locale locale) {
-        return getDisplayName(false, LONG, locale);
-    }
-
-    /**
-     * Returns a name in the specified {@code style} of this {@code TimeZone}
-     * suitable for presentation to the user in the default locale. If the
-     * specified {@code daylight} is {@code true}, a Daylight Saving Time name
-     * is returned (even if this {@code TimeZone} doesn't observe Daylight Saving
-     * Time). Otherwise, a Standard Time name is returned.
-     *
-     * <p>This method is equivalent to:
-     * <pre><blockquote>
-     * getDisplayName(daylight, style,
-     *                Locale.getDefault({@link Locale.Category#DISPLAY}))
-     * </blockquote></pre>
-     *
-     * @param daylight {@code true} specifying a Daylight Saving Time name, or
-     *                 {@code false} specifying a Standard Time name
-     * @param style either {@link #LONG} or {@link #SHORT}
-     * @return the human-readable name of this time zone in the default locale.
-     * @exception IllegalArgumentException if {@code style} is invalid.
-     * @since 1.2
-     * @see #getDisplayName(boolean, int, Locale)
-     * @see Locale#getDefault(Locale.Category)
-     * @see Locale.Category
-     * @see java.text.DateFormatSymbols#getZoneStrings()
-     */
-    public final String getDisplayName(boolean daylight, int style) {
-        return getDisplayName(daylight, style,
-                              Locale.getDefault(Locale.Category.DISPLAY));
-    }
-
-    /**
-     * Returns a name in the specified {@code style} of this {@code TimeZone}
-     * suitable for presentation to the user in the specified {@code
-     * locale}. If the specified {@code daylight} is {@code true}, a Daylight
-     * Saving Time name is returned (even if this {@code TimeZone} doesn't
-     * observe Daylight Saving Time). Otherwise, a Standard Time name is
-     * returned.
-     *
-     * <p>When looking up a time zone name, the {@linkplain
-     * ResourceBundle.Control#getCandidateLocales(String,Locale) default
-     * <code>Locale</code> search path of <code>ResourceBundle</code>} derived
-     * from the specified {@code locale} is used. (No {@linkplain
-     * ResourceBundle.Control#getFallbackLocale(String,Locale) fallback
-     * <code>Locale</code>} search is performed.) If a time zone name in any
-     * {@code Locale} of the search path, including {@link Locale#ROOT}, is
-     * found, the name is returned. Otherwise, a string in the
-     * <a href="#NormalizedCustomID">normalized custom ID format</a> is returned.
-     *
-     * @param daylight {@code true} specifying a Daylight Saving Time name, or
-     *                 {@code false} specifying a Standard Time name
-     * @param style either {@link #LONG} or {@link #SHORT}
-     * @param locale   the locale in which to supply the display name.
-     * @return the human-readable name of this time zone in the given locale.
-     * @exception IllegalArgumentException if {@code style} is invalid.
-     * @exception NullPointerException if {@code locale} is {@code null}.
-     * @since 1.2
-     * @see java.text.DateFormatSymbols#getZoneStrings()
-     */
-    public String getDisplayName(boolean daylight, int style, Locale locale) {
-        if (style != SHORT && style != LONG) {
-            throw new IllegalArgumentException("Illegal style: " + style);
-        }
-
-        String id = getID();
-        String[] names = getDisplayNames(id, locale);
-        if (names == null) {
-            if (id.startsWith("GMT")) {
-                char sign = id.charAt(3);
-                if (sign == '+' || sign == '-') {
-                    return id;
-                }
-            }
-            int offset = getRawOffset();
-            if (daylight) {
-                offset += getDSTSavings();
-            }
-            return ZoneInfoFile.toCustomID(offset);
-        }
-
-        int index = daylight ? 3 : 1;
-        if (style == SHORT) {
-            index++;
-        }
-        return names[index];
-    }
-
-    private static class DisplayNames {
-        // Cache for managing display names per timezone per locale
-        // The structure is:
-        //   Map(key=id, value=SoftReference(Map(key=locale, value=displaynames)))
-        private static final Map<String, SoftReference<Map<Locale, String[]>>> CACHE =
-            new ConcurrentHashMap<String, SoftReference<Map<Locale, String[]>>>();
-    }
-
-    private static final String[] getDisplayNames(String id, Locale locale) {
-        Map<String, SoftReference<Map<Locale, String[]>>> displayNames = DisplayNames.CACHE;
-
-        SoftReference<Map<Locale, String[]>> ref = displayNames.get(id);
-        if (ref != null) {
-            Map<Locale, String[]> perLocale = ref.get();
-            if (perLocale != null) {
-                String[] names = perLocale.get(locale);
-                if (names != null) {
-                    return names;
-                }
-                names = TimeZoneNameUtility.retrieveDisplayNames(id, locale);
-                if (names != null) {
-                    perLocale.put(locale, names);
-                }
-                return names;
-            }
-        }
-
-        String[] names = TimeZoneNameUtility.retrieveDisplayNames(id, locale);
-        if (names != null) {
-            Map<Locale, String[]> perLocale = new ConcurrentHashMap<Locale, String[]>();
-            perLocale.put(locale, names);
-            ref = new SoftReference<Map<Locale, String[]>>(perLocale);
-            displayNames.put(id, ref);
-        }
-        return names;
-    }
-
-    /**
-     * Returns the amount of time to be added to local standard time
-     * to get local wall clock time.
-     *
-     * <p>The default implementation returns 3600000 milliseconds
-     * (i.e., one hour) if a call to {@link #useDaylightTime()}
-     * returns {@code true}. Otherwise, 0 (zero) is returned.
-     *
-     * <p>If an underlying {@code TimeZone} implementation subclass
-     * supports historical and future Daylight Saving Time schedule
-     * changes, this method returns the amount of saving time of the
-     * last known Daylight Saving Time rule that can be a future
-     * prediction.
-     *
-     * <p>If the amount of saving time at any given time stamp is
-     * required, construct a {@link Calendar} with this {@code
-     * TimeZone} and the time stamp, and call {@link Calendar#get(int)
-     * Calendar.get}{@code (}{@link Calendar#DST_OFFSET}{@code )}.
-     *
-     * @return the amount of saving time in milliseconds
-     * @since 1.4
-     * @see #inDaylightTime(Date)
-     * @see #getOffset(long)
-     * @see #getOffset(int,int,int,int,int,int)
-     * @see Calendar#ZONE_OFFSET
-     */
-    public int getDSTSavings() {
-        if (useDaylightTime()) {
-            return 3600000;
-        }
-        return 0;
-    }
-
-    /**
-     * Queries if this {@code TimeZone} uses Daylight Saving Time.
-     *
-     * <p>If an underlying {@code TimeZone} implementation subclass
-     * supports historical and future Daylight Saving Time schedule
-     * changes, this method refers to the last known Daylight Saving Time
-     * rule that can be a future prediction and may not be the same as
-     * the current rule. Consider calling {@link #observesDaylightTime()}
-     * if the current rule should also be taken into account.
-     *
-     * @return {@code true} if this {@code TimeZone} uses Daylight Saving Time,
-     *         {@code false}, otherwise.
-     * @see #inDaylightTime(Date)
-     * @see Calendar#DST_OFFSET
-     */
-    public abstract boolean useDaylightTime();
-
-    /**
-     * Returns {@code true} if this {@code TimeZone} is currently in
-     * Daylight Saving Time, or if a transition from Standard Time to
-     * Daylight Saving Time occurs at any future time.
-     *
-     * <p>The default implementation returns {@code true} if
-     * {@code useDaylightTime()} or {@code inDaylightTime(new Date())}
-     * returns {@code true}.
-     *
-     * @return {@code true} if this {@code TimeZone} is currently in
-     * Daylight Saving Time, or if a transition from Standard Time to
-     * Daylight Saving Time occurs at any future time; {@code false}
-     * otherwise.
-     * @since 1.7
-     * @see #useDaylightTime()
-     * @see #inDaylightTime(Date)
-     * @see Calendar#DST_OFFSET
-     */
-    public boolean observesDaylightTime() {
-        return useDaylightTime() || inDaylightTime(new Date());
-    }
-
-    /**
-     * Queries if the given {@code date} is in Daylight Saving Time in
-     * this time zone.
-     *
-     * @param date the given Date.
-     * @return {@code true} if the given date is in Daylight Saving Time,
-     *         {@code false}, otherwise.
-     */
-    abstract public boolean inDaylightTime(Date date);
-
-    /**
-     * Gets the <code>TimeZone</code> for the given ID.
-     *
-     * @param ID the ID for a <code>TimeZone</code>, either an abbreviation
-     * such as "PST", a full name such as "America/Los_Angeles", or a custom
-     * ID such as "GMT-8:00". Note that the support of abbreviations is
-     * for JDK 1.1.x compatibility only and full names should be used.
-     *
-     * @return the specified <code>TimeZone</code>, or the GMT zone if the given ID
-     * cannot be understood.
-     */
-    public static synchronized TimeZone getTimeZone(String ID) {
-        return getTimeZone(ID, true);
-    }
-
-    private static TimeZone getTimeZone(String ID, boolean fallback) {
-        TimeZone tz = ZoneInfo.getTimeZone(ID);
-        if (tz == null) {
-            tz = parseCustomTimeZone(ID);
-            if (tz == null && fallback) {
-                tz = new ZoneInfo(GMT_ID, 0);
-            }
-        }
-        return tz;
-    }
-
-    /**
-     * Gets the available IDs according to the given time zone offset in milliseconds.
-     *
-     * @param rawOffset the given time zone GMT offset in milliseconds.
-     * @return an array of IDs, where the time zone for that ID has
-     * the specified GMT offset. For example, "America/Phoenix" and "America/Denver"
-     * both have GMT-07:00, but differ in daylight saving behavior.
-     * @see #getRawOffset()
-     */
-    public static synchronized String[] getAvailableIDs(int rawOffset) {
-        return ZoneInfo.getAvailableIDs(rawOffset);
-    }
-
-    /**
-     * Gets all the available IDs supported.
-     * @return an array of IDs.
-     */
-    public static synchronized String[] getAvailableIDs() {
-        return ZoneInfo.getAvailableIDs();
-    }
-
-    /**
-     * Gets the platform defined TimeZone ID.
-     **/
-    private static native String getSystemTimeZoneID(String javaHome,
-                                                     String country);
-
-    /**
-     * Gets the custom time zone ID based on the GMT offset of the
-     * platform. (e.g., "GMT+08:00")
-     */
-    private static native String getSystemGMTOffsetID();
-
-    /**
-     * Gets the default <code>TimeZone</code> for this host.
-     * The source of the default <code>TimeZone</code>
-     * may vary with implementation.
-     * @return a default <code>TimeZone</code>.
-     * @see #setDefault
-     */
-    public static TimeZone getDefault() {
-        return (TimeZone) getDefaultRef().clone();
-    }
-
-    /**
-     * Returns the reference to the default TimeZone object. This
-     * method doesn't create a clone.
-     */
-    static TimeZone getDefaultRef() {
-        TimeZone defaultZone = getDefaultInAppContext();
-        if (defaultZone == null) {
-            defaultZone = defaultTimeZone;
-            if (defaultZone == null) {
-                // Need to initialize the default time zone.
-                defaultZone = setDefaultZone();
-                assert defaultZone != null;
-            }
-        }
-        // Don't clone here.
-        return defaultZone;
-    }
-
-    private static synchronized TimeZone setDefaultZone() {
-        TimeZone tz = null;
-        // get the time zone ID from the system properties
-        String zoneID = AccessController.doPrivileged(
-                new GetPropertyAction("user.timezone"));
-
-        // if the time zone ID is not set (yet), perform the
-        // platform to Java time zone ID mapping.
-        if (zoneID == null || zoneID.equals("")) {
-            String country = AccessController.doPrivileged(
-                    new GetPropertyAction("user.country"));
-            String javaHome = AccessController.doPrivileged(
-                    new GetPropertyAction("java.home"));
-            try {
-                zoneID = getSystemTimeZoneID(javaHome, country);
-                if (zoneID == null) {
-                    zoneID = GMT_ID;
-                }
-            } catch (NullPointerException e) {
-                zoneID = GMT_ID;
-            }
-        }
-
-        // Get the time zone for zoneID. But not fall back to
-        // "GMT" here.
-        tz = getTimeZone(zoneID, false);
-
-        if (tz == null) {
-            // If the given zone ID is unknown in Java, try to
-            // get the GMT-offset-based time zone ID,
-            // a.k.a. custom time zone ID (e.g., "GMT-08:00").
-            String gmtOffsetID = getSystemGMTOffsetID();
-            if (gmtOffsetID != null) {
-                zoneID = gmtOffsetID;
-            }
-            tz = getTimeZone(zoneID, true);
-        }
-        assert tz != null;
-
-        final String id = zoneID;
-        AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                public Object run() {
-                    System.setProperty("user.timezone", id);
-                    return null;
-                }
-            });
-
-        defaultTimeZone = tz;
-        return tz;
-    }
-
-    private static boolean hasPermission() {
-        boolean hasPermission = true;
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            try {
-                sm.checkPermission(new PropertyPermission
-                                   ("user.timezone", "write"));
-            } catch (SecurityException e) {
-                hasPermission = false;
-            }
-        }
-        return hasPermission;
-    }
-
-    /**
-     * Sets the <code>TimeZone</code> that is
-     * returned by the <code>getDefault</code> method.  If <code>zone</code>
-     * is null, reset the default to the value it had originally when the
-     * VM first started.
-     * @param zone the new default time zone
-     * @see #getDefault
-     */
-    public static void setDefault(TimeZone zone)
-    {
-        if (hasPermission()) {
-            synchronized (TimeZone.class) {
-                defaultTimeZone = zone;
-                setDefaultInAppContext(null);
-            }
-        } else {
-            setDefaultInAppContext(zone);
-        }
-    }
-
-    /**
-     * Returns the default TimeZone in an AppContext if any AppContext
-     * has ever used. null is returned if any AppContext hasn't been
-     * used or if the AppContext doesn't have the default TimeZone.
-     *
-     * Note that javaAWTAccess may be null if sun.awt.AppContext class hasn't
-     * been loaded. If so, it implies that AWTSecurityManager is not our
-     * SecurityManager and we can use a local static variable.
-     * This works around a build time issue.
-     */
-    private static TimeZone getDefaultInAppContext() {
-        // JavaAWTAccess provides access implementation-private methods without using reflection.
-        JavaAWTAccess javaAWTAccess = SharedSecrets.getJavaAWTAccess();
-        if (javaAWTAccess == null) {
-            return mainAppContextDefault;
-        } else {
-            if (!javaAWTAccess.isDisposed()) {
-                TimeZone tz = (TimeZone)
-                    javaAWTAccess.get(TimeZone.class);
-                if (tz == null && javaAWTAccess.isMainAppContext()) {
-                    return mainAppContextDefault;
-                } else {
-                    return tz;
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Sets the default TimeZone in the AppContext to the given
-     * tz. null is handled special: do nothing if any AppContext
-     * hasn't been used, remove the default TimeZone in the
-     * AppContext otherwise.
-     *
-     * Note that javaAWTAccess may be null if sun.awt.AppContext class hasn't
-     * been loaded. If so, it implies that AWTSecurityManager is not our
-     * SecurityManager and we can use a local static variable.
-     * This works around a build time issue.
-     */
-    private static void setDefaultInAppContext(TimeZone tz) {
-        // JavaAWTAccess provides access implementation-private methods without using reflection.
-        JavaAWTAccess javaAWTAccess = SharedSecrets.getJavaAWTAccess();
-        if (javaAWTAccess == null) {
-            mainAppContextDefault = tz;
-        } else {
-            if (!javaAWTAccess.isDisposed()) {
-                javaAWTAccess.put(TimeZone.class, tz);
-                if (javaAWTAccess.isMainAppContext()) {
-                    mainAppContextDefault = null;
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns true if this zone has the same rule and offset as another zone.
-     * That is, if this zone differs only in ID, if at all.  Returns false
-     * if the other zone is null.
-     * @param other the <code>TimeZone</code> object to be compared with
-     * @return true if the other zone is not null and is the same as this one,
-     * with the possible exception of the ID
-     * @since 1.2
-     */
-    public boolean hasSameRules(TimeZone other) {
-        return other != null && getRawOffset() == other.getRawOffset() &&
-            useDaylightTime() == other.useDaylightTime();
-    }
-
-    /**
-     * Creates a copy of this <code>TimeZone</code>.
-     *
-     * @return a clone of this <code>TimeZone</code>
-     */
-    public Object clone()
-    {
-        try {
-            TimeZone other = (TimeZone) super.clone();
-            other.ID = ID;
-            return other;
-        } catch (CloneNotSupportedException e) {
-            throw new InternalError();
-        }
-    }
-
-    /**
-     * The null constant as a TimeZone.
-     */
-    static final TimeZone NO_TIMEZONE = null;
-
-    // =======================privates===============================
-
-    /**
-     * The string identifier of this <code>TimeZone</code>.  This is a
-     * programmatic identifier used internally to look up <code>TimeZone</code>
-     * objects from the system table and also to map them to their localized
-     * display names.  <code>ID</code> values are unique in the system
-     * table but may not be for dynamically created zones.
-     * @serial
-     */
-    private String           ID;
-    private static volatile TimeZone defaultTimeZone;
-
-    static final String         GMT_ID        = "GMT";
-    private static final int    GMT_ID_LENGTH = 3;
-
-    // a static TimeZone we can reference if no AppContext is in place
-    private static volatile TimeZone mainAppContextDefault;
-
-    /**
-     * Parses a custom time zone identifier and returns a corresponding zone.
-     * This method doesn't support the RFC 822 time zone format. (e.g., +hhmm)
-     *
-     * @param id a string of the <a href="#CustomID">custom ID form</a>.
-     * @return a newly created TimeZone with the given offset and
-     * no daylight saving time, or null if the id cannot be parsed.
-     */
-    private static final TimeZone parseCustomTimeZone(String id) {
-        int length;
-
-        // Error if the length of id isn't long enough or id doesn't
-        // start with "GMT".
-        if ((length = id.length()) < (GMT_ID_LENGTH + 2) ||
-            id.indexOf(GMT_ID) != 0) {
-            return null;
-        }
-
-        ZoneInfo zi;
-
-        // First, we try to find it in the cache with the given
-        // id. Even the id is not normalized, the returned ZoneInfo
-        // should have its normalized id.
-        zi = ZoneInfoFile.getZoneInfo(id);
-        if (zi != null) {
-            return zi;
-        }
-
-        int index = GMT_ID_LENGTH;
-        boolean negative = false;
-        char c = id.charAt(index++);
-        if (c == '-') {
-            negative = true;
-        } else if (c != '+') {
-            return null;
-        }
-
-        int hours = 0;
-        int num = 0;
-        int countDelim = 0;
-        int len = 0;
-        while (index < length) {
-            c = id.charAt(index++);
-            if (c == ':') {
-                if (countDelim > 0) {
-                    return null;
-                }
-                if (len > 2) {
-                    return null;
-                }
-                hours = num;
-                countDelim++;
-                num = 0;
-                len = 0;
-                continue;
-            }
-            if (c < '0' || c > '9') {
-                return null;
-            }
-            num = num * 10 + (c - '0');
-            len++;
-        }
-        if (index != length) {
-            return null;
-        }
-        if (countDelim == 0) {
-            if (len <= 2) {
-                hours = num;
-                num = 0;
-            } else {
-                hours = num / 100;
-                num %= 100;
-            }
-        } else {
-            if (len != 2) {
-                return null;
-            }
-        }
-        if (hours > 23 || num > 59) {
-            return null;
-        }
-        int gmtOffset =  (hours * 60 + num) * 60 * 1000;
-
-        if (gmtOffset == 0) {
-            zi = ZoneInfoFile.getZoneInfo(GMT_ID);
-            if (negative) {
-                zi.setID("GMT-00:00");
-            } else {
-                zi.setID("GMT+00:00");
-            }
-        } else {
-            zi = ZoneInfoFile.getCustomTimeZone(id, negative ? -gmtOffset : gmtOffset);
-        }
-        return zi;
-    }
-}
diff --git a/openjdk/java/util/concurrent/ForkJoinPool.java b/openjdk/java/util/concurrent/ForkJoinPool.java
deleted file mode 100644
index 4b157962..00000000
--- a/openjdk/java/util/concurrent/ForkJoinPool.java
+++ /dev/null
@@ -1,3363 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * This file is available under and governed by the GNU General Public
- * License version 2 only, as published by the Free Software Foundation.
- * However, the following notice accompanied the original version of this
- * file:
- *
- * Written by Doug Lea with assistance from members of JCP JSR-166
- * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-package java.util.concurrent;
-
-import java.lang.Thread.UncaughtExceptionHandler;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.AbstractExecutorService;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.RunnableFuture;
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.concurrent.TimeUnit;
-import java.security.AccessControlContext;
-import java.security.ProtectionDomain;
-import java.security.Permissions;
-
-/**
- * An {@link ExecutorService} for running {@link ForkJoinTask}s.
- * A {@code ForkJoinPool} provides the entry point for submissions
- * from non-{@code ForkJoinTask} clients, as well as management and
- * monitoring operations.
- *
- * <p>A {@code ForkJoinPool} differs from other kinds of {@link
- * ExecutorService} mainly by virtue of employing
- * <em>work-stealing</em>: all threads in the pool attempt to find and
- * execute tasks submitted to the pool and/or created by other active
- * tasks (eventually blocking waiting for work if none exist). This
- * enables efficient processing when most tasks spawn other subtasks
- * (as do most {@code ForkJoinTask}s), as well as when many small
- * tasks are submitted to the pool from external clients.  Especially
- * when setting <em>asyncMode</em> to true in constructors, {@code
- * ForkJoinPool}s may also be appropriate for use with event-style
- * tasks that are never joined.
- *
- * <p>A static {@link #commonPool()} is available and appropriate for
- * most applications. The common pool is used by any ForkJoinTask that
- * is not explicitly submitted to a specified pool. Using the common
- * pool normally reduces resource usage (its threads are slowly
- * reclaimed during periods of non-use, and reinstated upon subsequent
- * use).
- *
- * <p>For applications that require separate or custom pools, a {@code
- * ForkJoinPool} may be constructed with a given target parallelism
- * level; by default, equal to the number of available processors. The
- * pool attempts to maintain enough active (or available) threads by
- * dynamically adding, suspending, or resuming internal worker
- * threads, even if some tasks are stalled waiting to join others.
- * However, no such adjustments are guaranteed in the face of blocked
- * I/O or other unmanaged synchronization. The nested {@link
- * ManagedBlocker} interface enables extension of the kinds of
- * synchronization accommodated.
- *
- * <p>In addition to execution and lifecycle control methods, this
- * class provides status check methods (for example
- * {@link #getStealCount}) that are intended to aid in developing,
- * tuning, and monitoring fork/join applications. Also, method
- * {@link #toString} returns indications of pool state in a
- * convenient form for informal monitoring.
- *
- * <p>As is the case with other ExecutorServices, there are three
- * main task execution methods summarized in the following table.
- * These are designed to be used primarily by clients not already
- * engaged in fork/join computations in the current pool.  The main
- * forms of these methods accept instances of {@code ForkJoinTask},
- * but overloaded forms also allow mixed execution of plain {@code
- * Runnable}- or {@code Callable}- based activities as well.  However,
- * tasks that are already executing in a pool should normally instead
- * use the within-computation forms listed in the table unless using
- * async event-style tasks that are not usually joined, in which case
- * there is little difference among choice of methods.
- *
- * <table BORDER CELLPADDING=3 CELLSPACING=1>
- * <caption>Summary of task execution methods</caption>
- *  <tr>
- *    <td></td>
- *    <td ALIGN=CENTER> <b>Call from non-fork/join clients</b></td>
- *    <td ALIGN=CENTER> <b>Call from within fork/join computations</b></td>
- *  </tr>
- *  <tr>
- *    <td> <b>Arrange async execution</b></td>
- *    <td> {@link #execute(ForkJoinTask)}</td>
- *    <td> {@link ForkJoinTask#fork}</td>
- *  </tr>
- *  <tr>
- *    <td> <b>Await and obtain result</b></td>
- *    <td> {@link #invoke(ForkJoinTask)}</td>
- *    <td> {@link ForkJoinTask#invoke}</td>
- *  </tr>
- *  <tr>
- *    <td> <b>Arrange exec and obtain Future</b></td>
- *    <td> {@link #submit(ForkJoinTask)}</td>
- *    <td> {@link ForkJoinTask#fork} (ForkJoinTasks <em>are</em> Futures)</td>
- *  </tr>
- * </table>
- *
- * <p>The common pool is by default constructed with default
- * parameters, but these may be controlled by setting three
- * {@linkplain System#getProperty system properties}:
- * <ul>
- * <li>{@code java.util.concurrent.ForkJoinPool.common.parallelism}
- * - the parallelism level, a non-negative integer
- * <li>{@code java.util.concurrent.ForkJoinPool.common.threadFactory}
- * - the class name of a {@link ForkJoinWorkerThreadFactory}
- * <li>{@code java.util.concurrent.ForkJoinPool.common.exceptionHandler}
- * - the class name of a {@link UncaughtExceptionHandler}
- * </ul>
- * If a {@link SecurityManager} is present and no factory is
- * specified, then the default pool uses a factory supplying
- * threads that have no {@link Permissions} enabled.
- * The system class loader is used to load these classes.
- * Upon any error in establishing these settings, default parameters
- * are used. It is possible to disable or limit the use of threads in
- * the common pool by setting the parallelism property to zero, and/or
- * using a factory that may return {@code null}. However doing so may
- * cause unjoined tasks to never be executed.
- *
- * <p><b>Implementation notes</b>: This implementation restricts the
- * maximum number of running threads to 32767. Attempts to create
- * pools with greater than the maximum number result in
- * {@code IllegalArgumentException}.
- *
- * <p>This implementation rejects submitted tasks (that is, by throwing
- * {@link RejectedExecutionException}) only when the pool is shut down
- * or internal resources have been exhausted.
- *
- * @since 1.7
- * @author Doug Lea
- */
-@sun.misc.Contended
-public class ForkJoinPool extends AbstractExecutorService {
-
-    /*
-     * Implementation Overview
-     *
-     * This class and its nested classes provide the main
-     * functionality and control for a set of worker threads:
-     * Submissions from non-FJ threads enter into submission queues.
-     * Workers take these tasks and typically split them into subtasks
-     * that may be stolen by other workers.  Preference rules give
-     * first priority to processing tasks from their own queues (LIFO
-     * or FIFO, depending on mode), then to randomized FIFO steals of
-     * tasks in other queues.
-     *
-     * WorkQueues
-     * ==========
-     *
-     * Most operations occur within work-stealing queues (in nested
-     * class WorkQueue).  These are special forms of Deques that
-     * support only three of the four possible end-operations -- push,
-     * pop, and poll (aka steal), under the further constraints that
-     * push and pop are called only from the owning thread (or, as
-     * extended here, under a lock), while poll may be called from
-     * other threads.  (If you are unfamiliar with them, you probably
-     * want to read Herlihy and Shavit's book "The Art of
-     * Multiprocessor programming", chapter 16 describing these in
-     * more detail before proceeding.)  The main work-stealing queue
-     * design is roughly similar to those in the papers "Dynamic
-     * Circular Work-Stealing Deque" by Chase and Lev, SPAA 2005
-     * (http://research.sun.com/scalable/pubs/index.html) and
-     * "Idempotent work stealing" by Michael, Saraswat, and Vechev,
-     * PPoPP 2009 (http://portal.acm.org/citation.cfm?id=1504186).
-     * See also "Correct and Efficient Work-Stealing for Weak Memory
-     * Models" by Le, Pop, Cohen, and Nardelli, PPoPP 2013
-     * (http://www.di.ens.fr/~zappa/readings/ppopp13.pdf) for an
-     * analysis of memory ordering (atomic, volatile etc) issues.  The
-     * main differences ultimately stem from GC requirements that we
-     * null out taken slots as soon as we can, to maintain as small a
-     * footprint as possible even in programs generating huge numbers
-     * of tasks. To accomplish this, we shift the CAS arbitrating pop
-     * vs poll (steal) from being on the indices ("base" and "top") to
-     * the slots themselves.  So, both a successful pop and poll
-     * mainly entail a CAS of a slot from non-null to null.  Because
-     * we rely on CASes of references, we do not need tag bits on base
-     * or top.  They are simple ints as used in any circular
-     * array-based queue (see for example ArrayDeque).  Updates to the
-     * indices must still be ordered in a way that guarantees that top
-     * == base means the queue is empty, but otherwise may err on the
-     * side of possibly making the queue appear nonempty when a push,
-     * pop, or poll have not fully committed. Note that this means
-     * that the poll operation, considered individually, is not
-     * wait-free. One thief cannot successfully continue until another
-     * in-progress one (or, if previously empty, a push) completes.
-     * However, in the aggregate, we ensure at least probabilistic
-     * non-blockingness.  If an attempted steal fails, a thief always
-     * chooses a different random victim target to try next. So, in
-     * order for one thief to progress, it suffices for any
-     * in-progress poll or new push on any empty queue to
-     * complete. (This is why we normally use method pollAt and its
-     * variants that try once at the apparent base index, else
-     * consider alternative actions, rather than method poll.)
-     *
-     * This approach also enables support of a user mode in which local
-     * task processing is in FIFO, not LIFO order, simply by using
-     * poll rather than pop.  This can be useful in message-passing
-     * frameworks in which tasks are never joined.  However neither
-     * mode considers affinities, loads, cache localities, etc, so
-     * rarely provide the best possible performance on a given
-     * machine, but portably provide good throughput by averaging over
-     * these factors.  (Further, even if we did try to use such
-     * information, we do not usually have a basis for exploiting it.
-     * For example, some sets of tasks profit from cache affinities,
-     * but others are harmed by cache pollution effects.)
-     *
-     * WorkQueues are also used in a similar way for tasks submitted
-     * to the pool. We cannot mix these tasks in the same queues used
-     * for work-stealing (this would contaminate lifo/fifo
-     * processing). Instead, we randomly associate submission queues
-     * with submitting threads, using a form of hashing.  The
-     * ThreadLocalRandom probe value serves as a hash code for
-     * choosing existing queues, and may be randomly repositioned upon
-     * contention with other submitters.  In essence, submitters act
-     * like workers except that they are restricted to executing local
-     * tasks that they submitted (or in the case of CountedCompleters,
-     * others with the same root task).  However, because most
-     * shared/external queue operations are more expensive than
-     * internal, and because, at steady state, external submitters
-     * will compete for CPU with workers, ForkJoinTask.join and
-     * related methods disable them from repeatedly helping to process
-     * tasks if all workers are active.  Insertion of tasks in shared
-     * mode requires a lock (mainly to protect in the case of
-     * resizing) but we use only a simple spinlock (using bits in
-     * field qlock), because submitters encountering a busy queue move
-     * on to try or create other queues -- they block only when
-     * creating and registering new queues.
-     *
-     * Management
-     * ==========
-     *
-     * The main throughput advantages of work-stealing stem from
-     * decentralized control -- workers mostly take tasks from
-     * themselves or each other. We cannot negate this in the
-     * implementation of other management responsibilities. The main
-     * tactic for avoiding bottlenecks is packing nearly all
-     * essentially atomic control state into two volatile variables
-     * that are by far most often read (not written) as status and
-     * consistency checks.
-     *
-     * Field "ctl" contains 64 bits holding all the information needed
-     * to atomically decide to add, inactivate, enqueue (on an event
-     * queue), dequeue, and/or re-activate workers.  To enable this
-     * packing, we restrict maximum parallelism to (1<<15)-1 (which is
-     * far in excess of normal operating range) to allow ids, counts,
-     * and their negations (used for thresholding) to fit into 16bit
-     * fields.
-     *
-     * Field "plock" is a form of sequence lock with a saturating
-     * shutdown bit (similarly for per-queue "qlocks"), mainly
-     * protecting updates to the workQueues array, as well as to
-     * enable shutdown.  When used as a lock, it is normally only very
-     * briefly held, so is nearly always available after at most a
-     * brief spin, but we use a monitor-based backup strategy to
-     * block when needed.
-     *
-     * Recording WorkQueues.  WorkQueues are recorded in the
-     * "workQueues" array that is created upon first use and expanded
-     * if necessary.  Updates to the array while recording new workers
-     * and unrecording terminated ones are protected from each other
-     * by a lock but the array is otherwise concurrently readable, and
-     * accessed directly.  To simplify index-based operations, the
-     * array size is always a power of two, and all readers must
-     * tolerate null slots. Worker queues are at odd indices. Shared
-     * (submission) queues are at even indices, up to a maximum of 64
-     * slots, to limit growth even if array needs to expand to add
-     * more workers. Grouping them together in this way simplifies and
-     * speeds up task scanning.
-     *
-     * All worker thread creation is on-demand, triggered by task
-     * submissions, replacement of terminated workers, and/or
-     * compensation for blocked workers. However, all other support
-     * code is set up to work with other policies.  To ensure that we
-     * do not hold on to worker references that would prevent GC, ALL
-     * accesses to workQueues are via indices into the workQueues
-     * array (which is one source of some of the messy code
-     * constructions here). In essence, the workQueues array serves as
-     * a weak reference mechanism. Thus for example the wait queue
-     * field of ctl stores indices, not references.  Access to the
-     * workQueues in associated methods (for example signalWork) must
-     * both index-check and null-check the IDs. All such accesses
-     * ignore bad IDs by returning out early from what they are doing,
-     * since this can only be associated with termination, in which
-     * case it is OK to give up.  All uses of the workQueues array
-     * also check that it is non-null (even if previously
-     * non-null). This allows nulling during termination, which is
-     * currently not necessary, but remains an option for
-     * resource-revocation-based shutdown schemes. It also helps
-     * reduce JIT issuance of uncommon-trap code, which tends to
-     * unnecessarily complicate control flow in some methods.
-     *
-     * Event Queuing. Unlike HPC work-stealing frameworks, we cannot
-     * let workers spin indefinitely scanning for tasks when none can
-     * be found immediately, and we cannot start/resume workers unless
-     * there appear to be tasks available.  On the other hand, we must
-     * quickly prod them into action when new tasks are submitted or
-     * generated. In many usages, ramp-up time to activate workers is
-     * the main limiting factor in overall performance (this is
-     * compounded at program start-up by JIT compilation and
-     * allocation). So we try to streamline this as much as possible.
-     * We park/unpark workers after placing in an event wait queue
-     * when they cannot find work. This "queue" is actually a simple
-     * Treiber stack, headed by the "id" field of ctl, plus a 15bit
-     * counter value (that reflects the number of times a worker has
-     * been inactivated) to avoid ABA effects (we need only as many
-     * version numbers as worker threads). Successors are held in
-     * field WorkQueue.nextWait.  Queuing deals with several intrinsic
-     * races, mainly that a task-producing thread can miss seeing (and
-     * signalling) another thread that gave up looking for work but
-     * has not yet entered the wait queue. We solve this by requiring
-     * a full sweep of all workers (via repeated calls to method
-     * scan()) both before and after a newly waiting worker is added
-     * to the wait queue.  Because enqueued workers may actually be
-     * rescanning rather than waiting, we set and clear the "parker"
-     * field of WorkQueues to reduce unnecessary calls to unpark.
-     * (This requires a secondary recheck to avoid missed signals.)
-     * Note the unusual conventions about Thread.interrupts
-     * surrounding parking and other blocking: Because interrupts are
-     * used solely to alert threads to check termination, which is
-     * checked anyway upon blocking, we clear status (using
-     * Thread.interrupted) before any call to park, so that park does
-     * not immediately return due to status being set via some other
-     * unrelated call to interrupt in user code.
-     *
-     * Signalling.  We create or wake up workers only when there
-     * appears to be at least one task they might be able to find and
-     * execute.  When a submission is added or another worker adds a
-     * task to a queue that has fewer than two tasks, they signal
-     * waiting workers (or trigger creation of new ones if fewer than
-     * the given parallelism level -- signalWork).  These primary
-     * signals are buttressed by others whenever other threads remove
-     * a task from a queue and notice that there are other tasks there
-     * as well.  So in general, pools will be over-signalled. On most
-     * platforms, signalling (unpark) overhead time is noticeably
-     * long, and the time between signalling a thread and it actually
-     * making progress can be very noticeably long, so it is worth
-     * offloading these delays from critical paths as much as
-     * possible. Additionally, workers spin-down gradually, by staying
-     * alive so long as they see the ctl state changing.  Similar
-     * stability-sensing techniques are also used before blocking in
-     * awaitJoin and helpComplete.
-     *
-     * Trimming workers. To release resources after periods of lack of
-     * use, a worker starting to wait when the pool is quiescent will
-     * time out and terminate if the pool has remained quiescent for a
-     * given period -- a short period if there are more threads than
-     * parallelism, longer as the number of threads decreases. This
-     * will slowly propagate, eventually terminating all workers after
-     * periods of non-use.
-     *
-     * Shutdown and Termination. A call to shutdownNow atomically sets
-     * a plock bit and then (non-atomically) sets each worker's
-     * qlock status, cancels all unprocessed tasks, and wakes up
-     * all waiting workers.  Detecting whether termination should
-     * commence after a non-abrupt shutdown() call requires more work
-     * and bookkeeping. We need consensus about quiescence (i.e., that
-     * there is no more work). The active count provides a primary
-     * indication but non-abrupt shutdown still requires a rechecking
-     * scan for any workers that are inactive but not queued.
-     *
-     * Joining Tasks
-     * =============
-     *
-     * Any of several actions may be taken when one worker is waiting
-     * to join a task stolen (or always held) by another.  Because we
-     * are multiplexing many tasks on to a pool of workers, we can't
-     * just let them block (as in Thread.join).  We also cannot just
-     * reassign the joiner's run-time stack with another and replace
-     * it later, which would be a form of "continuation", that even if
-     * possible is not necessarily a good idea since we sometimes need
-     * both an unblocked task and its continuation to progress.
-     * Instead we combine two tactics:
-     *
-     *   Helping: Arranging for the joiner to execute some task that it
-     *      would be running if the steal had not occurred.
-     *
-     *   Compensating: Unless there are already enough live threads,
-     *      method tryCompensate() may create or re-activate a spare
-     *      thread to compensate for blocked joiners until they unblock.
-     *
-     * A third form (implemented in tryRemoveAndExec) amounts to
-     * helping a hypothetical compensator: If we can readily tell that
-     * a possible action of a compensator is to steal and execute the
-     * task being joined, the joining thread can do so directly,
-     * without the need for a compensation thread (although at the
-     * expense of larger run-time stacks, but the tradeoff is
-     * typically worthwhile).
-     *
-     * The ManagedBlocker extension API can't use helping so relies
-     * only on compensation in method awaitBlocker.
-     *
-     * The algorithm in tryHelpStealer entails a form of "linear"
-     * helping: Each worker records (in field currentSteal) the most
-     * recent task it stole from some other worker. Plus, it records
-     * (in field currentJoin) the task it is currently actively
-     * joining. Method tryHelpStealer uses these markers to try to
-     * find a worker to help (i.e., steal back a task from and execute
-     * it) that could hasten completion of the actively joined task.
-     * In essence, the joiner executes a task that would be on its own
-     * local deque had the to-be-joined task not been stolen. This may
-     * be seen as a conservative variant of the approach in Wagner &
-     * Calder "Leapfrogging: a portable technique for implementing
-     * efficient futures" SIGPLAN Notices, 1993
-     * (http://portal.acm.org/citation.cfm?id=155354). It differs in
-     * that: (1) We only maintain dependency links across workers upon
-     * steals, rather than use per-task bookkeeping.  This sometimes
-     * requires a linear scan of workQueues array to locate stealers,
-     * but often doesn't because stealers leave hints (that may become
-     * stale/wrong) of where to locate them.  It is only a hint
-     * because a worker might have had multiple steals and the hint
-     * records only one of them (usually the most current).  Hinting
-     * isolates cost to when it is needed, rather than adding to
-     * per-task overhead.  (2) It is "shallow", ignoring nesting and
-     * potentially cyclic mutual steals.  (3) It is intentionally
-     * racy: field currentJoin is updated only while actively joining,
-     * which means that we miss links in the chain during long-lived
-     * tasks, GC stalls etc (which is OK since blocking in such cases
-     * is usually a good idea).  (4) We bound the number of attempts
-     * to find work (see MAX_HELP) and fall back to suspending the
-     * worker and if necessary replacing it with another.
-     *
-     * Helping actions for CountedCompleters are much simpler: Method
-     * helpComplete can take and execute any task with the same root
-     * as the task being waited on. However, this still entails some
-     * traversal of completer chains, so is less efficient than using
-     * CountedCompleters without explicit joins.
-     *
-     * It is impossible to keep exactly the target parallelism number
-     * of threads running at any given time.  Determining the
-     * existence of conservatively safe helping targets, the
-     * availability of already-created spares, and the apparent need
-     * to create new spares are all racy, so we rely on multiple
-     * retries of each.  Compensation in the apparent absence of
-     * helping opportunities is challenging to control on JVMs, where
-     * GC and other activities can stall progress of tasks that in
-     * turn stall out many other dependent tasks, without us being
-     * able to determine whether they will ever require compensation.
-     * Even though work-stealing otherwise encounters little
-     * degradation in the presence of more threads than cores,
-     * aggressively adding new threads in such cases entails risk of
-     * unwanted positive feedback control loops in which more threads
-     * cause more dependent stalls (as well as delayed progress of
-     * unblocked threads to the point that we know they are available)
-     * leading to more situations requiring more threads, and so
-     * on. This aspect of control can be seen as an (analytically
-     * intractable) game with an opponent that may choose the worst
-     * (for us) active thread to stall at any time.  We take several
-     * precautions to bound losses (and thus bound gains), mainly in
-     * methods tryCompensate and awaitJoin.
-     *
-     * Common Pool
-     * ===========
-     *
-     * The static common pool always exists after static
-     * initialization.  Since it (or any other created pool) need
-     * never be used, we minimize initial construction overhead and
-     * footprint to the setup of about a dozen fields, with no nested
-     * allocation. Most bootstrapping occurs within method
-     * fullExternalPush during the first submission to the pool.
-     *
-     * When external threads submit to the common pool, they can
-     * perform subtask processing (see externalHelpJoin and related
-     * methods).  This caller-helps policy makes it sensible to set
-     * common pool parallelism level to one (or more) less than the
-     * total number of available cores, or even zero for pure
-     * caller-runs.  We do not need to record whether external
-     * submissions are to the common pool -- if not, externalHelpJoin
-     * returns quickly (at the most helping to signal some common pool
-     * workers). These submitters would otherwise be blocked waiting
-     * for completion, so the extra effort (with liberally sprinkled
-     * task status checks) in inapplicable cases amounts to an odd
-     * form of limited spin-wait before blocking in ForkJoinTask.join.
-     *
-     * As a more appropriate default in managed environments, unless
-     * overridden by system properties, we use workers of subclass
-     * InnocuousForkJoinWorkerThread when there is a SecurityManager
-     * present. These workers have no permissions set, do not belong
-     * to any user-defined ThreadGroup, and erase all ThreadLocals
-     * after executing any top-level task (see WorkQueue.runTask). The
-     * associated mechanics (mainly in ForkJoinWorkerThread) may be
-     * JVM-dependent and must access particular Thread class fields to
-     * achieve this effect.
-     *
-     * Style notes
-     * ===========
-     *
-     * There is a lot of representation-level coupling among classes
-     * ForkJoinPool, ForkJoinWorkerThread, and ForkJoinTask.  The
-     * fields of WorkQueue maintain data structures managed by
-     * ForkJoinPool, so are directly accessed.  There is little point
-     * trying to reduce this, since any associated future changes in
-     * representations will need to be accompanied by algorithmic
-     * changes anyway. Several methods intrinsically sprawl because
-     * they must accumulate sets of consistent reads of volatiles held
-     * in local variables.  Methods signalWork() and scan() are the
-     * main bottlenecks, so are especially heavily
-     * micro-optimized/mangled.  There are lots of inline assignments
-     * (of form "while ((local = field) != 0)") which are usually the
-     * simplest way to ensure the required read orderings (which are
-     * sometimes critical). This leads to a "C"-like style of listing
-     * declarations of these locals at the heads of methods or blocks.
-     * There are several occurrences of the unusual "do {} while
-     * (!cas...)"  which is the simplest way to force an update of a
-     * CAS'ed variable. There are also other coding oddities (including
-     * several unnecessary-looking hoisted null checks) that help
-     * some methods perform reasonably even when interpreted (not
-     * compiled).
-     *
-     * The order of declarations in this file is:
-     * (1) Static utility functions
-     * (2) Nested (static) classes
-     * (3) Static fields
-     * (4) Fields, along with constants used when unpacking some of them
-     * (5) Internal control methods
-     * (6) Callbacks and other support for ForkJoinTask methods
-     * (7) Exported methods
-     * (8) Static block initializing statics in minimally dependent order
-     */
-
-    // Static utilities
-
-    /**
-     * If there is a security manager, makes sure caller has
-     * permission to modify threads.
-     */
-    private static void checkPermission() {
-        SecurityManager security = System.getSecurityManager();
-        if (security != null)
-            security.checkPermission(modifyThreadPermission);
-    }
-
-    // Nested classes
-
-    /**
-     * Factory for creating new {@link ForkJoinWorkerThread}s.
-     * A {@code ForkJoinWorkerThreadFactory} must be defined and used
-     * for {@code ForkJoinWorkerThread} subclasses that extend base
-     * functionality or initialize threads with different contexts.
-     */
-    public static interface ForkJoinWorkerThreadFactory {
-        /**
-         * Returns a new worker thread operating in the given pool.
-         *
-         * @param pool the pool this thread works in
-         * @return the new worker thread
-         * @throws NullPointerException if the pool is null
-         */
-        public ForkJoinWorkerThread newThread(ForkJoinPool pool);
-    }
-
-    /**
-     * Default ForkJoinWorkerThreadFactory implementation; creates a
-     * new ForkJoinWorkerThread.
-     */
-    static final class DefaultForkJoinWorkerThreadFactory
-        implements ForkJoinWorkerThreadFactory {
-        public final ForkJoinWorkerThread newThread(ForkJoinPool pool) {
-            return new ForkJoinWorkerThread(pool);
-        }
-    }
-
-    /**
-     * Class for artificial tasks that are used to replace the target
-     * of local joins if they are removed from an interior queue slot
-     * in WorkQueue.tryRemoveAndExec. We don't need the proxy to
-     * actually do anything beyond having a unique identity.
-     */
-    static final class EmptyTask extends ForkJoinTask<Void> {
-        private static final long serialVersionUID = -7721805057305804111L;
-        EmptyTask() { status = ForkJoinTask.NORMAL; } // force done
-        public final Void getRawResult() { return null; }
-        public final void setRawResult(Void x) {}
-        public final boolean exec() { return true; }
-    }
-
-    /**
-     * Queues supporting work-stealing as well as external task
-     * submission. See above for main rationale and algorithms.
-     * Implementation relies heavily on "Unsafe" intrinsics
-     * and selective use of "volatile":
-     *
-     * Field "base" is the index (mod array.length) of the least valid
-     * queue slot, which is always the next position to steal (poll)
-     * from if nonempty. Reads and writes require volatile orderings
-     * but not CAS, because updates are only performed after slot
-     * CASes.
-     *
-     * Field "top" is the index (mod array.length) of the next queue
-     * slot to push to or pop from. It is written only by owner thread
-     * for push, or under lock for external/shared push, and accessed
-     * by other threads only after reading (volatile) base.  Both top
-     * and base are allowed to wrap around on overflow, but (top -
-     * base) (or more commonly -(base - top) to force volatile read of
-     * base before top) still estimates size. The lock ("qlock") is
-     * forced to -1 on termination, causing all further lock attempts
-     * to fail. (Note: we don't need CAS for termination state because
-     * upon pool shutdown, all shared-queues will stop being used
-     * anyway.)  Nearly all lock bodies are set up so that exceptions
-     * within lock bodies are "impossible" (modulo JVM errors that
-     * would cause failure anyway.)
-     *
-     * The array slots are read and written using the emulation of
-     * volatiles/atomics provided by Unsafe. Insertions must in
-     * general use putOrderedObject as a form of releasing store to
-     * ensure that all writes to the task object are ordered before
-     * its publication in the queue.  All removals entail a CAS to
-     * null.  The array is always a power of two. To ensure safety of
-     * Unsafe array operations, all accesses perform explicit null
-     * checks and implicit bounds checks via power-of-two masking.
-     *
-     * In addition to basic queuing support, this class contains
-     * fields described elsewhere to control execution. It turns out
-     * to work better memory-layout-wise to include them in this class
-     * rather than a separate class.
-     *
-     * Performance on most platforms is very sensitive to placement of
-     * instances of both WorkQueues and their arrays -- we absolutely
-     * do not want multiple WorkQueue instances or multiple queue
-     * arrays sharing cache lines. (It would be best for queue objects
-     * and their arrays to share, but there is nothing available to
-     * help arrange that). The @Contended annotation alerts JVMs to
-     * try to keep instances apart.
-     */
-    @sun.misc.Contended
-    static final class WorkQueue {
-        /**
-         * Capacity of work-stealing queue array upon initialization.
-         * Must be a power of two; at least 4, but should be larger to
-         * reduce or eliminate cacheline sharing among queues.
-         * Currently, it is much larger, as a partial workaround for
-         * the fact that JVMs often place arrays in locations that
-         * share GC bookkeeping (especially cardmarks) such that
-         * per-write accesses encounter serious memory contention.
-         */
-        static final int INITIAL_QUEUE_CAPACITY = 1 << 13;
-
-        /**
-         * Maximum size for queue arrays. Must be a power of two less
-         * than or equal to 1 << (31 - width of array entry) to ensure
-         * lack of wraparound of index calculations, but defined to a
-         * value a bit less than this to help users trap runaway
-         * programs before saturating systems.
-         */
-        static final int MAXIMUM_QUEUE_CAPACITY = 1 << 26; // 64M
-
-        volatile int eventCount;   // encoded inactivation count; < 0 if inactive
-        int nextWait;              // encoded record of next event waiter
-        int nsteals;               // number of steals
-        int hint;                  // steal index hint
-        short poolIndex;           // index of this queue in pool
-        final short mode;          // 0: lifo, > 0: fifo, < 0: shared
-        volatile int qlock;        // 1: locked, -1: terminate; else 0
-        volatile int base;         // index of next slot for poll
-        int top;                   // index of next slot for push
-        ForkJoinTask<?>[] array;   // the elements (initially unallocated)
-        final ForkJoinPool pool;   // the containing pool (may be null)
-        final ForkJoinWorkerThread owner; // owning thread or null if shared
-        volatile Thread parker;    // == owner during call to park; else null
-        volatile ForkJoinTask<?> currentJoin;  // task being joined in awaitJoin
-        ForkJoinTask<?> currentSteal; // current non-local task being executed
-
-        WorkQueue(ForkJoinPool pool, ForkJoinWorkerThread owner, int mode,
-                  int seed) {
-            this.pool = pool;
-            this.owner = owner;
-            this.mode = (short)mode;
-            this.hint = seed; // store initial seed for runWorker
-            // Place indices in the center of array (that is not yet allocated)
-            base = top = INITIAL_QUEUE_CAPACITY >>> 1;
-        }
-
-        /**
-         * Returns the approximate number of tasks in the queue.
-         */
-        final int queueSize() {
-            int n = base - top;       // non-owner callers must read base first
-            return (n >= 0) ? 0 : -n; // ignore transient negative
-        }
-
-        /**
-         * Provides a more accurate estimate of whether this queue has
-         * any tasks than does queueSize, by checking whether a
-         * near-empty queue has at least one unclaimed task.
-         */
-        final boolean isEmpty() {
-            ForkJoinTask<?>[] a; int m, s;
-            int n = base - (s = top);
-            return (n >= 0 ||
-                    (n == -1 &&
-                     ((a = array) == null ||
-                      (m = a.length - 1) < 0 ||
-                      U.getObject
-                      (a, (long)((m & (s - 1)) << ASHIFT) + ABASE) == null)));
-        }
-
-        /**
-         * Pushes a task. Call only by owner in unshared queues.  (The
-         * shared-queue version is embedded in method externalPush.)
-         *
-         * @param task the task. Caller must ensure non-null.
-         * @throws RejectedExecutionException if array cannot be resized
-         */
-        final void push(ForkJoinTask<?> task) {
-            ForkJoinTask<?>[] a; ForkJoinPool p;
-            int s = top, n;
-            if ((a = array) != null) {    // ignore if queue removed
-                int m = a.length - 1;
-                U.putOrderedObject(a, ((m & s) << ASHIFT) + ABASE, task);
-                if ((n = (top = s + 1) - base) <= 2)
-                    (p = pool).signalWork(p.workQueues, this);
-                else if (n >= m)
-                    growArray();
-            }
-        }
-
-        /**
-         * Initializes or doubles the capacity of array. Call either
-         * by owner or with lock held -- it is OK for base, but not
-         * top, to move while resizings are in progress.
-         */
-        final ForkJoinTask<?>[] growArray() {
-            ForkJoinTask<?>[] oldA = array;
-            int size = oldA != null ? oldA.length << 1 : INITIAL_QUEUE_CAPACITY;
-            if (size > MAXIMUM_QUEUE_CAPACITY)
-                throw new RejectedExecutionException("Queue capacity exceeded");
-            int oldMask, t, b;
-            ForkJoinTask<?>[] a = array = new ForkJoinTask<?>[size];
-            if (oldA != null && (oldMask = oldA.length - 1) >= 0 &&
-                (t = top) - (b = base) > 0) {
-                int mask = size - 1;
-                do {
-                    ForkJoinTask<?> x;
-                    int oldj = ((b & oldMask) << ASHIFT) + ABASE;
-                    int j    = ((b &    mask) << ASHIFT) + ABASE;
-                    x = (ForkJoinTask<?>)U.getObjectVolatile(oldA, oldj);
-                    if (x != null &&
-                        U.compareAndSwapObject(oldA, oldj, x, null))
-                        U.putObjectVolatile(a, j, x);
-                } while (++b != t);
-            }
-            return a;
-        }
-
-        /**
-         * Takes next task, if one exists, in LIFO order.  Call only
-         * by owner in unshared queues.
-         */
-        final ForkJoinTask<?> pop() {
-            ForkJoinTask<?>[] a; ForkJoinTask<?> t; int m;
-            if ((a = array) != null && (m = a.length - 1) >= 0) {
-                for (int s; (s = top - 1) - base >= 0;) {
-                    long j = ((m & s) << ASHIFT) + ABASE;
-                    if ((t = (ForkJoinTask<?>)U.getObject(a, j)) == null)
-                        break;
-                    if (U.compareAndSwapObject(a, j, t, null)) {
-                        top = s;
-                        return t;
-                    }
-                }
-            }
-            return null;
-        }
-
-        /**
-         * Takes a task in FIFO order if b is base of queue and a task
-         * can be claimed without contention. Specialized versions
-         * appear in ForkJoinPool methods scan and tryHelpStealer.
-         */
-        final ForkJoinTask<?> pollAt(int b) {
-            ForkJoinTask<?> t; ForkJoinTask<?>[] a;
-            if ((a = array) != null) {
-                int j = (((a.length - 1) & b) << ASHIFT) + ABASE;
-                if ((t = (ForkJoinTask<?>)U.getObjectVolatile(a, j)) != null &&
-                    base == b && U.compareAndSwapObject(a, j, t, null)) {
-                    base = b + 1;
-                    return t;
-                }
-            }
-            return null;
-        }
-
-        /**
-         * Takes next task, if one exists, in FIFO order.
-         */
-        final ForkJoinTask<?> poll() {
-            ForkJoinTask<?>[] a; int b; ForkJoinTask<?> t;
-            while ((b = base) - top < 0 && (a = array) != null) {
-                int j = (((a.length - 1) & b) << ASHIFT) + ABASE;
-                t = (ForkJoinTask<?>)U.getObjectVolatile(a, j);
-                if (t != null) {
-                    if (U.compareAndSwapObject(a, j, t, null)) {
-                        base = b + 1;
-                        return t;
-                    }
-                }
-                else if (base == b) {
-                    if (b + 1 == top)
-                        break;
-                    Thread.yield(); // wait for lagging update (very rare)
-                }
-            }
-            return null;
-        }
-
-        /**
-         * Takes next task, if one exists, in order specified by mode.
-         */
-        final ForkJoinTask<?> nextLocalTask() {
-            return mode == 0 ? pop() : poll();
-        }
-
-        /**
-         * Returns next task, if one exists, in order specified by mode.
-         */
-        final ForkJoinTask<?> peek() {
-            ForkJoinTask<?>[] a = array; int m;
-            if (a == null || (m = a.length - 1) < 0)
-                return null;
-            int i = mode == 0 ? top - 1 : base;
-            int j = ((i & m) << ASHIFT) + ABASE;
-            return (ForkJoinTask<?>)U.getObjectVolatile(a, j);
-        }
-
-        /**
-         * Pops the given task only if it is at the current top.
-         * (A shared version is available only via FJP.tryExternalUnpush)
-         */
-        final boolean tryUnpush(ForkJoinTask<?> t) {
-            ForkJoinTask<?>[] a; int s;
-            if ((a = array) != null && (s = top) != base &&
-                U.compareAndSwapObject
-                (a, (((a.length - 1) & --s) << ASHIFT) + ABASE, t, null)) {
-                top = s;
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Removes and cancels all known tasks, ignoring any exceptions.
-         */
-        final void cancelAll() {
-            ForkJoinTask.cancelIgnoringExceptions(currentJoin);
-            ForkJoinTask.cancelIgnoringExceptions(currentSteal);
-            for (ForkJoinTask<?> t; (t = poll()) != null; )
-                ForkJoinTask.cancelIgnoringExceptions(t);
-        }
-
-        // Specialized execution methods
-
-        /**
-         * Polls and runs tasks until empty.
-         */
-        final void pollAndExecAll() {
-            for (ForkJoinTask<?> t; (t = poll()) != null;)
-                t.doExec();
-        }
-
-        /**
-         * Executes a top-level task and any local tasks remaining
-         * after execution.
-         */
-        final void runTask(ForkJoinTask<?> task) {
-            if ((currentSteal = task) != null) {
-                ForkJoinWorkerThread thread;
-                task.doExec();
-                ForkJoinTask<?>[] a = array;
-                int md = mode;
-                ++nsteals;
-                currentSteal = null;
-                if (md != 0)
-                    pollAndExecAll();
-                else if (a != null) {
-                    int s, m = a.length - 1;
-                    ForkJoinTask<?> t;
-                    while ((s = top - 1) - base >= 0 &&
-                           (t = (ForkJoinTask<?>)U.getAndSetObject
-                            (a, ((m & s) << ASHIFT) + ABASE, null)) != null) {
-                        top = s;
-                        t.doExec();
-                    }
-                }
-                if ((thread = owner) != null) // no need to do in finally clause
-                    thread.afterTopLevelExec();
-            }
-        }
-
-        /**
-         * If present, removes from queue and executes the given task,
-         * or any other cancelled task. Returns (true) on any CAS
-         * or consistency check failure so caller can retry.
-         *
-         * @return false if no progress can be made, else true
-         */
-        final boolean tryRemoveAndExec(ForkJoinTask<?> task) {
-            boolean stat;
-            ForkJoinTask<?>[] a; int m, s, b, n;
-            if (task != null && (a = array) != null && (m = a.length - 1) >= 0 &&
-                (n = (s = top) - (b = base)) > 0) {
-                boolean removed = false, empty = true;
-                stat = true;
-                for (ForkJoinTask<?> t;;) {           // traverse from s to b
-                    long j = ((--s & m) << ASHIFT) + ABASE;
-                    t = (ForkJoinTask<?>)U.getObject(a, j);
-                    if (t == null)                    // inconsistent length
-                        break;
-                    else if (t == task) {
-                        if (s + 1 == top) {           // pop
-                            if (!U.compareAndSwapObject(a, j, task, null))
-                                break;
-                            top = s;
-                            removed = true;
-                        }
-                        else if (base == b)           // replace with proxy
-                            removed = U.compareAndSwapObject(a, j, task,
-                                                             new EmptyTask());
-                        break;
-                    }
-                    else if (t.status >= 0)
-                        empty = false;
-                    else if (s + 1 == top) {          // pop and throw away
-                        if (U.compareAndSwapObject(a, j, t, null))
-                            top = s;
-                        break;
-                    }
-                    if (--n == 0) {
-                        if (!empty && base == b)
-                            stat = false;
-                        break;
-                    }
-                }
-                if (removed)
-                    task.doExec();
-            }
-            else
-                stat = false;
-            return stat;
-        }
-
-        /**
-         * Tries to poll for and execute the given task or any other
-         * task in its CountedCompleter computation.
-         */
-        final boolean pollAndExecCC(CountedCompleter<?> root) {
-            ForkJoinTask<?>[] a; int b; Object o; CountedCompleter<?> t, r;
-            if ((b = base) - top < 0 && (a = array) != null) {
-                long j = (((a.length - 1) & b) << ASHIFT) + ABASE;
-                if ((o = U.getObjectVolatile(a, j)) == null)
-                    return true; // retry
-                if (o instanceof CountedCompleter) {
-                    for (t = (CountedCompleter<?>)o, r = t;;) {
-                        if (r == root) {
-                            if (base == b &&
-                                U.compareAndSwapObject(a, j, t, null)) {
-                                base = b + 1;
-                                t.doExec();
-                            }
-                            return true;
-                        }
-                        else if ((r = r.completer) == null)
-                            break; // not part of root computation
-                    }
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Tries to pop and execute the given task or any other task
-         * in its CountedCompleter computation.
-         */
-        final boolean externalPopAndExecCC(CountedCompleter<?> root) {
-            ForkJoinTask<?>[] a; int s; Object o; CountedCompleter<?> t, r;
-            if (base - (s = top) < 0 && (a = array) != null) {
-                long j = (((a.length - 1) & (s - 1)) << ASHIFT) + ABASE;
-                if ((o = U.getObject(a, j)) instanceof CountedCompleter) {
-                    for (t = (CountedCompleter<?>)o, r = t;;) {
-                        if (r == root) {
-                            if (compareAndSwapIntQlock(0, 1)) {
-                                if (top == s && array == a &&
-                                    U.compareAndSwapObject(a, j, t, null)) {
-                                    top = s - 1;
-                                    qlock = 0;
-                                    t.doExec();
-                                }
-                                else
-                                    qlock = 0;
-                            }
-                            return true;
-                        }
-                        else if ((r = r.completer) == null)
-                            break;
-                    }
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Internal version
-         */
-        final boolean internalPopAndExecCC(CountedCompleter<?> root) {
-            ForkJoinTask<?>[] a; int s; Object o; CountedCompleter<?> t, r;
-            if (base - (s = top) < 0 && (a = array) != null) {
-                long j = (((a.length - 1) & (s - 1)) << ASHIFT) + ABASE;
-                if ((o = U.getObject(a, j)) instanceof CountedCompleter) {
-                    for (t = (CountedCompleter<?>)o, r = t;;) {
-                        if (r == root) {
-                            if (U.compareAndSwapObject(a, j, t, null)) {
-                                top = s - 1;
-                                t.doExec();
-                            }
-                            return true;
-                        }
-                        else if ((r = r.completer) == null)
-                            break;
-                    }
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Returns true if owned and not known to be blocked.
-         */
-        final boolean isApparentlyUnblocked() {
-            Thread wt; Thread.State s;
-            return (eventCount >= 0 &&
-                    (wt = owner) != null &&
-                    (s = wt.getState()) != Thread.State.BLOCKED &&
-                    s != Thread.State.WAITING &&
-                    s != Thread.State.TIMED_WAITING);
-        }
-
-        @ikvm.internal.InterlockedCompareAndSet("qlock")
-        final native boolean compareAndSwapIntQlock(int expect, int update);
-
-        // Unsafe mechanics
-        private static final sun.misc.Unsafe U;
-        private static final int ABASE;
-        private static final int ASHIFT;
-        static {
-            try {
-                U = sun.misc.Unsafe.getUnsafe();
-                Class<?> ak = ForkJoinTask[].class;
-                ABASE = U.arrayBaseOffset(ak);
-                int scale = U.arrayIndexScale(ak);
-                if ((scale & (scale - 1)) != 0)
-                    throw new Error("data type scale not a power of two");
-                ASHIFT = 31 - Integer.numberOfLeadingZeros(scale);
-            } catch (Exception e) {
-                throw new Error(e);
-            }
-        }
-    }
-
-    // static fields (initialized in static initializer below)
-
-    /**
-     * Creates a new ForkJoinWorkerThread. This factory is used unless
-     * overridden in ForkJoinPool constructors.
-     */
-    public static final ForkJoinWorkerThreadFactory
-        defaultForkJoinWorkerThreadFactory;
-
-    /**
-     * Permission required for callers of methods that may start or
-     * kill threads.
-     */
-    private static final RuntimePermission modifyThreadPermission;
-
-    /**
-     * Common (static) pool. Non-null for public use unless a static
-     * construction exception, but internal usages null-check on use
-     * to paranoically avoid potential initialization circularities
-     * as well as to simplify generated code.
-     */
-    static final ForkJoinPool common;
-
-    /**
-     * Common pool parallelism. To allow simpler use and management
-     * when common pool threads are disabled, we allow the underlying
-     * common.parallelism field to be zero, but in that case still report
-     * parallelism as 1 to reflect resulting caller-runs mechanics.
-     */
-    static final int commonParallelism;
-
-    /**
-     * Sequence number for creating workerNamePrefix.
-     */
-    private static int poolNumberSequence;
-
-    /**
-     * Returns the next sequence number. We don't expect this to
-     * ever contend, so use simple builtin sync.
-     */
-    private static final synchronized int nextPoolId() {
-        return ++poolNumberSequence;
-    }
-
-    // static constants
-
-    /**
-     * Initial timeout value (in nanoseconds) for the thread
-     * triggering quiescence to park waiting for new work. On timeout,
-     * the thread will instead try to shrink the number of
-     * workers. The value should be large enough to avoid overly
-     * aggressive shrinkage during most transient stalls (long GCs
-     * etc).
-     */
-    private static final long IDLE_TIMEOUT      = 2000L * 1000L * 1000L; // 2sec
-
-    /**
-     * Timeout value when there are more threads than parallelism level
-     */
-    private static final long FAST_IDLE_TIMEOUT =  200L * 1000L * 1000L;
-
-    /**
-     * Tolerance for idle timeouts, to cope with timer undershoots
-     */
-    private static final long TIMEOUT_SLOP = 2000000L;
-
-    /**
-     * The maximum stolen->joining link depth allowed in method
-     * tryHelpStealer.  Must be a power of two.  Depths for legitimate
-     * chains are unbounded, but we use a fixed constant to avoid
-     * (otherwise unchecked) cycles and to bound staleness of
-     * traversal parameters at the expense of sometimes blocking when
-     * we could be helping.
-     */
-    private static final int MAX_HELP = 64;
-
-    /**
-     * Increment for seed generators. See class ThreadLocal for
-     * explanation.
-     */
-    private static final int SEED_INCREMENT = 0x9e3779b9;
-
-    /*
-     * Bits and masks for control variables
-     *
-     * Field ctl is a long packed with:
-     * AC: Number of active running workers minus target parallelism (16 bits)
-     * TC: Number of total workers minus target parallelism (16 bits)
-     * ST: true if pool is terminating (1 bit)
-     * EC: the wait count of top waiting thread (15 bits)
-     * ID: poolIndex of top of Treiber stack of waiters (16 bits)
-     *
-     * When convenient, we can extract the upper 32 bits of counts and
-     * the lower 32 bits of queue state, u = (int)(ctl >>> 32) and e =
-     * (int)ctl.  The ec field is never accessed alone, but always
-     * together with id and st. The offsets of counts by the target
-     * parallelism and the positionings of fields makes it possible to
-     * perform the most common checks via sign tests of fields: When
-     * ac is negative, there are not enough active workers, when tc is
-     * negative, there are not enough total workers, and when e is
-     * negative, the pool is terminating.  To deal with these possibly
-     * negative fields, we use casts in and out of "short" and/or
-     * signed shifts to maintain signedness.
-     *
-     * When a thread is queued (inactivated), its eventCount field is
-     * set negative, which is the only way to tell if a worker is
-     * prevented from executing tasks, even though it must continue to
-     * scan for them to avoid queuing races. Note however that
-     * eventCount updates lag releases so usage requires care.
-     *
-     * Field plock is an int packed with:
-     * SHUTDOWN: true if shutdown is enabled (1 bit)
-     * SEQ:  a sequence lock, with PL_LOCK bit set if locked (30 bits)
-     * SIGNAL: set when threads may be waiting on the lock (1 bit)
-     *
-     * The sequence number enables simple consistency checks:
-     * Staleness of read-only operations on the workQueues array can
-     * be checked by comparing plock before vs after the reads.
-     */
-
-    // bit positions/shifts for fields
-    private static final int  AC_SHIFT   = 48;
-    private static final int  TC_SHIFT   = 32;
-    private static final int  ST_SHIFT   = 31;
-    private static final int  EC_SHIFT   = 16;
-
-    // bounds
-    private static final int  SMASK      = 0xffff;  // short bits
-    private static final int  MAX_CAP    = 0x7fff;  // max #workers - 1
-    private static final int  EVENMASK   = 0xfffe;  // even short bits
-    private static final int  SQMASK     = 0x007e;  // max 64 (even) slots
-    private static final int  SHORT_SIGN = 1 << 15;
-    private static final int  INT_SIGN   = 1 << 31;
-
-    // masks
-    private static final long STOP_BIT   = 0x0001L << ST_SHIFT;
-    private static final long AC_MASK    = ((long)SMASK) << AC_SHIFT;
-    private static final long TC_MASK    = ((long)SMASK) << TC_SHIFT;
-
-    // units for incrementing and decrementing
-    private static final long TC_UNIT    = 1L << TC_SHIFT;
-    private static final long AC_UNIT    = 1L << AC_SHIFT;
-
-    // masks and units for dealing with u = (int)(ctl >>> 32)
-    private static final int  UAC_SHIFT  = AC_SHIFT - 32;
-    private static final int  UTC_SHIFT  = TC_SHIFT - 32;
-    private static final int  UAC_MASK   = SMASK << UAC_SHIFT;
-    private static final int  UTC_MASK   = SMASK << UTC_SHIFT;
-    private static final int  UAC_UNIT   = 1 << UAC_SHIFT;
-    private static final int  UTC_UNIT   = 1 << UTC_SHIFT;
-
-    // masks and units for dealing with e = (int)ctl
-    private static final int E_MASK      = 0x7fffffff; // no STOP_BIT
-    private static final int E_SEQ       = 1 << EC_SHIFT;
-
-    // plock bits
-    private static final int SHUTDOWN    = 1 << 31;
-    private static final int PL_LOCK     = 2;
-    private static final int PL_SIGNAL   = 1;
-    private static final int PL_SPINS    = 1 << 8;
-
-    // access mode for WorkQueue
-    static final int LIFO_QUEUE          =  0;
-    static final int FIFO_QUEUE          =  1;
-    static final int SHARED_QUEUE        = -1;
-
-    // Instance fields
-    volatile long stealCount;                  // collects worker counts
-    volatile long ctl;                         // main pool control
-    volatile int plock;                        // shutdown status and seqLock
-    volatile int indexSeed;                    // worker/submitter index seed
-    final short parallelism;                   // parallelism level
-    final short mode;                          // LIFO/FIFO
-    WorkQueue[] workQueues;                    // main registry
-    final ForkJoinWorkerThreadFactory factory;
-    final UncaughtExceptionHandler ueh;        // per-worker UEH
-    final String workerNamePrefix;             // to create worker name string
-
-    /**
-     * Acquires the plock lock to protect worker array and related
-     * updates. This method is called only if an initial CAS on plock
-     * fails. This acts as a spinlock for normal cases, but falls back
-     * to builtin monitor to block when (rarely) needed. This would be
-     * a terrible idea for a highly contended lock, but works fine as
-     * a more conservative alternative to a pure spinlock.
-     */
-    private int acquirePlock() {
-        int spins = PL_SPINS, ps, nps;
-        for (;;) {
-            if (((ps = plock) & PL_LOCK) == 0 &&
-                compareAndSwapIntPlock(ps, nps = ps + PL_LOCK))
-                return nps;
-            else if (spins >= 0) {
-                if (ThreadLocalRandom.nextSecondarySeed() >= 0)
-                    --spins;
-            }
-            else if (compareAndSwapIntPlock(ps, ps | PL_SIGNAL)) {
-                synchronized (this) {
-                    if ((plock & PL_SIGNAL) != 0) {
-                        try {
-                            wait();
-                        } catch (InterruptedException ie) {
-                            try {
-                                Thread.currentThread().interrupt();
-                            } catch (SecurityException ignore) {
-                            }
-                        }
-                    }
-                    else
-                        notifyAll();
-                }
-            }
-        }
-    }
-
-    /**
-     * Unlocks and signals any thread waiting for plock. Called only
-     * when CAS of seq value for unlock fails.
-     */
-    private void releasePlock(int ps) {
-        plock = ps;
-        synchronized (this) { notifyAll(); }
-    }
-
-    /**
-     * Tries to create and start one worker if fewer than target
-     * parallelism level exist. Adjusts counts etc on failure.
-     */
-    private void tryAddWorker() {
-        long c; int u, e;
-        while ((u = (int)((c = ctl) >>> 32)) < 0 &&
-               (u & SHORT_SIGN) != 0 && (e = (int)c) >= 0) {
-            long nc = ((long)(((u + UTC_UNIT) & UTC_MASK) |
-                              ((u + UAC_UNIT) & UAC_MASK)) << 32) | (long)e;
-            if (compareAndSwapLongCtl(c, nc)) {
-                ForkJoinWorkerThreadFactory fac;
-                Throwable ex = null;
-                ForkJoinWorkerThread wt = null;
-                try {
-                    if ((fac = factory) != null &&
-                        (wt = fac.newThread(this)) != null) {
-                        wt.start();
-                        break;
-                    }
-                } catch (Throwable rex) {
-                    ex = rex;
-                }
-                deregisterWorker(wt, ex);
-                break;
-            }
-        }
-    }
-
-    //  Registering and deregistering workers
-
-    /**
-     * Callback from ForkJoinWorkerThread to establish and record its
-     * WorkQueue. To avoid scanning bias due to packing entries in
-     * front of the workQueues array, we treat the array as a simple
-     * power-of-two hash table using per-thread seed as hash,
-     * expanding as needed.
-     *
-     * @param wt the worker thread
-     * @return the worker's queue
-     */
-    final WorkQueue registerWorker(ForkJoinWorkerThread wt) {
-        UncaughtExceptionHandler handler; WorkQueue[] ws; int s, ps;
-        wt.setDaemon(true);
-        if ((handler = ueh) != null)
-            wt.setUncaughtExceptionHandler(handler);
-        do {} while (!compareAndSwapIntIndexSeed(s = indexSeed,
-                                          s += SEED_INCREMENT) ||
-                     s == 0); // skip 0
-        WorkQueue w = new WorkQueue(this, wt, mode, s);
-        if (((ps = plock) & PL_LOCK) != 0 ||
-            !compareAndSwapIntPlock(ps, ps += PL_LOCK))
-            ps = acquirePlock();
-        int nps = (ps & SHUTDOWN) | ((ps + PL_LOCK) & ~SHUTDOWN);
-        try {
-            if ((ws = workQueues) != null) {    // skip if shutting down
-                int n = ws.length, m = n - 1;
-                int r = (s << 1) | 1;           // use odd-numbered indices
-                if (ws[r &= m] != null) {       // collision
-                    int probes = 0;             // step by approx half size
-                    int step = (n <= 4) ? 2 : ((n >>> 1) & EVENMASK) + 2;
-                    while (ws[r = (r + step) & m] != null) {
-                        if (++probes >= n) {
-                            workQueues = ws = Arrays.copyOf(ws, n <<= 1);
-                            m = n - 1;
-                            probes = 0;
-                        }
-                    }
-                }
-                w.poolIndex = (short)r;
-                w.eventCount = r; // volatile write orders
-                ws[r] = w;
-            }
-        } finally {
-            if (!compareAndSwapIntPlock(ps, nps))
-                releasePlock(nps);
-        }
-        wt.setName(workerNamePrefix.concat(Integer.toString(w.poolIndex >>> 1)));
-        return w;
-    }
-
-    /**
-     * Final callback from terminating worker, as well as upon failure
-     * to construct or start a worker.  Removes record of worker from
-     * array, and adjusts counts. If pool is shutting down, tries to
-     * complete termination.
-     *
-     * @param wt the worker thread, or null if construction failed
-     * @param ex the exception causing failure, or null if none
-     */
-    final void deregisterWorker(ForkJoinWorkerThread wt, Throwable ex) {
-        WorkQueue w = null;
-        if (wt != null && (w = wt.workQueue) != null) {
-            int ps;
-            w.qlock = -1;                // ensure set
-            getAndAddLongStealCount(w.nsteals); // collect steals
-            if (((ps = plock) & PL_LOCK) != 0 ||
-                !compareAndSwapIntPlock(ps, ps += PL_LOCK))
-                ps = acquirePlock();
-            int nps = (ps & SHUTDOWN) | ((ps + PL_LOCK) & ~SHUTDOWN);
-            try {
-                int idx = w.poolIndex;
-                WorkQueue[] ws = workQueues;
-                if (ws != null && idx >= 0 && idx < ws.length && ws[idx] == w)
-                    ws[idx] = null;
-            } finally {
-                if (!compareAndSwapIntPlock(ps, nps))
-                    releasePlock(nps);
-            }
-        }
-
-        long c;                          // adjust ctl counts
-        do {} while (!compareAndSwapLongCtl
-                     (c = ctl, (((c - AC_UNIT) & AC_MASK) |
-                                           ((c - TC_UNIT) & TC_MASK) |
-                                           (c & ~(AC_MASK|TC_MASK)))));
-
-        if (!tryTerminate(false, false) && w != null && w.array != null) {
-            w.cancelAll();               // cancel remaining tasks
-            WorkQueue[] ws; WorkQueue v; Thread p; int u, i, e;
-            while ((u = (int)((c = ctl) >>> 32)) < 0 && (e = (int)c) >= 0) {
-                if (e > 0) {             // activate or create replacement
-                    if ((ws = workQueues) == null ||
-                        (i = e & SMASK) >= ws.length ||
-                        (v = ws[i]) == null)
-                        break;
-                    long nc = (((long)(v.nextWait & E_MASK)) |
-                               ((long)(u + UAC_UNIT) << 32));
-                    if (v.eventCount != (e | INT_SIGN))
-                        break;
-                    if (compareAndSwapLongCtl(c, nc)) {
-                        v.eventCount = (e + E_SEQ) & E_MASK;
-                        if ((p = v.parker) != null)
-                            U.unpark(p);
-                        break;
-                    }
-                }
-                else {
-                    if ((short)u < 0)
-                        tryAddWorker();
-                    break;
-                }
-            }
-        }
-        if (ex == null)                     // help clean refs on way out
-            ForkJoinTask.helpExpungeStaleExceptions();
-        else                                // rethrow
-            ForkJoinTask.rethrow(ex);
-    }
-
-    // Submissions
-
-    /**
-     * Unless shutting down, adds the given task to a submission queue
-     * at submitter's current queue index (modulo submission
-     * range). Only the most common path is directly handled in this
-     * method. All others are relayed to fullExternalPush.
-     *
-     * @param task the task. Caller must ensure non-null.
-     */
-    final void externalPush(ForkJoinTask<?> task) {
-        WorkQueue q; int m, s, n, am; ForkJoinTask<?>[] a;
-        int r = ThreadLocalRandom.getProbe();
-        int ps = plock;
-        WorkQueue[] ws = workQueues;
-        if (ps > 0 && ws != null && (m = (ws.length - 1)) >= 0 &&
-            (q = ws[m & r & SQMASK]) != null && r != 0 &&
-            q.compareAndSwapIntQlock(0, 1)) { // lock
-            if ((a = q.array) != null &&
-                (am = a.length - 1) > (n = (s = q.top) - q.base)) {
-                int j = ((am & s) << ASHIFT) + ABASE;
-                U.putOrderedObject(a, j, task);
-                q.top = s + 1;                     // push on to deque
-                q.qlock = 0;
-                if (n <= 1)
-                    signalWork(ws, q);
-                return;
-            }
-            q.qlock = 0;
-        }
-        fullExternalPush(task);
-    }
-
-    /**
-     * Full version of externalPush. This method is called, among
-     * other times, upon the first submission of the first task to the
-     * pool, so must perform secondary initialization.  It also
-     * detects first submission by an external thread by looking up
-     * its ThreadLocal, and creates a new shared queue if the one at
-     * index if empty or contended. The plock lock body must be
-     * exception-free (so no try/finally) so we optimistically
-     * allocate new queues outside the lock and throw them away if
-     * (very rarely) not needed.
-     *
-     * Secondary initialization occurs when plock is zero, to create
-     * workQueue array and set plock to a valid value.  This lock body
-     * must also be exception-free. Because the plock seq value can
-     * eventually wrap around zero, this method harmlessly fails to
-     * reinitialize if workQueues exists, while still advancing plock.
-     */
-    private void fullExternalPush(ForkJoinTask<?> task) {
-        int r;
-        if ((r = ThreadLocalRandom.getProbe()) == 0) {
-            ThreadLocalRandom.localInit();
-            r = ThreadLocalRandom.getProbe();
-        }
-        for (;;) {
-            WorkQueue[] ws; WorkQueue q; int ps, m, k;
-            boolean move = false;
-            if ((ps = plock) < 0)
-                throw new RejectedExecutionException();
-            else if (ps == 0 || (ws = workQueues) == null ||
-                     (m = ws.length - 1) < 0) { // initialize workQueues
-                int p = parallelism;            // find power of two table size
-                int n = (p > 1) ? p - 1 : 1;    // ensure at least 2 slots
-                n |= n >>> 1; n |= n >>> 2;  n |= n >>> 4;
-                n |= n >>> 8; n |= n >>> 16; n = (n + 1) << 1;
-                WorkQueue[] nws = ((ws = workQueues) == null || ws.length == 0 ?
-                                   new WorkQueue[n] : null);
-                if (((ps = plock) & PL_LOCK) != 0 ||
-                    !compareAndSwapIntPlock(ps, ps += PL_LOCK))
-                    ps = acquirePlock();
-                if (((ws = workQueues) == null || ws.length == 0) && nws != null)
-                    workQueues = nws;
-                int nps = (ps & SHUTDOWN) | ((ps + PL_LOCK) & ~SHUTDOWN);
-                if (!compareAndSwapIntPlock(ps, nps))
-                    releasePlock(nps);
-            }
-            else if ((q = ws[k = r & m & SQMASK]) != null) {
-                if (q.qlock == 0 && q.compareAndSwapIntQlock(0, 1)) {
-                    ForkJoinTask<?>[] a = q.array;
-                    int s = q.top;
-                    boolean submitted = false;
-                    try {                      // locked version of push
-                        if ((a != null && a.length > s + 1 - q.base) ||
-                            (a = q.growArray()) != null) {   // must presize
-                            int j = (((a.length - 1) & s) << ASHIFT) + ABASE;
-                            U.putOrderedObject(a, j, task);
-                            q.top = s + 1;
-                            submitted = true;
-                        }
-                    } finally {
-                        q.qlock = 0;  // unlock
-                    }
-                    if (submitted) {
-                        signalWork(ws, q);
-                        return;
-                    }
-                }
-                move = true; // move on failure
-            }
-            else if (((ps = plock) & PL_LOCK) == 0) { // create new queue
-                q = new WorkQueue(this, null, SHARED_QUEUE, r);
-                q.poolIndex = (short)k;
-                if (((ps = plock) & PL_LOCK) != 0 ||
-                    !compareAndSwapIntPlock(ps, ps += PL_LOCK))
-                    ps = acquirePlock();
-                if ((ws = workQueues) != null && k < ws.length && ws[k] == null)
-                    ws[k] = q;
-                int nps = (ps & SHUTDOWN) | ((ps + PL_LOCK) & ~SHUTDOWN);
-                if (!compareAndSwapIntPlock(ps, nps))
-                    releasePlock(nps);
-            }
-            else
-                move = true; // move if busy
-            if (move)
-                r = ThreadLocalRandom.advanceProbe(r);
-        }
-    }
-
-    // Maintaining ctl counts
-
-    /**
-     * Increments active count; mainly called upon return from blocking.
-     */
-    final void incrementActiveCount() {
-        long c;
-        do {} while (!compareAndSwapLongCtl
-                     (c = ctl, ((c & ~AC_MASK) |
-                                           ((c & AC_MASK) + AC_UNIT))));
-    }
-
-    /**
-     * Tries to create or activate a worker if too few are active.
-     *
-     * @param ws the worker array to use to find signallees
-     * @param q if non-null, the queue holding tasks to be processed
-     */
-    final void signalWork(WorkQueue[] ws, WorkQueue q) {
-        for (;;) {
-            long c; int e, u, i; WorkQueue w; Thread p;
-            if ((u = (int)((c = ctl) >>> 32)) >= 0)
-                break;
-            if ((e = (int)c) <= 0) {
-                if ((short)u < 0)
-                    tryAddWorker();
-                break;
-            }
-            if (ws == null || ws.length <= (i = e & SMASK) ||
-                (w = ws[i]) == null)
-                break;
-            long nc = (((long)(w.nextWait & E_MASK)) |
-                       ((long)(u + UAC_UNIT)) << 32);
-            int ne = (e + E_SEQ) & E_MASK;
-            if (w.eventCount == (e | INT_SIGN) &&
-                compareAndSwapLongCtl(c, nc)) {
-                w.eventCount = ne;
-                if ((p = w.parker) != null)
-                    U.unpark(p);
-                break;
-            }
-            if (q != null && q.base >= q.top)
-                break;
-        }
-    }
-
-    // Scanning for tasks
-
-    /**
-     * Top-level runloop for workers, called by ForkJoinWorkerThread.run.
-     */
-    final void runWorker(WorkQueue w) {
-        w.growArray(); // allocate queue
-        for (int r = w.hint; scan(w, r) == 0; ) {
-            r ^= r << 13; r ^= r >>> 17; r ^= r << 5; // xorshift
-        }
-    }
-
-    /**
-     * Scans for and, if found, runs one task, else possibly
-     * inactivates the worker. This method operates on single reads of
-     * volatile state and is designed to be re-invoked continuously,
-     * in part because it returns upon detecting inconsistencies,
-     * contention, or state changes that indicate possible success on
-     * re-invocation.
-     *
-     * The scan searches for tasks across queues starting at a random
-     * index, checking each at least twice.  The scan terminates upon
-     * either finding a non-empty queue, or completing the sweep. If
-     * the worker is not inactivated, it takes and runs a task from
-     * this queue. Otherwise, if not activated, it tries to activate
-     * itself or some other worker by signalling. On failure to find a
-     * task, returns (for retry) if pool state may have changed during
-     * an empty scan, or tries to inactivate if active, else possibly
-     * blocks or terminates via method awaitWork.
-     *
-     * @param w the worker (via its WorkQueue)
-     * @param r a random seed
-     * @return worker qlock status if would have waited, else 0
-     */
-    private final int scan(WorkQueue w, int r) {
-        WorkQueue[] ws; int m;
-        long c = ctl;                            // for consistency check
-        if ((ws = workQueues) != null && (m = ws.length - 1) >= 0 && w != null) {
-            for (int j = m + m + 1, ec = w.eventCount;;) {
-                WorkQueue q; int b, e; ForkJoinTask<?>[] a; ForkJoinTask<?> t;
-                if ((q = ws[(r - j) & m]) != null &&
-                    (b = q.base) - q.top < 0 && (a = q.array) != null) {
-                    long i = (((a.length - 1) & b) << ASHIFT) + ABASE;
-                    if ((t = ((ForkJoinTask<?>)
-                              U.getObjectVolatile(a, i))) != null) {
-                        if (ec < 0)
-                            helpRelease(c, ws, w, q, b);
-                        else if (q.base == b &&
-                                 U.compareAndSwapObject(a, i, t, null)) {
-                            q.base = b + 1;
-                            if ((b + 1) - q.top < 0)
-                                signalWork(ws, q);
-                            w.runTask(t);
-                        }
-                    }
-                    break;
-                }
-                else if (--j < 0) {
-                    if ((ec | (e = (int)c)) < 0) // inactive or terminating
-                        return awaitWork(w, c, ec);
-                    else if (ctl == c) {         // try to inactivate and enqueue
-                        long nc = (long)ec | ((c - AC_UNIT) & (AC_MASK|TC_MASK));
-                        w.nextWait = e;
-                        w.eventCount = ec | INT_SIGN;
-                        if (!compareAndSwapLongCtl(c, nc))
-                            w.eventCount = ec;   // back out
-                    }
-                    break;
-                }
-            }
-        }
-        return 0;
-    }
-
-    /**
-     * A continuation of scan(), possibly blocking or terminating
-     * worker w. Returns without blocking if pool state has apparently
-     * changed since last invocation.  Also, if inactivating w has
-     * caused the pool to become quiescent, checks for pool
-     * termination, and, so long as this is not the only worker, waits
-     * for event for up to a given duration.  On timeout, if ctl has
-     * not changed, terminates the worker, which will in turn wake up
-     * another worker to possibly repeat this process.
-     *
-     * @param w the calling worker
-     * @param c the ctl value on entry to scan
-     * @param ec the worker's eventCount on entry to scan
-     */
-    private final int awaitWork(WorkQueue w, long c, int ec) {
-        int stat, ns; long parkTime, deadline;
-        if ((stat = w.qlock) >= 0 && w.eventCount == ec && ctl == c &&
-            !Thread.interrupted()) {
-            int e = (int)c;
-            int u = (int)(c >>> 32);
-            int d = (u >> UAC_SHIFT) + parallelism; // active count
-
-            if (e < 0 || (d <= 0 && tryTerminate(false, false)))
-                stat = w.qlock = -1;          // pool is terminating
-            else if ((ns = w.nsteals) != 0) { // collect steals and retry
-                w.nsteals = 0;
-                getAndAddLongStealCount((long)ns);
-            }
-            else {
-                long pc = ((d > 0 || ec != (e | INT_SIGN)) ? 0L :
-                           ((long)(w.nextWait & E_MASK)) | // ctl to restore
-                           ((long)(u + UAC_UNIT)) << 32);
-                if (pc != 0L) {               // timed wait if last waiter
-                    int dc = -(short)(c >>> TC_SHIFT);
-                    parkTime = (dc < 0 ? FAST_IDLE_TIMEOUT:
-                                (dc + 1) * IDLE_TIMEOUT);
-                    deadline = System.nanoTime() + parkTime - TIMEOUT_SLOP;
-                }
-                else
-                    parkTime = deadline = 0L;
-                if (w.eventCount == ec && ctl == c) {
-                    Thread wt = Thread.currentThread();
-                    wt.parkBlocker = this;
-                    w.parker = wt;            // emulate LockSupport.park
-                    if (w.eventCount == ec && ctl == c)
-                        U.park(false, parkTime);  // must recheck before park
-                    w.parker = null;
-                    wt.parkBlocker = null;
-                    if (parkTime != 0L && ctl == c &&
-                        deadline - System.nanoTime() <= 0L &&
-                        compareAndSwapLongCtl(c, pc))
-                        stat = w.qlock = -1;  // shrink pool
-                }
-            }
-        }
-        return stat;
-    }
-
-    /**
-     * Possibly releases (signals) a worker. Called only from scan()
-     * when a worker with apparently inactive status finds a non-empty
-     * queue. This requires revalidating all of the associated state
-     * from caller.
-     */
-    private final void helpRelease(long c, WorkQueue[] ws, WorkQueue w,
-                                   WorkQueue q, int b) {
-        WorkQueue v; int e, i; Thread p;
-        if (w != null && w.eventCount < 0 && (e = (int)c) > 0 &&
-            ws != null && ws.length > (i = e & SMASK) &&
-            (v = ws[i]) != null && ctl == c) {
-            long nc = (((long)(v.nextWait & E_MASK)) |
-                       ((long)((int)(c >>> 32) + UAC_UNIT)) << 32);
-            int ne = (e + E_SEQ) & E_MASK;
-            if (q != null && q.base == b && w.eventCount < 0 &&
-                v.eventCount == (e | INT_SIGN) &&
-                compareAndSwapLongCtl(c, nc)) {
-                v.eventCount = ne;
-                if ((p = v.parker) != null)
-                    U.unpark(p);
-            }
-        }
-    }
-
-    /**
-     * Tries to locate and execute tasks for a stealer of the given
-     * task, or in turn one of its stealers, Traces currentSteal ->
-     * currentJoin links looking for a thread working on a descendant
-     * of the given task and with a non-empty queue to steal back and
-     * execute tasks from. The first call to this method upon a
-     * waiting join will often entail scanning/search, (which is OK
-     * because the joiner has nothing better to do), but this method
-     * leaves hints in workers to speed up subsequent calls. The
-     * implementation is very branchy to cope with potential
-     * inconsistencies or loops encountering chains that are stale,
-     * unknown, or so long that they are likely cyclic.
-     *
-     * @param joiner the joining worker
-     * @param task the task to join
-     * @return 0 if no progress can be made, negative if task
-     * known complete, else positive
-     */
-    private int tryHelpStealer(WorkQueue joiner, ForkJoinTask<?> task) {
-        int stat = 0, steps = 0;                    // bound to avoid cycles
-        if (task != null && joiner != null &&
-            joiner.base - joiner.top >= 0) {        // hoist checks
-            restart: for (;;) {
-                ForkJoinTask<?> subtask = task;     // current target
-                for (WorkQueue j = joiner, v;;) {   // v is stealer of subtask
-                    WorkQueue[] ws; int m, s, h;
-                    if ((s = task.status) < 0) {
-                        stat = s;
-                        break restart;
-                    }
-                    if ((ws = workQueues) == null || (m = ws.length - 1) <= 0)
-                        break restart;              // shutting down
-                    if ((v = ws[h = (j.hint | 1) & m]) == null ||
-                        v.currentSteal != subtask) {
-                        for (int origin = h;;) {    // find stealer
-                            if (((h = (h + 2) & m) & 15) == 1 &&
-                                (subtask.status < 0 || j.currentJoin != subtask))
-                                continue restart;   // occasional staleness check
-                            if ((v = ws[h]) != null &&
-                                v.currentSteal == subtask) {
-                                j.hint = h;        // save hint
-                                break;
-                            }
-                            if (h == origin)
-                                break restart;      // cannot find stealer
-                        }
-                    }
-                    for (;;) { // help stealer or descend to its stealer
-                        ForkJoinTask<?>[] a; int b;
-                        if (subtask.status < 0)     // surround probes with
-                            continue restart;       //   consistency checks
-                        if ((b = v.base) - v.top < 0 && (a = v.array) != null) {
-                            int i = (((a.length - 1) & b) << ASHIFT) + ABASE;
-                            ForkJoinTask<?> t =
-                                (ForkJoinTask<?>)U.getObjectVolatile(a, i);
-                            if (subtask.status < 0 || j.currentJoin != subtask ||
-                                v.currentSteal != subtask)
-                                continue restart;   // stale
-                            stat = 1;               // apparent progress
-                            if (v.base == b) {
-                                if (t == null)
-                                    break restart;
-                                if (U.compareAndSwapObject(a, i, t, null)) {
-                                    v.base = b + 1;
-                                    ForkJoinTask<?> ps = joiner.currentSteal;
-                                    int jt = joiner.top;
-                                    do {
-                                        joiner.currentSteal = t;
-                                        t.doExec(); // clear local tasks too
-                                    } while (task.status >= 0 &&
-                                             joiner.top != jt &&
-                                             (t = joiner.pop()) != null);
-                                    joiner.currentSteal = ps;
-                                    break restart;
-                                }
-                            }
-                        }
-                        else {                      // empty -- try to descend
-                            ForkJoinTask<?> next = v.currentJoin;
-                            if (subtask.status < 0 || j.currentJoin != subtask ||
-                                v.currentSteal != subtask)
-                                continue restart;   // stale
-                            else if (next == null || ++steps == MAX_HELP)
-                                break restart;      // dead-end or maybe cyclic
-                            else {
-                                subtask = next;
-                                j = v;
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return stat;
-    }
-
-    /**
-     * Analog of tryHelpStealer for CountedCompleters. Tries to steal
-     * and run tasks within the target's computation.
-     *
-     * @param task the task to join
-     * @param maxTasks the maximum number of other tasks to run
-     */
-    final int helpComplete(WorkQueue joiner, CountedCompleter<?> task,
-                           int maxTasks) {
-        WorkQueue[] ws; int m;
-        int s = 0;
-        if ((ws = workQueues) != null && (m = ws.length - 1) >= 0 &&
-            joiner != null && task != null) {
-            int j = joiner.poolIndex;
-            int scans = m + m + 1;
-            long c = 0L;              // for stability check
-            for (int k = scans; ; j += 2) {
-                WorkQueue q;
-                if ((s = task.status) < 0)
-                    break;
-                else if (joiner.internalPopAndExecCC(task)) {
-                    if (--maxTasks <= 0) {
-                        s = task.status;
-                        break;
-                    }
-                    k = scans;
-                }
-                else if ((s = task.status) < 0)
-                    break;
-                else if ((q = ws[j & m]) != null && q.pollAndExecCC(task)) {
-                    if (--maxTasks <= 0) {
-                        s = task.status;
-                        break;
-                    }
-                    k = scans;
-                }
-                else if (--k < 0) {
-                    if (c == (c = ctl))
-                        break;
-                    k = scans;
-                }
-            }
-        }
-        return s;
-    }
-
-    /**
-     * Tries to decrement active count (sometimes implicitly) and
-     * possibly release or create a compensating worker in preparation
-     * for blocking. Fails on contention or termination. Otherwise,
-     * adds a new thread if no idle workers are available and pool
-     * may become starved.
-     *
-     * @param c the assumed ctl value
-     */
-    final boolean tryCompensate(long c) {
-        WorkQueue[] ws = workQueues;
-        int pc = parallelism, e = (int)c, m, tc;
-        if (ws != null && (m = ws.length - 1) >= 0 && e >= 0 && ctl == c) {
-            WorkQueue w = ws[e & m];
-            if (e != 0 && w != null) {
-                Thread p;
-                long nc = ((long)(w.nextWait & E_MASK) |
-                           (c & (AC_MASK|TC_MASK)));
-                int ne = (e + E_SEQ) & E_MASK;
-                if (w.eventCount == (e | INT_SIGN) &&
-                    compareAndSwapLongCtl(c, nc)) {
-                    w.eventCount = ne;
-                    if ((p = w.parker) != null)
-                        U.unpark(p);
-                    return true;   // replace with idle worker
-                }
-            }
-            else if ((tc = (short)(c >>> TC_SHIFT)) >= 0 &&
-                     (int)(c >> AC_SHIFT) + pc > 1) {
-                long nc = ((c - AC_UNIT) & AC_MASK) | (c & ~AC_MASK);
-                if (compareAndSwapLongCtl(c, nc))
-                    return true;   // no compensation
-            }
-            else if (tc + pc < MAX_CAP) {
-                long nc = ((c + TC_UNIT) & TC_MASK) | (c & ~TC_MASK);
-                if (compareAndSwapLongCtl(c, nc)) {
-                    ForkJoinWorkerThreadFactory fac;
-                    Throwable ex = null;
-                    ForkJoinWorkerThread wt = null;
-                    try {
-                        if ((fac = factory) != null &&
-                            (wt = fac.newThread(this)) != null) {
-                            wt.start();
-                            return true;
-                        }
-                    } catch (Throwable rex) {
-                        ex = rex;
-                    }
-                    deregisterWorker(wt, ex); // clean up and return false
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Helps and/or blocks until the given task is done.
-     *
-     * @param joiner the joining worker
-     * @param task the task
-     * @return task status on exit
-     */
-    final int awaitJoin(WorkQueue joiner, ForkJoinTask<?> task) {
-        int s = 0;
-        if (task != null && (s = task.status) >= 0 && joiner != null) {
-            ForkJoinTask<?> prevJoin = joiner.currentJoin;
-            joiner.currentJoin = task;
-            do {} while (joiner.tryRemoveAndExec(task) && // process local tasks
-                         (s = task.status) >= 0);
-            if (s >= 0 && (task instanceof CountedCompleter))
-                s = helpComplete(joiner, (CountedCompleter<?>)task, Integer.MAX_VALUE);
-            long cc = 0;        // for stability checks
-            while (s >= 0 && (s = task.status) >= 0) {
-                if ((s = tryHelpStealer(joiner, task)) == 0 &&
-                    (s = task.status) >= 0) {
-                    if (!tryCompensate(cc))
-                        cc = ctl;
-                    else {
-                        if (task.trySetSignal() && (s = task.status) >= 0) {
-                            synchronized (task) {
-                                if (task.status >= 0) {
-                                    try {                // see ForkJoinTask
-                                        task.wait();     //  for explanation
-                                    } catch (InterruptedException ie) {
-                                    }
-                                }
-                                else
-                                    task.notifyAll();
-                            }
-                        }
-                        long c; // reactivate
-                        do {} while (!compareAndSwapLongCtl
-                                     (c = ctl,
-                                      ((c & ~AC_MASK) |
-                                       ((c & AC_MASK) + AC_UNIT))));
-                    }
-                }
-            }
-            joiner.currentJoin = prevJoin;
-        }
-        return s;
-    }
-
-    /**
-     * Stripped-down variant of awaitJoin used by timed joins. Tries
-     * to help join only while there is continuous progress. (Caller
-     * will then enter a timed wait.)
-     *
-     * @param joiner the joining worker
-     * @param task the task
-     */
-    final void helpJoinOnce(WorkQueue joiner, ForkJoinTask<?> task) {
-        int s;
-        if (joiner != null && task != null && (s = task.status) >= 0) {
-            ForkJoinTask<?> prevJoin = joiner.currentJoin;
-            joiner.currentJoin = task;
-            do {} while (joiner.tryRemoveAndExec(task) && // process local tasks
-                         (s = task.status) >= 0);
-            if (s >= 0) {
-                if (task instanceof CountedCompleter)
-                    helpComplete(joiner, (CountedCompleter<?>)task, Integer.MAX_VALUE);
-                do {} while (task.status >= 0 &&
-                             tryHelpStealer(joiner, task) > 0);
-            }
-            joiner.currentJoin = prevJoin;
-        }
-    }
-
-    /**
-     * Returns a (probably) non-empty steal queue, if one is found
-     * during a scan, else null.  This method must be retried by
-     * caller if, by the time it tries to use the queue, it is empty.
-     */
-    private WorkQueue findNonEmptyStealQueue() {
-        int r = ThreadLocalRandom.nextSecondarySeed();
-        for (;;) {
-            int ps = plock, m; WorkQueue[] ws; WorkQueue q;
-            if ((ws = workQueues) != null && (m = ws.length - 1) >= 0) {
-                for (int j = (m + 1) << 2; j >= 0; --j) {
-                    if ((q = ws[(((r - j) << 1) | 1) & m]) != null &&
-                        q.base - q.top < 0)
-                        return q;
-                }
-            }
-            if (plock == ps)
-                return null;
-        }
-    }
-
-    /**
-     * Runs tasks until {@code isQuiescent()}. We piggyback on
-     * active count ctl maintenance, but rather than blocking
-     * when tasks cannot be found, we rescan until all others cannot
-     * find tasks either.
-     */
-    final void helpQuiescePool(WorkQueue w) {
-        ForkJoinTask<?> ps = w.currentSteal;
-        for (boolean active = true;;) {
-            long c; WorkQueue q; ForkJoinTask<?> t; int b;
-            while ((t = w.nextLocalTask()) != null)
-                t.doExec();
-            if ((q = findNonEmptyStealQueue()) != null) {
-                if (!active) {      // re-establish active count
-                    active = true;
-                    do {} while (!compareAndSwapLongCtl
-                                 (c = ctl,
-                                  ((c & ~AC_MASK) |
-                                   ((c & AC_MASK) + AC_UNIT))));
-                }
-                if ((b = q.base) - q.top < 0 && (t = q.pollAt(b)) != null)
-                    w.runTask(t);
-            }
-            else if (active) {      // decrement active count without queuing
-                long nc = ((c = ctl) & ~AC_MASK) | ((c & AC_MASK) - AC_UNIT);
-                if ((int)(nc >> AC_SHIFT) + parallelism == 0)
-                    break;          // bypass decrement-then-increment
-                if (compareAndSwapLongCtl(c, nc))
-                    active = false;
-            }
-            else if ((int)((c = ctl) >> AC_SHIFT) + parallelism <= 0 &&
-                     compareAndSwapLongCtl
-                     (c, ((c & ~AC_MASK) |
-                                     ((c & AC_MASK) + AC_UNIT))))
-                break;
-        }
-    }
-
-    /**
-     * Gets and removes a local or stolen task for the given worker.
-     *
-     * @return a task, if available
-     */
-    final ForkJoinTask<?> nextTaskFor(WorkQueue w) {
-        for (ForkJoinTask<?> t;;) {
-            WorkQueue q; int b;
-            if ((t = w.nextLocalTask()) != null)
-                return t;
-            if ((q = findNonEmptyStealQueue()) == null)
-                return null;
-            if ((b = q.base) - q.top < 0 && (t = q.pollAt(b)) != null)
-                return t;
-        }
-    }
-
-    /**
-     * Returns a cheap heuristic guide for task partitioning when
-     * programmers, frameworks, tools, or languages have little or no
-     * idea about task granularity.  In essence by offering this
-     * method, we ask users only about tradeoffs in overhead vs
-     * expected throughput and its variance, rather than how finely to
-     * partition tasks.
-     *
-     * In a steady state strict (tree-structured) computation, each
-     * thread makes available for stealing enough tasks for other
-     * threads to remain active. Inductively, if all threads play by
-     * the same rules, each thread should make available only a
-     * constant number of tasks.
-     *
-     * The minimum useful constant is just 1. But using a value of 1
-     * would require immediate replenishment upon each steal to
-     * maintain enough tasks, which is infeasible.  Further,
-     * partitionings/granularities of offered tasks should minimize
-     * steal rates, which in general means that threads nearer the top
-     * of computation tree should generate more than those nearer the
-     * bottom. In perfect steady state, each thread is at
-     * approximately the same level of computation tree. However,
-     * producing extra tasks amortizes the uncertainty of progress and
-     * diffusion assumptions.
-     *
-     * So, users will want to use values larger (but not much larger)
-     * than 1 to both smooth over transient shortages and hedge
-     * against uneven progress; as traded off against the cost of
-     * extra task overhead. We leave the user to pick a threshold
-     * value to compare with the results of this call to guide
-     * decisions, but recommend values such as 3.
-     *
-     * When all threads are active, it is on average OK to estimate
-     * surplus strictly locally. In steady-state, if one thread is
-     * maintaining say 2 surplus tasks, then so are others. So we can
-     * just use estimated queue length.  However, this strategy alone
-     * leads to serious mis-estimates in some non-steady-state
-     * conditions (ramp-up, ramp-down, other stalls). We can detect
-     * many of these by further considering the number of "idle"
-     * threads, that are known to have zero queued tasks, so
-     * compensate by a factor of (#idle/#active) threads.
-     *
-     * Note: The approximation of #busy workers as #active workers is
-     * not very good under current signalling scheme, and should be
-     * improved.
-     */
-    static int getSurplusQueuedTaskCount() {
-        Thread t; ForkJoinWorkerThread wt; ForkJoinPool pool; WorkQueue q;
-        if (((t = Thread.currentThread()) instanceof ForkJoinWorkerThread)) {
-            int p = (pool = (wt = (ForkJoinWorkerThread)t).pool).parallelism;
-            int n = (q = wt.workQueue).top - q.base;
-            int a = (int)(pool.ctl >> AC_SHIFT) + p;
-            return n - (a > (p >>>= 1) ? 0 :
-                        a > (p >>>= 1) ? 1 :
-                        a > (p >>>= 1) ? 2 :
-                        a > (p >>>= 1) ? 4 :
-                        8);
-        }
-        return 0;
-    }
-
-    //  Termination
-
-    /**
-     * Possibly initiates and/or completes termination.  The caller
-     * triggering termination runs three passes through workQueues:
-     * (0) Setting termination status, followed by wakeups of queued
-     * workers; (1) cancelling all tasks; (2) interrupting lagging
-     * threads (likely in external tasks, but possibly also blocked in
-     * joins).  Each pass repeats previous steps because of potential
-     * lagging thread creation.
-     *
-     * @param now if true, unconditionally terminate, else only
-     * if no work and no active workers
-     * @param enable if true, enable shutdown when next possible
-     * @return true if now terminating or terminated
-     */
-    private boolean tryTerminate(boolean now, boolean enable) {
-        int ps;
-        if (this == common)                        // cannot shut down
-            return false;
-        if ((ps = plock) >= 0) {                   // enable by setting plock
-            if (!enable)
-                return false;
-            if ((ps & PL_LOCK) != 0 ||
-                !compareAndSwapIntPlock(ps, ps += PL_LOCK))
-                ps = acquirePlock();
-            int nps = ((ps + PL_LOCK) & ~SHUTDOWN) | SHUTDOWN;
-            if (!compareAndSwapIntPlock(ps, nps))
-                releasePlock(nps);
-        }
-        for (long c;;) {
-            if (((c = ctl) & STOP_BIT) != 0) {     // already terminating
-                if ((short)(c >>> TC_SHIFT) + parallelism <= 0) {
-                    synchronized (this) {
-                        notifyAll();               // signal when 0 workers
-                    }
-                }
-                return true;
-            }
-            if (!now) {                            // check if idle & no tasks
-                WorkQueue[] ws; WorkQueue w;
-                if ((int)(c >> AC_SHIFT) + parallelism > 0)
-                    return false;
-                if ((ws = workQueues) != null) {
-                    for (int i = 0; i < ws.length; ++i) {
-                        if ((w = ws[i]) != null &&
-                            (!w.isEmpty() ||
-                             ((i & 1) != 0 && w.eventCount >= 0))) {
-                            signalWork(ws, w);
-                            return false;
-                        }
-                    }
-                }
-            }
-            if (compareAndSwapLongCtl(c, c | STOP_BIT)) {
-                for (int pass = 0; pass < 3; ++pass) {
-                    WorkQueue[] ws; WorkQueue w; Thread wt;
-                    if ((ws = workQueues) != null) {
-                        int n = ws.length;
-                        for (int i = 0; i < n; ++i) {
-                            if ((w = ws[i]) != null) {
-                                w.qlock = -1;
-                                if (pass > 0) {
-                                    w.cancelAll();
-                                    if (pass > 1 && (wt = w.owner) != null) {
-                                        if (!wt.isInterrupted()) {
-                                            try {
-                                                wt.interrupt();
-                                            } catch (Throwable ignore) {
-                                            }
-                                        }
-                                        U.unpark(wt);
-                                    }
-                                }
-                            }
-                        }
-                        // Wake up workers parked on event queue
-                        int i, e; long cc; Thread p;
-                        while ((e = (int)(cc = ctl) & E_MASK) != 0 &&
-                               (i = e & SMASK) < n && i >= 0 &&
-                               (w = ws[i]) != null) {
-                            long nc = ((long)(w.nextWait & E_MASK) |
-                                       ((cc + AC_UNIT) & AC_MASK) |
-                                       (cc & (TC_MASK|STOP_BIT)));
-                            if (w.eventCount == (e | INT_SIGN) &&
-                                compareAndSwapLongCtl(cc, nc)) {
-                                w.eventCount = (e + E_SEQ) & E_MASK;
-                                w.qlock = -1;
-                                if ((p = w.parker) != null)
-                                    U.unpark(p);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    // external operations on common pool
-
-    /**
-     * Returns common pool queue for a thread that has submitted at
-     * least one task.
-     */
-    static WorkQueue commonSubmitterQueue() {
-        ForkJoinPool p; WorkQueue[] ws; int m, z;
-        return ((z = ThreadLocalRandom.getProbe()) != 0 &&
-                (p = common) != null &&
-                (ws = p.workQueues) != null &&
-                (m = ws.length - 1) >= 0) ?
-            ws[m & z & SQMASK] : null;
-    }
-
-    /**
-     * Tries to pop the given task from submitter's queue in common pool.
-     */
-    final boolean tryExternalUnpush(ForkJoinTask<?> task) {
-        WorkQueue joiner; ForkJoinTask<?>[] a; int m, s;
-        WorkQueue[] ws = workQueues;
-        int z = ThreadLocalRandom.getProbe();
-        boolean popped = false;
-        if (ws != null && (m = ws.length - 1) >= 0 &&
-            (joiner = ws[z & m & SQMASK]) != null &&
-            joiner.base != (s = joiner.top) &&
-            (a = joiner.array) != null) {
-            long j = (((a.length - 1) & (s - 1)) << ASHIFT) + ABASE;
-            if (U.getObject(a, j) == task &&
-                joiner.compareAndSwapIntQlock(0, 1)) {
-                if (joiner.top == s && joiner.array == a &&
-                    U.compareAndSwapObject(a, j, task, null)) {
-                    joiner.top = s - 1;
-                    popped = true;
-                }
-                joiner.qlock = 0;
-            }
-        }
-        return popped;
-    }
-
-    final int externalHelpComplete(CountedCompleter<?> task, int maxTasks) {
-        WorkQueue joiner; int m;
-        WorkQueue[] ws = workQueues;
-        int j = ThreadLocalRandom.getProbe();
-        int s = 0;
-        if (ws != null && (m = ws.length - 1) >= 0 &&
-            (joiner = ws[j & m & SQMASK]) != null && task != null) {
-            int scans = m + m + 1;
-            long c = 0L;             // for stability check
-            j |= 1;                  // poll odd queues
-            for (int k = scans; ; j += 2) {
-                WorkQueue q;
-                if ((s = task.status) < 0)
-                    break;
-                else if (joiner.externalPopAndExecCC(task)) {
-                    if (--maxTasks <= 0) {
-                        s = task.status;
-                        break;
-                    }
-                    k = scans;
-                }
-                else if ((s = task.status) < 0)
-                    break;
-                else if ((q = ws[j & m]) != null && q.pollAndExecCC(task)) {
-                    if (--maxTasks <= 0) {
-                        s = task.status;
-                        break;
-                    }
-                    k = scans;
-                }
-                else if (--k < 0) {
-                    if (c == (c = ctl))
-                        break;
-                    k = scans;
-                }
-            }
-        }
-        return s;
-    }
-
-    // Exported methods
-
-    // Constructors
-
-    /**
-     * Creates a {@code ForkJoinPool} with parallelism equal to {@link
-     * java.lang.Runtime#availableProcessors}, using the {@linkplain
-     * #defaultForkJoinWorkerThreadFactory default thread factory},
-     * no UncaughtExceptionHandler, and non-async LIFO processing mode.
-     *
-     * @throws SecurityException if a security manager exists and
-     *         the caller is not permitted to modify threads
-     *         because it does not hold {@link
-     *         java.lang.RuntimePermission}{@code ("modifyThread")}
-     */
-    public ForkJoinPool() {
-        this(Math.min(MAX_CAP, Runtime.getRuntime().availableProcessors()),
-             defaultForkJoinWorkerThreadFactory, null, false);
-    }
-
-    /**
-     * Creates a {@code ForkJoinPool} with the indicated parallelism
-     * level, the {@linkplain
-     * #defaultForkJoinWorkerThreadFactory default thread factory},
-     * no UncaughtExceptionHandler, and non-async LIFO processing mode.
-     *
-     * @param parallelism the parallelism level
-     * @throws IllegalArgumentException if parallelism less than or
-     *         equal to zero, or greater than implementation limit
-     * @throws SecurityException if a security manager exists and
-     *         the caller is not permitted to modify threads
-     *         because it does not hold {@link
-     *         java.lang.RuntimePermission}{@code ("modifyThread")}
-     */
-    public ForkJoinPool(int parallelism) {
-        this(parallelism, defaultForkJoinWorkerThreadFactory, null, false);
-    }
-
-    /**
-     * Creates a {@code ForkJoinPool} with the given parameters.
-     *
-     * @param parallelism the parallelism level. For default value,
-     * use {@link java.lang.Runtime#availableProcessors}.
-     * @param factory the factory for creating new threads. For default value,
-     * use {@link #defaultForkJoinWorkerThreadFactory}.
-     * @param handler the handler for internal worker threads that
-     * terminate due to unrecoverable errors encountered while executing
-     * tasks. For default value, use {@code null}.
-     * @param asyncMode if true,
-     * establishes local first-in-first-out scheduling mode for forked
-     * tasks that are never joined. This mode may be more appropriate
-     * than default locally stack-based mode in applications in which
-     * worker threads only process event-style asynchronous tasks.
-     * For default value, use {@code false}.
-     * @throws IllegalArgumentException if parallelism less than or
-     *         equal to zero, or greater than implementation limit
-     * @throws NullPointerException if the factory is null
-     * @throws SecurityException if a security manager exists and
-     *         the caller is not permitted to modify threads
-     *         because it does not hold {@link
-     *         java.lang.RuntimePermission}{@code ("modifyThread")}
-     */
-    public ForkJoinPool(int parallelism,
-                        ForkJoinWorkerThreadFactory factory,
-                        UncaughtExceptionHandler handler,
-                        boolean asyncMode) {
-        this(checkParallelism(parallelism),
-             checkFactory(factory),
-             handler,
-             (asyncMode ? FIFO_QUEUE : LIFO_QUEUE),
-             "ForkJoinPool-" + nextPoolId() + "-worker-");
-        checkPermission();
-    }
-
-    private static int checkParallelism(int parallelism) {
-        if (parallelism <= 0 || parallelism > MAX_CAP)
-            throw new IllegalArgumentException();
-        return parallelism;
-    }
-
-    private static ForkJoinWorkerThreadFactory checkFactory
-        (ForkJoinWorkerThreadFactory factory) {
-        if (factory == null)
-            throw new NullPointerException();
-        return factory;
-    }
-
-    /**
-     * Creates a {@code ForkJoinPool} with the given parameters, without
-     * any security checks or parameter validation.  Invoked directly by
-     * makeCommonPool.
-     */
-    private ForkJoinPool(int parallelism,
-                         ForkJoinWorkerThreadFactory factory,
-                         UncaughtExceptionHandler handler,
-                         int mode,
-                         String workerNamePrefix) {
-        this.workerNamePrefix = workerNamePrefix;
-        this.factory = factory;
-        this.ueh = handler;
-        this.mode = (short)mode;
-        this.parallelism = (short)parallelism;
-        long np = (long)(-parallelism); // offset ctl counts
-        this.ctl = ((np << AC_SHIFT) & AC_MASK) | ((np << TC_SHIFT) & TC_MASK);
-    }
-
-    /**
-     * Returns the common pool instance. This pool is statically
-     * constructed; its run state is unaffected by attempts to {@link
-     * #shutdown} or {@link #shutdownNow}. However this pool and any
-     * ongoing processing are automatically terminated upon program
-     * {@link System#exit}.  Any program that relies on asynchronous
-     * task processing to complete before program termination should
-     * invoke {@code commonPool().}{@link #awaitQuiescence awaitQuiescence},
-     * before exit.
-     *
-     * @return the common pool instance
-     * @since 1.8
-     */
-    public static ForkJoinPool commonPool() {
-        // assert common != null : "static init error";
-        return common;
-    }
-
-    // Execution methods
-
-    /**
-     * Performs the given task, returning its result upon completion.
-     * If the computation encounters an unchecked Exception or Error,
-     * it is rethrown as the outcome of this invocation.  Rethrown
-     * exceptions behave in the same way as regular exceptions, but,
-     * when possible, contain stack traces (as displayed for example
-     * using {@code ex.printStackTrace()}) of both the current thread
-     * as well as the thread actually encountering the exception;
-     * minimally only the latter.
-     *
-     * @param task the task
-     * @param <T> the type of the task's result
-     * @return the task's result
-     * @throws NullPointerException if the task is null
-     * @throws RejectedExecutionException if the task cannot be
-     *         scheduled for execution
-     */
-    public <T> T invoke(ForkJoinTask<T> task) {
-        if (task == null)
-            throw new NullPointerException();
-        externalPush(task);
-        return task.join();
-    }
-
-    /**
-     * Arranges for (asynchronous) execution of the given task.
-     *
-     * @param task the task
-     * @throws NullPointerException if the task is null
-     * @throws RejectedExecutionException if the task cannot be
-     *         scheduled for execution
-     */
-    public void execute(ForkJoinTask<?> task) {
-        if (task == null)
-            throw new NullPointerException();
-        externalPush(task);
-    }
-
-    // AbstractExecutorService methods
-
-    /**
-     * @throws NullPointerException if the task is null
-     * @throws RejectedExecutionException if the task cannot be
-     *         scheduled for execution
-     */
-    public void execute(Runnable task) {
-        if (task == null)
-            throw new NullPointerException();
-        ForkJoinTask<?> job;
-        if (task instanceof ForkJoinTask<?>) // avoid re-wrap
-            job = (ForkJoinTask<?>) task;
-        else
-            job = new ForkJoinTask.RunnableExecuteAction(task);
-        externalPush(job);
-    }
-
-    /**
-     * Submits a ForkJoinTask for execution.
-     *
-     * @param task the task to submit
-     * @param <T> the type of the task's result
-     * @return the task
-     * @throws NullPointerException if the task is null
-     * @throws RejectedExecutionException if the task cannot be
-     *         scheduled for execution
-     */
-    public <T> ForkJoinTask<T> submit(ForkJoinTask<T> task) {
-        if (task == null)
-            throw new NullPointerException();
-        externalPush(task);
-        return task;
-    }
-
-    /**
-     * @throws NullPointerException if the task is null
-     * @throws RejectedExecutionException if the task cannot be
-     *         scheduled for execution
-     */
-    public <T> ForkJoinTask<T> submit(Callable<T> task) {
-        ForkJoinTask<T> job = new ForkJoinTask.AdaptedCallable<T>(task);
-        externalPush(job);
-        return job;
-    }
-
-    /**
-     * @throws NullPointerException if the task is null
-     * @throws RejectedExecutionException if the task cannot be
-     *         scheduled for execution
-     */
-    public <T> ForkJoinTask<T> submit(Runnable task, T result) {
-        ForkJoinTask<T> job = new ForkJoinTask.AdaptedRunnable<T>(task, result);
-        externalPush(job);
-        return job;
-    }
-
-    /**
-     * @throws NullPointerException if the task is null
-     * @throws RejectedExecutionException if the task cannot be
-     *         scheduled for execution
-     */
-    public ForkJoinTask<?> submit(Runnable task) {
-        if (task == null)
-            throw new NullPointerException();
-        ForkJoinTask<?> job;
-        if (task instanceof ForkJoinTask<?>) // avoid re-wrap
-            job = (ForkJoinTask<?>) task;
-        else
-            job = new ForkJoinTask.AdaptedRunnableAction(task);
-        externalPush(job);
-        return job;
-    }
-
-    /**
-     * @throws NullPointerException       {@inheritDoc}
-     * @throws RejectedExecutionException {@inheritDoc}
-     */
-    public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks) {
-        // In previous versions of this class, this method constructed
-        // a task to run ForkJoinTask.invokeAll, but now external
-        // invocation of multiple tasks is at least as efficient.
-        ArrayList<Future<T>> futures = new ArrayList<Future<T>>(tasks.size());
-
-        boolean done = false;
-        try {
-            for (Callable<T> t : tasks) {
-                ForkJoinTask<T> f = new ForkJoinTask.AdaptedCallable<T>(t);
-                futures.add(f);
-                externalPush(f);
-            }
-            for (int i = 0, size = futures.size(); i < size; i++)
-                ((ForkJoinTask<?>)futures.get(i)).quietlyJoin();
-            done = true;
-            return futures;
-        } finally {
-            if (!done)
-                for (int i = 0, size = futures.size(); i < size; i++)
-                    futures.get(i).cancel(false);
-        }
-    }
-
-    /**
-     * Returns the factory used for constructing new workers.
-     *
-     * @return the factory used for constructing new workers
-     */
-    public ForkJoinWorkerThreadFactory getFactory() {
-        return factory;
-    }
-
-    /**
-     * Returns the handler for internal worker threads that terminate
-     * due to unrecoverable errors encountered while executing tasks.
-     *
-     * @return the handler, or {@code null} if none
-     */
-    public UncaughtExceptionHandler getUncaughtExceptionHandler() {
-        return ueh;
-    }
-
-    /**
-     * Returns the targeted parallelism level of this pool.
-     *
-     * @return the targeted parallelism level of this pool
-     */
-    public int getParallelism() {
-        int par;
-        return ((par = parallelism) > 0) ? par : 1;
-    }
-
-    /**
-     * Returns the targeted parallelism level of the common pool.
-     *
-     * @return the targeted parallelism level of the common pool
-     * @since 1.8
-     */
-    public static int getCommonPoolParallelism() {
-        return commonParallelism;
-    }
-
-    /**
-     * Returns the number of worker threads that have started but not
-     * yet terminated.  The result returned by this method may differ
-     * from {@link #getParallelism} when threads are created to
-     * maintain parallelism when others are cooperatively blocked.
-     *
-     * @return the number of worker threads
-     */
-    public int getPoolSize() {
-        return parallelism + (short)(ctl >>> TC_SHIFT);
-    }
-
-    /**
-     * Returns {@code true} if this pool uses local first-in-first-out
-     * scheduling mode for forked tasks that are never joined.
-     *
-     * @return {@code true} if this pool uses async mode
-     */
-    public boolean getAsyncMode() {
-        return mode == FIFO_QUEUE;
-    }
-
-    /**
-     * Returns an estimate of the number of worker threads that are
-     * not blocked waiting to join tasks or for other managed
-     * synchronization. This method may overestimate the
-     * number of running threads.
-     *
-     * @return the number of worker threads
-     */
-    public int getRunningThreadCount() {
-        int rc = 0;
-        WorkQueue[] ws; WorkQueue w;
-        if ((ws = workQueues) != null) {
-            for (int i = 1; i < ws.length; i += 2) {
-                if ((w = ws[i]) != null && w.isApparentlyUnblocked())
-                    ++rc;
-            }
-        }
-        return rc;
-    }
-
-    /**
-     * Returns an estimate of the number of threads that are currently
-     * stealing or executing tasks. This method may overestimate the
-     * number of active threads.
-     *
-     * @return the number of active threads
-     */
-    public int getActiveThreadCount() {
-        int r = parallelism + (int)(ctl >> AC_SHIFT);
-        return (r <= 0) ? 0 : r; // suppress momentarily negative values
-    }
-
-    /**
-     * Returns {@code true} if all worker threads are currently idle.
-     * An idle worker is one that cannot obtain a task to execute
-     * because none are available to steal from other threads, and
-     * there are no pending submissions to the pool. This method is
-     * conservative; it might not return {@code true} immediately upon
-     * idleness of all threads, but will eventually become true if
-     * threads remain inactive.
-     *
-     * @return {@code true} if all threads are currently idle
-     */
-    public boolean isQuiescent() {
-        return parallelism + (int)(ctl >> AC_SHIFT) <= 0;
-    }
-
-    /**
-     * Returns an estimate of the total number of tasks stolen from
-     * one thread's work queue by another. The reported value
-     * underestimates the actual total number of steals when the pool
-     * is not quiescent. This value may be useful for monitoring and
-     * tuning fork/join programs: in general, steal counts should be
-     * high enough to keep threads busy, but low enough to avoid
-     * overhead and contention across threads.
-     *
-     * @return the number of steals
-     */
-    public long getStealCount() {
-        long count = stealCount;
-        WorkQueue[] ws; WorkQueue w;
-        if ((ws = workQueues) != null) {
-            for (int i = 1; i < ws.length; i += 2) {
-                if ((w = ws[i]) != null)
-                    count += w.nsteals;
-            }
-        }
-        return count;
-    }
-
-    /**
-     * Returns an estimate of the total number of tasks currently held
-     * in queues by worker threads (but not including tasks submitted
-     * to the pool that have not begun executing). This value is only
-     * an approximation, obtained by iterating across all threads in
-     * the pool. This method may be useful for tuning task
-     * granularities.
-     *
-     * @return the number of queued tasks
-     */
-    public long getQueuedTaskCount() {
-        long count = 0;
-        WorkQueue[] ws; WorkQueue w;
-        if ((ws = workQueues) != null) {
-            for (int i = 1; i < ws.length; i += 2) {
-                if ((w = ws[i]) != null)
-                    count += w.queueSize();
-            }
-        }
-        return count;
-    }
-
-    /**
-     * Returns an estimate of the number of tasks submitted to this
-     * pool that have not yet begun executing.  This method may take
-     * time proportional to the number of submissions.
-     *
-     * @return the number of queued submissions
-     */
-    public int getQueuedSubmissionCount() {
-        int count = 0;
-        WorkQueue[] ws; WorkQueue w;
-        if ((ws = workQueues) != null) {
-            for (int i = 0; i < ws.length; i += 2) {
-                if ((w = ws[i]) != null)
-                    count += w.queueSize();
-            }
-        }
-        return count;
-    }
-
-    /**
-     * Returns {@code true} if there are any tasks submitted to this
-     * pool that have not yet begun executing.
-     *
-     * @return {@code true} if there are any queued submissions
-     */
-    public boolean hasQueuedSubmissions() {
-        WorkQueue[] ws; WorkQueue w;
-        if ((ws = workQueues) != null) {
-            for (int i = 0; i < ws.length; i += 2) {
-                if ((w = ws[i]) != null && !w.isEmpty())
-                    return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Removes and returns the next unexecuted submission if one is
-     * available.  This method may be useful in extensions to this
-     * class that re-assign work in systems with multiple pools.
-     *
-     * @return the next submission, or {@code null} if none
-     */
-    protected ForkJoinTask<?> pollSubmission() {
-        WorkQueue[] ws; WorkQueue w; ForkJoinTask<?> t;
-        if ((ws = workQueues) != null) {
-            for (int i = 0; i < ws.length; i += 2) {
-                if ((w = ws[i]) != null && (t = w.poll()) != null)
-                    return t;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Removes all available unexecuted submitted and forked tasks
-     * from scheduling queues and adds them to the given collection,
-     * without altering their execution status. These may include
-     * artificially generated or wrapped tasks. This method is
-     * designed to be invoked only when the pool is known to be
-     * quiescent. Invocations at other times may not remove all
-     * tasks. A failure encountered while attempting to add elements
-     * to collection {@code c} may result in elements being in
-     * neither, either or both collections when the associated
-     * exception is thrown.  The behavior of this operation is
-     * undefined if the specified collection is modified while the
-     * operation is in progress.
-     *
-     * @param c the collection to transfer elements into
-     * @return the number of elements transferred
-     */
-    protected int drainTasksTo(Collection<? super ForkJoinTask<?>> c) {
-        int count = 0;
-        WorkQueue[] ws; WorkQueue w; ForkJoinTask<?> t;
-        if ((ws = workQueues) != null) {
-            for (int i = 0; i < ws.length; ++i) {
-                if ((w = ws[i]) != null) {
-                    while ((t = w.poll()) != null) {
-                        c.add(t);
-                        ++count;
-                    }
-                }
-            }
-        }
-        return count;
-    }
-
-    /**
-     * Returns a string identifying this pool, as well as its state,
-     * including indications of run state, parallelism level, and
-     * worker and task counts.
-     *
-     * @return a string identifying this pool, as well as its state
-     */
-    public String toString() {
-        // Use a single pass through workQueues to collect counts
-        long qt = 0L, qs = 0L; int rc = 0;
-        long st = stealCount;
-        long c = ctl;
-        WorkQueue[] ws; WorkQueue w;
-        if ((ws = workQueues) != null) {
-            for (int i = 0; i < ws.length; ++i) {
-                if ((w = ws[i]) != null) {
-                    int size = w.queueSize();
-                    if ((i & 1) == 0)
-                        qs += size;
-                    else {
-                        qt += size;
-                        st += w.nsteals;
-                        if (w.isApparentlyUnblocked())
-                            ++rc;
-                    }
-                }
-            }
-        }
-        int pc = parallelism;
-        int tc = pc + (short)(c >>> TC_SHIFT);
-        int ac = pc + (int)(c >> AC_SHIFT);
-        if (ac < 0) // ignore transient negative
-            ac = 0;
-        String level;
-        if ((c & STOP_BIT) != 0)
-            level = (tc == 0) ? "Terminated" : "Terminating";
-        else
-            level = plock < 0 ? "Shutting down" : "Running";
-        return super.toString() +
-            "[" + level +
-            ", parallelism = " + pc +
-            ", size = " + tc +
-            ", active = " + ac +
-            ", running = " + rc +
-            ", steals = " + st +
-            ", tasks = " + qt +
-            ", submissions = " + qs +
-            "]";
-    }
-
-    /**
-     * Possibly initiates an orderly shutdown in which previously
-     * submitted tasks are executed, but no new tasks will be
-     * accepted. Invocation has no effect on execution state if this
-     * is the {@link #commonPool()}, and no additional effect if
-     * already shut down.  Tasks that are in the process of being
-     * submitted concurrently during the course of this method may or
-     * may not be rejected.
-     *
-     * @throws SecurityException if a security manager exists and
-     *         the caller is not permitted to modify threads
-     *         because it does not hold {@link
-     *         java.lang.RuntimePermission}{@code ("modifyThread")}
-     */
-    public void shutdown() {
-        checkPermission();
-        tryTerminate(false, true);
-    }
-
-    /**
-     * Possibly attempts to cancel and/or stop all tasks, and reject
-     * all subsequently submitted tasks.  Invocation has no effect on
-     * execution state if this is the {@link #commonPool()}, and no
-     * additional effect if already shut down. Otherwise, tasks that
-     * are in the process of being submitted or executed concurrently
-     * during the course of this method may or may not be
-     * rejected. This method cancels both existing and unexecuted
-     * tasks, in order to permit termination in the presence of task
-     * dependencies. So the method always returns an empty list
-     * (unlike the case for some other Executors).
-     *
-     * @return an empty list
-     * @throws SecurityException if a security manager exists and
-     *         the caller is not permitted to modify threads
-     *         because it does not hold {@link
-     *         java.lang.RuntimePermission}{@code ("modifyThread")}
-     */
-    public List<Runnable> shutdownNow() {
-        checkPermission();
-        tryTerminate(true, true);
-        return Collections.emptyList();
-    }
-
-    /**
-     * Returns {@code true} if all tasks have completed following shut down.
-     *
-     * @return {@code true} if all tasks have completed following shut down
-     */
-    public boolean isTerminated() {
-        long c = ctl;
-        return ((c & STOP_BIT) != 0L &&
-                (short)(c >>> TC_SHIFT) + parallelism <= 0);
-    }
-
-    /**
-     * Returns {@code true} if the process of termination has
-     * commenced but not yet completed.  This method may be useful for
-     * debugging. A return of {@code true} reported a sufficient
-     * period after shutdown may indicate that submitted tasks have
-     * ignored or suppressed interruption, or are waiting for I/O,
-     * causing this executor not to properly terminate. (See the
-     * advisory notes for class {@link ForkJoinTask} stating that
-     * tasks should not normally entail blocking operations.  But if
-     * they do, they must abort them on interrupt.)
-     *
-     * @return {@code true} if terminating but not yet terminated
-     */
-    public boolean isTerminating() {
-        long c = ctl;
-        return ((c & STOP_BIT) != 0L &&
-                (short)(c >>> TC_SHIFT) + parallelism > 0);
-    }
-
-    /**
-     * Returns {@code true} if this pool has been shut down.
-     *
-     * @return {@code true} if this pool has been shut down
-     */
-    public boolean isShutdown() {
-        return plock < 0;
-    }
-
-    /**
-     * Blocks until all tasks have completed execution after a
-     * shutdown request, or the timeout occurs, or the current thread
-     * is interrupted, whichever happens first. Because the {@link
-     * #commonPool()} never terminates until program shutdown, when
-     * applied to the common pool, this method is equivalent to {@link
-     * #awaitQuiescence(long, TimeUnit)} but always returns {@code false}.
-     *
-     * @param timeout the maximum time to wait
-     * @param unit the time unit of the timeout argument
-     * @return {@code true} if this executor terminated and
-     *         {@code false} if the timeout elapsed before termination
-     * @throws InterruptedException if interrupted while waiting
-     */
-    public boolean awaitTermination(long timeout, TimeUnit unit)
-        throws InterruptedException {
-        if (Thread.interrupted())
-            throw new InterruptedException();
-        if (this == common) {
-            awaitQuiescence(timeout, unit);
-            return false;
-        }
-        long nanos = unit.toNanos(timeout);
-        if (isTerminated())
-            return true;
-        if (nanos <= 0L)
-            return false;
-        long deadline = System.nanoTime() + nanos;
-        synchronized (this) {
-            for (;;) {
-                if (isTerminated())
-                    return true;
-                if (nanos <= 0L)
-                    return false;
-                long millis = TimeUnit.NANOSECONDS.toMillis(nanos);
-                wait(millis > 0L ? millis : 1L);
-                nanos = deadline - System.nanoTime();
-            }
-        }
-    }
-
-    /**
-     * If called by a ForkJoinTask operating in this pool, equivalent
-     * in effect to {@link ForkJoinTask#helpQuiesce}. Otherwise,
-     * waits and/or attempts to assist performing tasks until this
-     * pool {@link #isQuiescent} or the indicated timeout elapses.
-     *
-     * @param timeout the maximum time to wait
-     * @param unit the time unit of the timeout argument
-     * @return {@code true} if quiescent; {@code false} if the
-     * timeout elapsed.
-     */
-    public boolean awaitQuiescence(long timeout, TimeUnit unit) {
-        long nanos = unit.toNanos(timeout);
-        ForkJoinWorkerThread wt;
-        Thread thread = Thread.currentThread();
-        if ((thread instanceof ForkJoinWorkerThread) &&
-            (wt = (ForkJoinWorkerThread)thread).pool == this) {
-            helpQuiescePool(wt.workQueue);
-            return true;
-        }
-        long startTime = System.nanoTime();
-        WorkQueue[] ws;
-        int r = 0, m;
-        boolean found = true;
-        while (!isQuiescent() && (ws = workQueues) != null &&
-               (m = ws.length - 1) >= 0) {
-            if (!found) {
-                if ((System.nanoTime() - startTime) > nanos)
-                    return false;
-                Thread.yield(); // cannot block
-            }
-            found = false;
-            for (int j = (m + 1) << 2; j >= 0; --j) {
-                ForkJoinTask<?> t; WorkQueue q; int b;
-                if ((q = ws[r++ & m]) != null && (b = q.base) - q.top < 0) {
-                    found = true;
-                    if ((t = q.pollAt(b)) != null)
-                        t.doExec();
-                    break;
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Waits and/or attempts to assist performing tasks indefinitely
-     * until the {@link #commonPool()} {@link #isQuiescent}.
-     */
-    static void quiesceCommonPool() {
-        common.awaitQuiescence(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
-    }
-
-    /**
-     * Interface for extending managed parallelism for tasks running
-     * in {@link ForkJoinPool}s.
-     *
-     * <p>A {@code ManagedBlocker} provides two methods.  Method
-     * {@code isReleasable} must return {@code true} if blocking is
-     * not necessary. Method {@code block} blocks the current thread
-     * if necessary (perhaps internally invoking {@code isReleasable}
-     * before actually blocking). These actions are performed by any
-     * thread invoking {@link ForkJoinPool#managedBlock(ManagedBlocker)}.
-     * The unusual methods in this API accommodate synchronizers that
-     * may, but don't usually, block for long periods. Similarly, they
-     * allow more efficient internal handling of cases in which
-     * additional workers may be, but usually are not, needed to
-     * ensure sufficient parallelism.  Toward this end,
-     * implementations of method {@code isReleasable} must be amenable
-     * to repeated invocation.
-     *
-     * <p>For example, here is a ManagedBlocker based on a
-     * ReentrantLock:
-     *  <pre> {@code
-     * class ManagedLocker implements ManagedBlocker {
-     *   final ReentrantLock lock;
-     *   boolean hasLock = false;
-     *   ManagedLocker(ReentrantLock lock) { this.lock = lock; }
-     *   public boolean block() {
-     *     if (!hasLock)
-     *       lock.lock();
-     *     return true;
-     *   }
-     *   public boolean isReleasable() {
-     *     return hasLock || (hasLock = lock.tryLock());
-     *   }
-     * }}</pre>
-     *
-     * <p>Here is a class that possibly blocks waiting for an
-     * item on a given queue:
-     *  <pre> {@code
-     * class QueueTaker<E> implements ManagedBlocker {
-     *   final BlockingQueue<E> queue;
-     *   volatile E item = null;
-     *   QueueTaker(BlockingQueue<E> q) { this.queue = q; }
-     *   public boolean block() throws InterruptedException {
-     *     if (item == null)
-     *       item = queue.take();
-     *     return true;
-     *   }
-     *   public boolean isReleasable() {
-     *     return item != null || (item = queue.poll()) != null;
-     *   }
-     *   public E getItem() { // call after pool.managedBlock completes
-     *     return item;
-     *   }
-     * }}</pre>
-     */
-    public static interface ManagedBlocker {
-        /**
-         * Possibly blocks the current thread, for example waiting for
-         * a lock or condition.
-         *
-         * @return {@code true} if no additional blocking is necessary
-         * (i.e., if isReleasable would return true)
-         * @throws InterruptedException if interrupted while waiting
-         * (the method is not required to do so, but is allowed to)
-         */
-        boolean block() throws InterruptedException;
-
-        /**
-         * Returns {@code true} if blocking is unnecessary.
-         * @return {@code true} if blocking is unnecessary
-         */
-        boolean isReleasable();
-    }
-
-    /**
-     * Blocks in accord with the given blocker.  If the current thread
-     * is a {@link ForkJoinWorkerThread}, this method possibly
-     * arranges for a spare thread to be activated if necessary to
-     * ensure sufficient parallelism while the current thread is blocked.
-     *
-     * <p>If the caller is not a {@link ForkJoinTask}, this method is
-     * behaviorally equivalent to
-     *  <pre> {@code
-     * while (!blocker.isReleasable())
-     *   if (blocker.block())
-     *     return;
-     * }</pre>
-     *
-     * If the caller is a {@code ForkJoinTask}, then the pool may
-     * first be expanded to ensure parallelism, and later adjusted.
-     *
-     * @param blocker the blocker
-     * @throws InterruptedException if blocker.block did so
-     */
-    public static void managedBlock(ManagedBlocker blocker)
-        throws InterruptedException {
-        Thread t = Thread.currentThread();
-        if (t instanceof ForkJoinWorkerThread) {
-            ForkJoinPool p = ((ForkJoinWorkerThread)t).pool;
-            while (!blocker.isReleasable()) {
-                if (p.tryCompensate(p.ctl)) {
-                    try {
-                        do {} while (!blocker.isReleasable() &&
-                                     !blocker.block());
-                    } finally {
-                        p.incrementActiveCount();
-                    }
-                    break;
-                }
-            }
-        }
-        else {
-            do {} while (!blocker.isReleasable() &&
-                         !blocker.block());
-        }
-    }
-
-    // AbstractExecutorService overrides.  These rely on undocumented
-    // fact that ForkJoinTask.adapt returns ForkJoinTasks that also
-    // implement RunnableFuture.
-
-    protected <T> RunnableFuture<T> newTaskFor(Runnable runnable, T value) {
-        return new ForkJoinTask.AdaptedRunnable<T>(runnable, value);
-    }
-
-    protected <T> RunnableFuture<T> newTaskFor(Callable<T> callable) {
-        return new ForkJoinTask.AdaptedCallable<T>(callable);
-    }
-
-    @ikvm.internal.InterlockedCompareAndSet("ctl")
-    private native boolean compareAndSwapLongCtl(long expect, long update);
-
-    @ikvm.internal.InterlockedCompareAndSet("plock")
-    private native boolean compareAndSwapIntPlock(int expect, int update);
-
-    @ikvm.internal.InterlockedCompareAndSet("indexSeed")
-    private native boolean compareAndSwapIntIndexSeed(int expect, int update);
-
-    @ikvm.internal.InterlockedCompareAndSet("stealCount")
-    private native boolean compareAndSwapLongStealCount(long expect, long update);
-
-    private long getAndAddLongStealCount(long delta) {
-        for (;;) {
-            long value = stealCount;
-            if (compareAndSwapLongStealCount(value, value + delta)) {
-                return value;
-            }
-        }
-    }
-
-    // Unsafe mechanics
-    private static final sun.misc.Unsafe U;
-    private static final int ABASE;
-    private static final int ASHIFT;
-
-    static {
-        // initialize field offsets for CAS etc
-        try {
-            U = sun.misc.Unsafe.getUnsafe();
-            Class<?> ak = ForkJoinTask[].class;
-            ABASE = U.arrayBaseOffset(ak);
-            int scale = U.arrayIndexScale(ak);
-            if ((scale & (scale - 1)) != 0)
-                throw new Error("data type scale not a power of two");
-            ASHIFT = 31 - Integer.numberOfLeadingZeros(scale);
-        } catch (Exception e) {
-            throw new Error(e);
-        }
-
-        defaultForkJoinWorkerThreadFactory =
-            new DefaultForkJoinWorkerThreadFactory();
-        modifyThreadPermission = new RuntimePermission("modifyThread");
-
-        common = java.security.AccessController.doPrivileged
-            (new java.security.PrivilegedAction<ForkJoinPool>() {
-                public ForkJoinPool run() { return makeCommonPool(); }});
-        int par = common.parallelism; // report 1 even if threads disabled
-        commonParallelism = par > 0 ? par : 1;
-    }
-
-    /**
-     * Creates and returns the common pool, respecting user settings
-     * specified via system properties.
-     */
-    private static ForkJoinPool makeCommonPool() {
-        int parallelism = -1;
-        ForkJoinWorkerThreadFactory factory = null;
-        UncaughtExceptionHandler handler = null;
-        try {  // ignore exceptions in accessing/parsing properties
-            String pp = System.getProperty
-                ("java.util.concurrent.ForkJoinPool.common.parallelism");
-            String fp = System.getProperty
-                ("java.util.concurrent.ForkJoinPool.common.threadFactory");
-            String hp = System.getProperty
-                ("java.util.concurrent.ForkJoinPool.common.exceptionHandler");
-            if (pp != null)
-                parallelism = Integer.parseInt(pp);
-            if (fp != null)
-                factory = ((ForkJoinWorkerThreadFactory)ClassLoader.
-                           getSystemClassLoader().loadClass(fp).newInstance());
-            if (hp != null)
-                handler = ((UncaughtExceptionHandler)ClassLoader.
-                           getSystemClassLoader().loadClass(hp).newInstance());
-        } catch (Exception ignore) {
-        }
-        if (factory == null) {
-            if (System.getSecurityManager() == null)
-                factory = defaultForkJoinWorkerThreadFactory;
-            else // use security-managed default
-                factory = new InnocuousForkJoinWorkerThreadFactory();
-        }
-        if (parallelism < 0 && // default 1 less than #cores
-            (parallelism = Runtime.getRuntime().availableProcessors() - 1) <= 0)
-            parallelism = 1;
-        if (parallelism > MAX_CAP)
-            parallelism = MAX_CAP;
-        return new ForkJoinPool(parallelism, factory, handler, LIFO_QUEUE,
-                                "ForkJoinPool.commonPool-worker-");
-    }
-
-    /**
-     * Factory for innocuous worker threads
-     */
-    static final class InnocuousForkJoinWorkerThreadFactory
-        implements ForkJoinWorkerThreadFactory {
-
-        /**
-         * An ACC to restrict permissions for the factory itself.
-         * The constructed workers have no permissions set.
-         */
-        private static final AccessControlContext innocuousAcc;
-        static {
-            Permissions innocuousPerms = new Permissions();
-            innocuousPerms.add(modifyThreadPermission);
-            innocuousPerms.add(new RuntimePermission(
-                                   "enableContextClassLoaderOverride"));
-            innocuousPerms.add(new RuntimePermission(
-                                   "modifyThreadGroup"));
-            innocuousAcc = new AccessControlContext(new ProtectionDomain[] {
-                    new ProtectionDomain(null, innocuousPerms)
-                });
-        }
-
-        public final ForkJoinWorkerThread newThread(ForkJoinPool pool) {
-            return (ForkJoinWorkerThread.InnocuousForkJoinWorkerThread)
-                java.security.AccessController.doPrivileged(
-                    new java.security.PrivilegedAction<ForkJoinWorkerThread>() {
-                    public ForkJoinWorkerThread run() {
-                        return new ForkJoinWorkerThread.
-                            InnocuousForkJoinWorkerThread(pool);
-                    }}, innocuousAcc);
-        }
-    }
-
-}
diff --git a/openjdk/java/util/concurrent/locks/AbstractQueuedSynchronizer.java b/openjdk/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
deleted file mode 100644
index 4a42dc11..00000000
--- a/openjdk/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
+++ /dev/null
@@ -1,2299 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * This file is available under and governed by the GNU General Public
- * License version 2 only, as published by the Free Software Foundation.
- * However, the following notice accompanied the original version of this
- * file:
- *
- * Written by Doug Lea with assistance from members of JCP JSR-166
- * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-package java.util.concurrent.locks;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-/**
- * Provides a framework for implementing blocking locks and related
- * synchronizers (semaphores, events, etc) that rely on
- * first-in-first-out (FIFO) wait queues.  This class is designed to
- * be a useful basis for most kinds of synchronizers that rely on a
- * single atomic <tt>int</tt> value to represent state. Subclasses
- * must define the protected methods that change this state, and which
- * define what that state means in terms of this object being acquired
- * or released.  Given these, the other methods in this class carry
- * out all queuing and blocking mechanics. Subclasses can maintain
- * other state fields, but only the atomically updated <tt>int</tt>
- * value manipulated using methods {@link #getState}, {@link
- * #setState} and {@link #compareAndSetState} is tracked with respect
- * to synchronization.
- *
- * <p>Subclasses should be defined as non-public internal helper
- * classes that are used to implement the synchronization properties
- * of their enclosing class.  Class
- * <tt>AbstractQueuedSynchronizer</tt> does not implement any
- * synchronization interface.  Instead it defines methods such as
- * {@link #acquireInterruptibly} that can be invoked as
- * appropriate by concrete locks and related synchronizers to
- * implement their public methods.
- *
- * <p>This class supports either or both a default <em>exclusive</em>
- * mode and a <em>shared</em> mode. When acquired in exclusive mode,
- * attempted acquires by other threads cannot succeed. Shared mode
- * acquires by multiple threads may (but need not) succeed. This class
- * does not &quot;understand&quot; these differences except in the
- * mechanical sense that when a shared mode acquire succeeds, the next
- * waiting thread (if one exists) must also determine whether it can
- * acquire as well. Threads waiting in the different modes share the
- * same FIFO queue. Usually, implementation subclasses support only
- * one of these modes, but both can come into play for example in a
- * {@link ReadWriteLock}. Subclasses that support only exclusive or
- * only shared modes need not define the methods supporting the unused mode.
- *
- * <p>This class defines a nested {@link ConditionObject} class that
- * can be used as a {@link Condition} implementation by subclasses
- * supporting exclusive mode for which method {@link
- * #isHeldExclusively} reports whether synchronization is exclusively
- * held with respect to the current thread, method {@link #release}
- * invoked with the current {@link #getState} value fully releases
- * this object, and {@link #acquire}, given this saved state value,
- * eventually restores this object to its previous acquired state.  No
- * <tt>AbstractQueuedSynchronizer</tt> method otherwise creates such a
- * condition, so if this constraint cannot be met, do not use it.  The
- * behavior of {@link ConditionObject} depends of course on the
- * semantics of its synchronizer implementation.
- *
- * <p>This class provides inspection, instrumentation, and monitoring
- * methods for the internal queue, as well as similar methods for
- * condition objects. These can be exported as desired into classes
- * using an <tt>AbstractQueuedSynchronizer</tt> for their
- * synchronization mechanics.
- *
- * <p>Serialization of this class stores only the underlying atomic
- * integer maintaining state, so deserialized objects have empty
- * thread queues. Typical subclasses requiring serializability will
- * define a <tt>readObject</tt> method that restores this to a known
- * initial state upon deserialization.
- *
- * <h3>Usage</h3>
- *
- * <p>To use this class as the basis of a synchronizer, redefine the
- * following methods, as applicable, by inspecting and/or modifying
- * the synchronization state using {@link #getState}, {@link
- * #setState} and/or {@link #compareAndSetState}:
- *
- * <ul>
- * <li> {@link #tryAcquire}
- * <li> {@link #tryRelease}
- * <li> {@link #tryAcquireShared}
- * <li> {@link #tryReleaseShared}
- * <li> {@link #isHeldExclusively}
- *</ul>
- *
- * Each of these methods by default throws {@link
- * UnsupportedOperationException}.  Implementations of these methods
- * must be internally thread-safe, and should in general be short and
- * not block. Defining these methods is the <em>only</em> supported
- * means of using this class. All other methods are declared
- * <tt>final</tt> because they cannot be independently varied.
- *
- * <p>You may also find the inherited methods from {@link
- * AbstractOwnableSynchronizer} useful to keep track of the thread
- * owning an exclusive synchronizer.  You are encouraged to use them
- * -- this enables monitoring and diagnostic tools to assist users in
- * determining which threads hold locks.
- *
- * <p>Even though this class is based on an internal FIFO queue, it
- * does not automatically enforce FIFO acquisition policies.  The core
- * of exclusive synchronization takes the form:
- *
- * <pre>
- * Acquire:
- *     while (!tryAcquire(arg)) {
- *        <em>enqueue thread if it is not already queued</em>;
- *        <em>possibly block current thread</em>;
- *     }
- *
- * Release:
- *     if (tryRelease(arg))
- *        <em>unblock the first queued thread</em>;
- * </pre>
- *
- * (Shared mode is similar but may involve cascading signals.)
- *
- * <p><a name="barging">Because checks in acquire are invoked before
- * enqueuing, a newly acquiring thread may <em>barge</em> ahead of
- * others that are blocked and queued.  However, you can, if desired,
- * define <tt>tryAcquire</tt> and/or <tt>tryAcquireShared</tt> to
- * disable barging by internally invoking one or more of the inspection
- * methods, thereby providing a <em>fair</em> FIFO acquisition order.
- * In particular, most fair synchronizers can define <tt>tryAcquire</tt>
- * to return <tt>false</tt> if {@link #hasQueuedPredecessors} (a method
- * specifically designed to be used by fair synchronizers) returns
- * <tt>true</tt>.  Other variations are possible.
- *
- * <p>Throughput and scalability are generally highest for the
- * default barging (also known as <em>greedy</em>,
- * <em>renouncement</em>, and <em>convoy-avoidance</em>) strategy.
- * While this is not guaranteed to be fair or starvation-free, earlier
- * queued threads are allowed to recontend before later queued
- * threads, and each recontention has an unbiased chance to succeed
- * against incoming threads.  Also, while acquires do not
- * &quot;spin&quot; in the usual sense, they may perform multiple
- * invocations of <tt>tryAcquire</tt> interspersed with other
- * computations before blocking.  This gives most of the benefits of
- * spins when exclusive synchronization is only briefly held, without
- * most of the liabilities when it isn't. If so desired, you can
- * augment this by preceding calls to acquire methods with
- * "fast-path" checks, possibly prechecking {@link #hasContended}
- * and/or {@link #hasQueuedThreads} to only do so if the synchronizer
- * is likely not to be contended.
- *
- * <p>This class provides an efficient and scalable basis for
- * synchronization in part by specializing its range of use to
- * synchronizers that can rely on <tt>int</tt> state, acquire, and
- * release parameters, and an internal FIFO wait queue. When this does
- * not suffice, you can build synchronizers from a lower level using
- * {@link java.util.concurrent.atomic atomic} classes, your own custom
- * {@link java.util.Queue} classes, and {@link LockSupport} blocking
- * support.
- *
- * <h3>Usage Examples</h3>
- *
- * <p>Here is a non-reentrant mutual exclusion lock class that uses
- * the value zero to represent the unlocked state, and one to
- * represent the locked state. While a non-reentrant lock
- * does not strictly require recording of the current owner
- * thread, this class does so anyway to make usage easier to monitor.
- * It also supports conditions and exposes
- * one of the instrumentation methods:
- *
- * <pre>
- * class Mutex implements Lock, java.io.Serializable {
- *
- *   // Our internal helper class
- *   private static class Sync extends AbstractQueuedSynchronizer {
- *     // Report whether in locked state
- *     protected boolean isHeldExclusively() {
- *       return getState() == 1;
- *     }
- *
- *     // Acquire the lock if state is zero
- *     public boolean tryAcquire(int acquires) {
- *       assert acquires == 1; // Otherwise unused
- *       if (compareAndSetState(0, 1)) {
- *         setExclusiveOwnerThread(Thread.currentThread());
- *         return true;
- *       }
- *       return false;
- *     }
- *
- *     // Release the lock by setting state to zero
- *     protected boolean tryRelease(int releases) {
- *       assert releases == 1; // Otherwise unused
- *       if (getState() == 0) throw new IllegalMonitorStateException();
- *       setExclusiveOwnerThread(null);
- *       setState(0);
- *       return true;
- *     }
- *
- *     // Provide a Condition
- *     Condition newCondition() { return new ConditionObject(); }
- *
- *     // Deserialize properly
- *     private void readObject(ObjectInputStream s)
- *         throws IOException, ClassNotFoundException {
- *       s.defaultReadObject();
- *       setState(0); // reset to unlocked state
- *     }
- *   }
- *
- *   // The sync object does all the hard work. We just forward to it.
- *   private final Sync sync = new Sync();
- *
- *   public void lock()                { sync.acquire(1); }
- *   public boolean tryLock()          { return sync.tryAcquire(1); }
- *   public void unlock()              { sync.release(1); }
- *   public Condition newCondition()   { return sync.newCondition(); }
- *   public boolean isLocked()         { return sync.isHeldExclusively(); }
- *   public boolean hasQueuedThreads() { return sync.hasQueuedThreads(); }
- *   public void lockInterruptibly() throws InterruptedException {
- *     sync.acquireInterruptibly(1);
- *   }
- *   public boolean tryLock(long timeout, TimeUnit unit)
- *       throws InterruptedException {
- *     return sync.tryAcquireNanos(1, unit.toNanos(timeout));
- *   }
- * }
- * </pre>
- *
- * <p>Here is a latch class that is like a {@link CountDownLatch}
- * except that it only requires a single <tt>signal</tt> to
- * fire. Because a latch is non-exclusive, it uses the <tt>shared</tt>
- * acquire and release methods.
- *
- * <pre>
- * class BooleanLatch {
- *
- *   private static class Sync extends AbstractQueuedSynchronizer {
- *     boolean isSignalled() { return getState() != 0; }
- *
- *     protected int tryAcquireShared(int ignore) {
- *       return isSignalled() ? 1 : -1;
- *     }
- *
- *     protected boolean tryReleaseShared(int ignore) {
- *       setState(1);
- *       return true;
- *     }
- *   }
- *
- *   private final Sync sync = new Sync();
- *   public boolean isSignalled() { return sync.isSignalled(); }
- *   public void signal()         { sync.releaseShared(1); }
- *   public void await() throws InterruptedException {
- *     sync.acquireSharedInterruptibly(1);
- *   }
- * }
- * </pre>
- *
- * @since 1.5
- * @author Doug Lea
- */
-public abstract class AbstractQueuedSynchronizer
-    extends AbstractOwnableSynchronizer
-    implements java.io.Serializable {
-
-    private static final long serialVersionUID = 7373984972572414691L;
-
-    /**
-     * Creates a new <tt>AbstractQueuedSynchronizer</tt> instance
-     * with initial synchronization state of zero.
-     */
-    protected AbstractQueuedSynchronizer() { }
-
-    /**
-     * Wait queue node class.
-     *
-     * <p>The wait queue is a variant of a "CLH" (Craig, Landin, and
-     * Hagersten) lock queue. CLH locks are normally used for
-     * spinlocks.  We instead use them for blocking synchronizers, but
-     * use the same basic tactic of holding some of the control
-     * information about a thread in the predecessor of its node.  A
-     * "status" field in each node keeps track of whether a thread
-     * should block.  A node is signalled when its predecessor
-     * releases.  Each node of the queue otherwise serves as a
-     * specific-notification-style monitor holding a single waiting
-     * thread. The status field does NOT control whether threads are
-     * granted locks etc though.  A thread may try to acquire if it is
-     * first in the queue. But being first does not guarantee success;
-     * it only gives the right to contend.  So the currently released
-     * contender thread may need to rewait.
-     *
-     * <p>To enqueue into a CLH lock, you atomically splice it in as new
-     * tail. To dequeue, you just set the head field.
-     * <pre>
-     *      +------+  prev +-----+       +-----+
-     * head |      | <---- |     | <---- |     |  tail
-     *      +------+       +-----+       +-----+
-     * </pre>
-     *
-     * <p>Insertion into a CLH queue requires only a single atomic
-     * operation on "tail", so there is a simple atomic point of
-     * demarcation from unqueued to queued. Similarly, dequeing
-     * involves only updating the "head". However, it takes a bit
-     * more work for nodes to determine who their successors are,
-     * in part to deal with possible cancellation due to timeouts
-     * and interrupts.
-     *
-     * <p>The "prev" links (not used in original CLH locks), are mainly
-     * needed to handle cancellation. If a node is cancelled, its
-     * successor is (normally) relinked to a non-cancelled
-     * predecessor. For explanation of similar mechanics in the case
-     * of spin locks, see the papers by Scott and Scherer at
-     * http://www.cs.rochester.edu/u/scott/synchronization/
-     *
-     * <p>We also use "next" links to implement blocking mechanics.
-     * The thread id for each node is kept in its own node, so a
-     * predecessor signals the next node to wake up by traversing
-     * next link to determine which thread it is.  Determination of
-     * successor must avoid races with newly queued nodes to set
-     * the "next" fields of their predecessors.  This is solved
-     * when necessary by checking backwards from the atomically
-     * updated "tail" when a node's successor appears to be null.
-     * (Or, said differently, the next-links are an optimization
-     * so that we don't usually need a backward scan.)
-     *
-     * <p>Cancellation introduces some conservatism to the basic
-     * algorithms.  Since we must poll for cancellation of other
-     * nodes, we can miss noticing whether a cancelled node is
-     * ahead or behind us. This is dealt with by always unparking
-     * successors upon cancellation, allowing them to stabilize on
-     * a new predecessor, unless we can identify an uncancelled
-     * predecessor who will carry this responsibility.
-     *
-     * <p>CLH queues need a dummy header node to get started. But
-     * we don't create them on construction, because it would be wasted
-     * effort if there is never contention. Instead, the node
-     * is constructed and head and tail pointers are set upon first
-     * contention.
-     *
-     * <p>Threads waiting on Conditions use the same nodes, but
-     * use an additional link. Conditions only need to link nodes
-     * in simple (non-concurrent) linked queues because they are
-     * only accessed when exclusively held.  Upon await, a node is
-     * inserted into a condition queue.  Upon signal, the node is
-     * transferred to the main queue.  A special value of status
-     * field is used to mark which queue a node is on.
-     *
-     * <p>Thanks go to Dave Dice, Mark Moir, Victor Luchangco, Bill
-     * Scherer and Michael Scott, along with members of JSR-166
-     * expert group, for helpful ideas, discussions, and critiques
-     * on the design of this class.
-     */
-    static final class Node {
-        static final AtomicReferenceFieldUpdater<Node, Node> nextUpdater = AtomicReferenceFieldUpdater.newUpdater(Node.class, Node.class, "next");
-        /** Marker to indicate a node is waiting in shared mode */
-        static final Node SHARED = new Node();
-        /** Marker to indicate a node is waiting in exclusive mode */
-        static final Node EXCLUSIVE = null;
-
-        /** waitStatus value to indicate thread has cancelled */
-        static final int CANCELLED =  1;
-        /** waitStatus value to indicate successor's thread needs unparking */
-        static final int SIGNAL    = -1;
-        /** waitStatus value to indicate thread is waiting on condition */
-        static final int CONDITION = -2;
-        /**
-         * waitStatus value to indicate the next acquireShared should
-         * unconditionally propagate
-         */
-        static final int PROPAGATE = -3;
-
-        /**
-         * Status field, taking on only the values:
-         *   SIGNAL:     The successor of this node is (or will soon be)
-         *               blocked (via park), so the current node must
-         *               unpark its successor when it releases or
-         *               cancels. To avoid races, acquire methods must
-         *               first indicate they need a signal,
-         *               then retry the atomic acquire, and then,
-         *               on failure, block.
-         *   CANCELLED:  This node is cancelled due to timeout or interrupt.
-         *               Nodes never leave this state. In particular,
-         *               a thread with cancelled node never again blocks.
-         *   CONDITION:  This node is currently on a condition queue.
-         *               It will not be used as a sync queue node
-         *               until transferred, at which time the status
-         *               will be set to 0. (Use of this value here has
-         *               nothing to do with the other uses of the
-         *               field, but simplifies mechanics.)
-         *   PROPAGATE:  A releaseShared should be propagated to other
-         *               nodes. This is set (for head node only) in
-         *               doReleaseShared to ensure propagation
-         *               continues, even if other operations have
-         *               since intervened.
-         *   0:          None of the above
-         *
-         * The values are arranged numerically to simplify use.
-         * Non-negative values mean that a node doesn't need to
-         * signal. So, most code doesn't need to check for particular
-         * values, just for sign.
-         *
-         * The field is initialized to 0 for normal sync nodes, and
-         * CONDITION for condition nodes.  It is modified using CAS
-         * (or when possible, unconditional volatile writes).
-         */
-        volatile int waitStatus;
-
-        /**
-         * Link to predecessor node that current node/thread relies on
-         * for checking waitStatus. Assigned during enqueing, and nulled
-         * out (for sake of GC) only upon dequeuing.  Also, upon
-         * cancellation of a predecessor, we short-circuit while
-         * finding a non-cancelled one, which will always exist
-         * because the head node is never cancelled: A node becomes
-         * head only as a result of successful acquire. A
-         * cancelled thread never succeeds in acquiring, and a thread only
-         * cancels itself, not any other node.
-         */
-        volatile Node prev;
-
-        /**
-         * Link to the successor node that the current node/thread
-         * unparks upon release. Assigned during enqueuing, adjusted
-         * when bypassing cancelled predecessors, and nulled out (for
-         * sake of GC) when dequeued.  The enq operation does not
-         * assign next field of a predecessor until after attachment,
-         * so seeing a null next field does not necessarily mean that
-         * node is at end of queue. However, if a next field appears
-         * to be null, we can scan prev's from the tail to
-         * double-check.  The next field of cancelled nodes is set to
-         * point to the node itself instead of null, to make life
-         * easier for isOnSyncQueue.
-         */
-        volatile Node next;
-
-        /**
-         * The thread that enqueued this node.  Initialized on
-         * construction and nulled out after use.
-         */
-        volatile Thread thread;
-
-        /**
-         * Link to next node waiting on condition, or the special
-         * value SHARED.  Because condition queues are accessed only
-         * when holding in exclusive mode, we just need a simple
-         * linked queue to hold nodes while they are waiting on
-         * conditions. They are then transferred to the queue to
-         * re-acquire. And because conditions can only be exclusive,
-         * we save a field by using special value to indicate shared
-         * mode.
-         */
-        Node nextWaiter;
-
-        /**
-         * Returns true if node is waiting in shared mode
-         */
-        final boolean isShared() {
-            return nextWaiter == SHARED;
-        }
-
-        /**
-         * Returns previous node, or throws NullPointerException if null.
-         * Use when predecessor cannot be null.  The null check could
-         * be elided, but is present to help the VM.
-         *
-         * @return the predecessor of this node
-         */
-        final Node predecessor() throws NullPointerException {
-            Node p = prev;
-            if (p == null)
-                throw new NullPointerException();
-            else
-                return p;
-        }
-
-        Node() {    // Used to establish initial head or SHARED marker
-        }
-
-        Node(Thread thread, Node mode) {     // Used by addWaiter
-            this.nextWaiter = mode;
-            this.thread = thread;
-        }
-
-        Node(Thread thread, int waitStatus) { // Used by Condition
-            this.waitStatus = waitStatus;
-            this.thread = thread;
-        }
-    }
-
-    /**
-     * Head of the wait queue, lazily initialized.  Except for
-     * initialization, it is modified only via method setHead.  Note:
-     * If head exists, its waitStatus is guaranteed not to be
-     * CANCELLED.
-     */
-    private transient volatile Node head;
-
-    /**
-     * Tail of the wait queue, lazily initialized.  Modified only via
-     * method enq to add new wait node.
-     */
-    private transient volatile Node tail;
-
-    /**
-     * The synchronization state.
-     */
-    private volatile int state;
-
-    /**
-     * Returns the current value of synchronization state.
-     * This operation has memory semantics of a <tt>volatile</tt> read.
-     * @return current state value
-     */
-    protected final int getState() {
-        return state;
-    }
-
-    /**
-     * Sets the value of synchronization state.
-     * This operation has memory semantics of a <tt>volatile</tt> write.
-     * @param newState the new state value
-     */
-    protected final void setState(int newState) {
-        state = newState;
-    }
-
-    /**
-     * Atomically sets synchronization state to the given updated
-     * value if the current state value equals the expected value.
-     * This operation has memory semantics of a <tt>volatile</tt> read
-     * and write.
-     *
-     * @param expect the expected value
-     * @param update the new value
-     * @return true if successful. False return indicates that the actual
-     *         value was not equal to the expected value.
-     */
-    protected final native boolean compareAndSetState(int expect, int update); // implemented in map.xml
-
-    // Queuing utilities
-
-    /**
-     * The number of nanoseconds for which it is faster to spin
-     * rather than to use timed park. A rough estimate suffices
-     * to improve responsiveness with very short timeouts.
-     */
-    static final long spinForTimeoutThreshold = 1000L;
-
-    /**
-     * Inserts node into queue, initializing if necessary. See picture above.
-     * @param node the node to insert
-     * @return node's predecessor
-     */
-    private Node enq(final Node node) {
-        for (;;) {
-            Node t = tail;
-            if (t == null) { // Must initialize
-                if (compareAndSetHead(new Node()))
-                    tail = head;
-            } else {
-                node.prev = t;
-                if (compareAndSetTail(t, node)) {
-                    t.next = node;
-                    return t;
-                }
-            }
-        }
-    }
-
-    /**
-     * Creates and enqueues node for current thread and given mode.
-     *
-     * @param mode Node.EXCLUSIVE for exclusive, Node.SHARED for shared
-     * @return the new node
-     */
-    private Node addWaiter(Node mode) {
-        Node node = new Node(Thread.currentThread(), mode);
-        // Try the fast path of enq; backup to full enq on failure
-        Node pred = tail;
-        if (pred != null) {
-            node.prev = pred;
-            if (compareAndSetTail(pred, node)) {
-                pred.next = node;
-                return node;
-            }
-        }
-        enq(node);
-        return node;
-    }
-
-    /**
-     * Sets head of queue to be node, thus dequeuing. Called only by
-     * acquire methods.  Also nulls out unused fields for sake of GC
-     * and to suppress unnecessary signals and traversals.
-     *
-     * @param node the node
-     */
-    private void setHead(Node node) {
-        head = node;
-        node.thread = null;
-        node.prev = null;
-    }
-
-    /**
-     * Wakes up node's successor, if one exists.
-     *
-     * @param node the node
-     */
-    private void unparkSuccessor(Node node) {
-        /*
-         * If status is negative (i.e., possibly needing signal) try
-         * to clear in anticipation of signalling.  It is OK if this
-         * fails or if status is changed by waiting thread.
-         */
-        int ws = node.waitStatus;
-        if (ws < 0)
-            compareAndSetWaitStatus(node, ws, 0);
-
-        /*
-         * Thread to unpark is held in successor, which is normally
-         * just the next node.  But if cancelled or apparently null,
-         * traverse backwards from tail to find the actual
-         * non-cancelled successor.
-         */
-        Node s = node.next;
-        if (s == null || s.waitStatus > 0) {
-            s = null;
-            for (Node t = tail; t != null && t != node; t = t.prev)
-                if (t.waitStatus <= 0)
-                    s = t;
-        }
-        if (s != null)
-            LockSupport.unpark(s.thread);
-    }
-
-    /**
-     * Release action for shared mode -- signal successor and ensure
-     * propagation. (Note: For exclusive mode, release just amounts
-     * to calling unparkSuccessor of head if it needs signal.)
-     */
-    private void doReleaseShared() {
-        /*
-         * Ensure that a release propagates, even if there are other
-         * in-progress acquires/releases.  This proceeds in the usual
-         * way of trying to unparkSuccessor of head if it needs
-         * signal. But if it does not, status is set to PROPAGATE to
-         * ensure that upon release, propagation continues.
-         * Additionally, we must loop in case a new node is added
-         * while we are doing this. Also, unlike other uses of
-         * unparkSuccessor, we need to know if CAS to reset status
-         * fails, if so rechecking.
-         */
-        for (;;) {
-            Node h = head;
-            if (h != null && h != tail) {
-                int ws = h.waitStatus;
-                if (ws == Node.SIGNAL) {
-                    if (!compareAndSetWaitStatus(h, Node.SIGNAL, 0))
-                        continue;            // loop to recheck cases
-                    unparkSuccessor(h);
-                }
-                else if (ws == 0 &&
-                         !compareAndSetWaitStatus(h, 0, Node.PROPAGATE))
-                    continue;                // loop on failed CAS
-            }
-            if (h == head)                   // loop if head changed
-                break;
-        }
-    }
-
-    /**
-     * Sets head of queue, and checks if successor may be waiting
-     * in shared mode, if so propagating if either propagate > 0 or
-     * PROPAGATE status was set.
-     *
-     * @param node the node
-     * @param propagate the return value from a tryAcquireShared
-     */
-    private void setHeadAndPropagate(Node node, int propagate) {
-        Node h = head; // Record old head for check below
-        setHead(node);
-        /*
-         * Try to signal next queued node if:
-         *   Propagation was indicated by caller,
-         *     or was recorded (as h.waitStatus) by a previous operation
-         *     (note: this uses sign-check of waitStatus because
-         *      PROPAGATE status may transition to SIGNAL.)
-         * and
-         *   The next node is waiting in shared mode,
-         *     or we don't know, because it appears null
-         *
-         * The conservatism in both of these checks may cause
-         * unnecessary wake-ups, but only when there are multiple
-         * racing acquires/releases, so most need signals now or soon
-         * anyway.
-         */
-        if (propagate > 0 || h == null || h.waitStatus < 0) {
-            Node s = node.next;
-            if (s == null || s.isShared())
-                doReleaseShared();
-        }
-    }
-
-    // Utilities for various versions of acquire
-
-    /**
-     * Cancels an ongoing attempt to acquire.
-     *
-     * @param node the node
-     */
-    private void cancelAcquire(Node node) {
-        // Ignore if node doesn't exist
-        if (node == null)
-            return;
-
-        node.thread = null;
-
-        // Skip cancelled predecessors
-        Node pred = node.prev;
-        while (pred.waitStatus > 0)
-            node.prev = pred = pred.prev;
-
-        // predNext is the apparent node to unsplice. CASes below will
-        // fail if not, in which case, we lost race vs another cancel
-        // or signal, so no further action is necessary.
-        Node predNext = pred.next;
-
-        // Can use unconditional write instead of CAS here.
-        // After this atomic step, other Nodes can skip past us.
-        // Before, we are free of interference from other threads.
-        node.waitStatus = Node.CANCELLED;
-
-        // If we are the tail, remove ourselves.
-        if (node == tail && compareAndSetTail(node, pred)) {
-            compareAndSetNext(pred, predNext, null);
-        } else {
-            // If successor needs signal, try to set pred's next-link
-            // so it will get one. Otherwise wake it up to propagate.
-            int ws;
-            if (pred != head &&
-                ((ws = pred.waitStatus) == Node.SIGNAL ||
-                 (ws <= 0 && compareAndSetWaitStatus(pred, ws, Node.SIGNAL))) &&
-                pred.thread != null) {
-                Node next = node.next;
-                if (next != null && next.waitStatus <= 0)
-                    compareAndSetNext(pred, predNext, next);
-            } else {
-                unparkSuccessor(node);
-            }
-
-            node.next = node; // help GC
-        }
-    }
-
-    /**
-     * Checks and updates status for a node that failed to acquire.
-     * Returns true if thread should block. This is the main signal
-     * control in all acquire loops.  Requires that pred == node.prev
-     *
-     * @param pred node's predecessor holding status
-     * @param node the node
-     * @return {@code true} if thread should block
-     */
-    private static boolean shouldParkAfterFailedAcquire(Node pred, Node node) {
-        int ws = pred.waitStatus;
-        if (ws == Node.SIGNAL)
-            /*
-             * This node has already set status asking a release
-             * to signal it, so it can safely park.
-             */
-            return true;
-        if (ws > 0) {
-            /*
-             * Predecessor was cancelled. Skip over predecessors and
-             * indicate retry.
-             */
-            do {
-                node.prev = pred = pred.prev;
-            } while (pred.waitStatus > 0);
-            pred.next = node;
-        } else {
-            /*
-             * waitStatus must be 0 or PROPAGATE.  Indicate that we
-             * need a signal, but don't park yet.  Caller will need to
-             * retry to make sure it cannot acquire before parking.
-             */
-            compareAndSetWaitStatus(pred, ws, Node.SIGNAL);
-        }
-        return false;
-    }
-
-    /**
-     * Convenience method to interrupt current thread.
-     */
-    private static void selfInterrupt() {
-        Thread.currentThread().interrupt();
-    }
-
-    /**
-     * Convenience method to park and then check if interrupted
-     *
-     * @return {@code true} if interrupted
-     */
-    private final boolean parkAndCheckInterrupt() {
-        LockSupport.park(this);
-        return Thread.interrupted();
-    }
-
-    /*
-     * Various flavors of acquire, varying in exclusive/shared and
-     * control modes.  Each is mostly the same, but annoyingly
-     * different.  Only a little bit of factoring is possible due to
-     * interactions of exception mechanics (including ensuring that we
-     * cancel if tryAcquire throws exception) and other control, at
-     * least not without hurting performance too much.
-     */
-
-    /**
-     * Acquires in exclusive uninterruptible mode for thread already in
-     * queue. Used by condition wait methods as well as acquire.
-     *
-     * @param node the node
-     * @param arg the acquire argument
-     * @return {@code true} if interrupted while waiting
-     */
-    final boolean acquireQueued(final Node node, int arg) {
-        boolean failed = true;
-        try {
-            boolean interrupted = false;
-            for (;;) {
-                final Node p = node.predecessor();
-                if (p == head && tryAcquire(arg)) {
-                    setHead(node);
-                    p.next = null; // help GC
-                    failed = false;
-                    return interrupted;
-                }
-                if (shouldParkAfterFailedAcquire(p, node) &&
-                    parkAndCheckInterrupt())
-                    interrupted = true;
-            }
-        } finally {
-            if (failed)
-                cancelAcquire(node);
-        }
-    }
-
-    /**
-     * Acquires in exclusive interruptible mode.
-     * @param arg the acquire argument
-     */
-    private void doAcquireInterruptibly(int arg)
-        throws InterruptedException {
-        final Node node = addWaiter(Node.EXCLUSIVE);
-        boolean failed = true;
-        try {
-            for (;;) {
-                final Node p = node.predecessor();
-                if (p == head && tryAcquire(arg)) {
-                    setHead(node);
-                    p.next = null; // help GC
-                    failed = false;
-                    return;
-                }
-                if (shouldParkAfterFailedAcquire(p, node) &&
-                    parkAndCheckInterrupt())
-                    throw new InterruptedException();
-            }
-        } finally {
-            if (failed)
-                cancelAcquire(node);
-        }
-    }
-
-    /**
-     * Acquires in exclusive timed mode.
-     *
-     * @param arg the acquire argument
-     * @param nanosTimeout max wait time
-     * @return {@code true} if acquired
-     */
-    private boolean doAcquireNanos(int arg, long nanosTimeout)
-        throws InterruptedException {
-        long lastTime = System.nanoTime();
-        final Node node = addWaiter(Node.EXCLUSIVE);
-        boolean failed = true;
-        try {
-            for (;;) {
-                final Node p = node.predecessor();
-                if (p == head && tryAcquire(arg)) {
-                    setHead(node);
-                    p.next = null; // help GC
-                    failed = false;
-                    return true;
-                }
-                if (nanosTimeout <= 0)
-                    return false;
-                if (shouldParkAfterFailedAcquire(p, node) &&
-                    nanosTimeout > spinForTimeoutThreshold)
-                    LockSupport.parkNanos(this, nanosTimeout);
-                long now = System.nanoTime();
-                nanosTimeout -= now - lastTime;
-                lastTime = now;
-                if (Thread.interrupted())
-                    throw new InterruptedException();
-            }
-        } finally {
-            if (failed)
-                cancelAcquire(node);
-        }
-    }
-
-    /**
-     * Acquires in shared uninterruptible mode.
-     * @param arg the acquire argument
-     */
-    private void doAcquireShared(int arg) {
-        final Node node = addWaiter(Node.SHARED);
-        boolean failed = true;
-        try {
-            boolean interrupted = false;
-            for (;;) {
-                final Node p = node.predecessor();
-                if (p == head) {
-                    int r = tryAcquireShared(arg);
-                    if (r >= 0) {
-                        setHeadAndPropagate(node, r);
-                        p.next = null; // help GC
-                        if (interrupted)
-                            selfInterrupt();
-                        failed = false;
-                        return;
-                    }
-                }
-                if (shouldParkAfterFailedAcquire(p, node) &&
-                    parkAndCheckInterrupt())
-                    interrupted = true;
-            }
-        } finally {
-            if (failed)
-                cancelAcquire(node);
-        }
-    }
-
-    /**
-     * Acquires in shared interruptible mode.
-     * @param arg the acquire argument
-     */
-    private void doAcquireSharedInterruptibly(int arg)
-        throws InterruptedException {
-        final Node node = addWaiter(Node.SHARED);
-        boolean failed = true;
-        try {
-            for (;;) {
-                final Node p = node.predecessor();
-                if (p == head) {
-                    int r = tryAcquireShared(arg);
-                    if (r >= 0) {
-                        setHeadAndPropagate(node, r);
-                        p.next = null; // help GC
-                        failed = false;
-                        return;
-                    }
-                }
-                if (shouldParkAfterFailedAcquire(p, node) &&
-                    parkAndCheckInterrupt())
-                    throw new InterruptedException();
-            }
-        } finally {
-            if (failed)
-                cancelAcquire(node);
-        }
-    }
-
-    /**
-     * Acquires in shared timed mode.
-     *
-     * @param arg the acquire argument
-     * @param nanosTimeout max wait time
-     * @return {@code true} if acquired
-     */
-    private boolean doAcquireSharedNanos(int arg, long nanosTimeout)
-        throws InterruptedException {
-
-        long lastTime = System.nanoTime();
-        final Node node = addWaiter(Node.SHARED);
-        boolean failed = true;
-        try {
-            for (;;) {
-                final Node p = node.predecessor();
-                if (p == head) {
-                    int r = tryAcquireShared(arg);
-                    if (r >= 0) {
-                        setHeadAndPropagate(node, r);
-                        p.next = null; // help GC
-                        failed = false;
-                        return true;
-                    }
-                }
-                if (nanosTimeout <= 0)
-                    return false;
-                if (shouldParkAfterFailedAcquire(p, node) &&
-                    nanosTimeout > spinForTimeoutThreshold)
-                    LockSupport.parkNanos(this, nanosTimeout);
-                long now = System.nanoTime();
-                nanosTimeout -= now - lastTime;
-                lastTime = now;
-                if (Thread.interrupted())
-                    throw new InterruptedException();
-            }
-        } finally {
-            if (failed)
-                cancelAcquire(node);
-        }
-    }
-
-    // Main exported methods
-
-    /**
-     * Attempts to acquire in exclusive mode. This method should query
-     * if the state of the object permits it to be acquired in the
-     * exclusive mode, and if so to acquire it.
-     *
-     * <p>This method is always invoked by the thread performing
-     * acquire.  If this method reports failure, the acquire method
-     * may queue the thread, if it is not already queued, until it is
-     * signalled by a release from some other thread. This can be used
-     * to implement method {@link Lock#tryLock()}.
-     *
-     * <p>The default
-     * implementation throws {@link UnsupportedOperationException}.
-     *
-     * @param arg the acquire argument. This value is always the one
-     *        passed to an acquire method, or is the value saved on entry
-     *        to a condition wait.  The value is otherwise uninterpreted
-     *        and can represent anything you like.
-     * @return {@code true} if successful. Upon success, this object has
-     *         been acquired.
-     * @throws IllegalMonitorStateException if acquiring would place this
-     *         synchronizer in an illegal state. This exception must be
-     *         thrown in a consistent fashion for synchronization to work
-     *         correctly.
-     * @throws UnsupportedOperationException if exclusive mode is not supported
-     */
-    protected boolean tryAcquire(int arg) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Attempts to set the state to reflect a release in exclusive
-     * mode.
-     *
-     * <p>This method is always invoked by the thread performing release.
-     *
-     * <p>The default implementation throws
-     * {@link UnsupportedOperationException}.
-     *
-     * @param arg the release argument. This value is always the one
-     *        passed to a release method, or the current state value upon
-     *        entry to a condition wait.  The value is otherwise
-     *        uninterpreted and can represent anything you like.
-     * @return {@code true} if this object is now in a fully released
-     *         state, so that any waiting threads may attempt to acquire;
-     *         and {@code false} otherwise.
-     * @throws IllegalMonitorStateException if releasing would place this
-     *         synchronizer in an illegal state. This exception must be
-     *         thrown in a consistent fashion for synchronization to work
-     *         correctly.
-     * @throws UnsupportedOperationException if exclusive mode is not supported
-     */
-    protected boolean tryRelease(int arg) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Attempts to acquire in shared mode. This method should query if
-     * the state of the object permits it to be acquired in the shared
-     * mode, and if so to acquire it.
-     *
-     * <p>This method is always invoked by the thread performing
-     * acquire.  If this method reports failure, the acquire method
-     * may queue the thread, if it is not already queued, until it is
-     * signalled by a release from some other thread.
-     *
-     * <p>The default implementation throws {@link
-     * UnsupportedOperationException}.
-     *
-     * @param arg the acquire argument. This value is always the one
-     *        passed to an acquire method, or is the value saved on entry
-     *        to a condition wait.  The value is otherwise uninterpreted
-     *        and can represent anything you like.
-     * @return a negative value on failure; zero if acquisition in shared
-     *         mode succeeded but no subsequent shared-mode acquire can
-     *         succeed; and a positive value if acquisition in shared
-     *         mode succeeded and subsequent shared-mode acquires might
-     *         also succeed, in which case a subsequent waiting thread
-     *         must check availability. (Support for three different
-     *         return values enables this method to be used in contexts
-     *         where acquires only sometimes act exclusively.)  Upon
-     *         success, this object has been acquired.
-     * @throws IllegalMonitorStateException if acquiring would place this
-     *         synchronizer in an illegal state. This exception must be
-     *         thrown in a consistent fashion for synchronization to work
-     *         correctly.
-     * @throws UnsupportedOperationException if shared mode is not supported
-     */
-    protected int tryAcquireShared(int arg) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Attempts to set the state to reflect a release in shared mode.
-     *
-     * <p>This method is always invoked by the thread performing release.
-     *
-     * <p>The default implementation throws
-     * {@link UnsupportedOperationException}.
-     *
-     * @param arg the release argument. This value is always the one
-     *        passed to a release method, or the current state value upon
-     *        entry to a condition wait.  The value is otherwise
-     *        uninterpreted and can represent anything you like.
-     * @return {@code true} if this release of shared mode may permit a
-     *         waiting acquire (shared or exclusive) to succeed; and
-     *         {@code false} otherwise
-     * @throws IllegalMonitorStateException if releasing would place this
-     *         synchronizer in an illegal state. This exception must be
-     *         thrown in a consistent fashion for synchronization to work
-     *         correctly.
-     * @throws UnsupportedOperationException if shared mode is not supported
-     */
-    protected boolean tryReleaseShared(int arg) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Returns {@code true} if synchronization is held exclusively with
-     * respect to the current (calling) thread.  This method is invoked
-     * upon each call to a non-waiting {@link ConditionObject} method.
-     * (Waiting methods instead invoke {@link #release}.)
-     *
-     * <p>The default implementation throws {@link
-     * UnsupportedOperationException}. This method is invoked
-     * internally only within {@link ConditionObject} methods, so need
-     * not be defined if conditions are not used.
-     *
-     * @return {@code true} if synchronization is held exclusively;
-     *         {@code false} otherwise
-     * @throws UnsupportedOperationException if conditions are not supported
-     */
-    protected boolean isHeldExclusively() {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Acquires in exclusive mode, ignoring interrupts.  Implemented
-     * by invoking at least once {@link #tryAcquire},
-     * returning on success.  Otherwise the thread is queued, possibly
-     * repeatedly blocking and unblocking, invoking {@link
-     * #tryAcquire} until success.  This method can be used
-     * to implement method {@link Lock#lock}.
-     *
-     * @param arg the acquire argument.  This value is conveyed to
-     *        {@link #tryAcquire} but is otherwise uninterpreted and
-     *        can represent anything you like.
-     */
-    public final void acquire(int arg) {
-        if (!tryAcquire(arg) &&
-            acquireQueued(addWaiter(Node.EXCLUSIVE), arg))
-            selfInterrupt();
-    }
-
-    /**
-     * Acquires in exclusive mode, aborting if interrupted.
-     * Implemented by first checking interrupt status, then invoking
-     * at least once {@link #tryAcquire}, returning on
-     * success.  Otherwise the thread is queued, possibly repeatedly
-     * blocking and unblocking, invoking {@link #tryAcquire}
-     * until success or the thread is interrupted.  This method can be
-     * used to implement method {@link Lock#lockInterruptibly}.
-     *
-     * @param arg the acquire argument.  This value is conveyed to
-     *        {@link #tryAcquire} but is otherwise uninterpreted and
-     *        can represent anything you like.
-     * @throws InterruptedException if the current thread is interrupted
-     */
-    public final void acquireInterruptibly(int arg)
-            throws InterruptedException {
-        if (Thread.interrupted())
-            throw new InterruptedException();
-        if (!tryAcquire(arg))
-            doAcquireInterruptibly(arg);
-    }
-
-    /**
-     * Attempts to acquire in exclusive mode, aborting if interrupted,
-     * and failing if the given timeout elapses.  Implemented by first
-     * checking interrupt status, then invoking at least once {@link
-     * #tryAcquire}, returning on success.  Otherwise, the thread is
-     * queued, possibly repeatedly blocking and unblocking, invoking
-     * {@link #tryAcquire} until success or the thread is interrupted
-     * or the timeout elapses.  This method can be used to implement
-     * method {@link Lock#tryLock(long, TimeUnit)}.
-     *
-     * @param arg the acquire argument.  This value is conveyed to
-     *        {@link #tryAcquire} but is otherwise uninterpreted and
-     *        can represent anything you like.
-     * @param nanosTimeout the maximum number of nanoseconds to wait
-     * @return {@code true} if acquired; {@code false} if timed out
-     * @throws InterruptedException if the current thread is interrupted
-     */
-    public final boolean tryAcquireNanos(int arg, long nanosTimeout)
-            throws InterruptedException {
-        if (Thread.interrupted())
-            throw new InterruptedException();
-        return tryAcquire(arg) ||
-            doAcquireNanos(arg, nanosTimeout);
-    }
-
-    /**
-     * Releases in exclusive mode.  Implemented by unblocking one or
-     * more threads if {@link #tryRelease} returns true.
-     * This method can be used to implement method {@link Lock#unlock}.
-     *
-     * @param arg the release argument.  This value is conveyed to
-     *        {@link #tryRelease} but is otherwise uninterpreted and
-     *        can represent anything you like.
-     * @return the value returned from {@link #tryRelease}
-     */
-    public final boolean release(int arg) {
-        if (tryRelease(arg)) {
-            Node h = head;
-            if (h != null && h.waitStatus != 0)
-                unparkSuccessor(h);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Acquires in shared mode, ignoring interrupts.  Implemented by
-     * first invoking at least once {@link #tryAcquireShared},
-     * returning on success.  Otherwise the thread is queued, possibly
-     * repeatedly blocking and unblocking, invoking {@link
-     * #tryAcquireShared} until success.
-     *
-     * @param arg the acquire argument.  This value is conveyed to
-     *        {@link #tryAcquireShared} but is otherwise uninterpreted
-     *        and can represent anything you like.
-     */
-    public final void acquireShared(int arg) {
-        if (tryAcquireShared(arg) < 0)
-            doAcquireShared(arg);
-    }
-
-    /**
-     * Acquires in shared mode, aborting if interrupted.  Implemented
-     * by first checking interrupt status, then invoking at least once
-     * {@link #tryAcquireShared}, returning on success.  Otherwise the
-     * thread is queued, possibly repeatedly blocking and unblocking,
-     * invoking {@link #tryAcquireShared} until success or the thread
-     * is interrupted.
-     * @param arg the acquire argument
-     * This value is conveyed to {@link #tryAcquireShared} but is
-     * otherwise uninterpreted and can represent anything
-     * you like.
-     * @throws InterruptedException if the current thread is interrupted
-     */
-    public final void acquireSharedInterruptibly(int arg)
-            throws InterruptedException {
-        if (Thread.interrupted())
-            throw new InterruptedException();
-        if (tryAcquireShared(arg) < 0)
-            doAcquireSharedInterruptibly(arg);
-    }
-
-    /**
-     * Attempts to acquire in shared mode, aborting if interrupted, and
-     * failing if the given timeout elapses.  Implemented by first
-     * checking interrupt status, then invoking at least once {@link
-     * #tryAcquireShared}, returning on success.  Otherwise, the
-     * thread is queued, possibly repeatedly blocking and unblocking,
-     * invoking {@link #tryAcquireShared} until success or the thread
-     * is interrupted or the timeout elapses.
-     *
-     * @param arg the acquire argument.  This value is conveyed to
-     *        {@link #tryAcquireShared} but is otherwise uninterpreted
-     *        and can represent anything you like.
-     * @param nanosTimeout the maximum number of nanoseconds to wait
-     * @return {@code true} if acquired; {@code false} if timed out
-     * @throws InterruptedException if the current thread is interrupted
-     */
-    public final boolean tryAcquireSharedNanos(int arg, long nanosTimeout)
-            throws InterruptedException {
-        if (Thread.interrupted())
-            throw new InterruptedException();
-        return tryAcquireShared(arg) >= 0 ||
-            doAcquireSharedNanos(arg, nanosTimeout);
-    }
-
-    /**
-     * Releases in shared mode.  Implemented by unblocking one or more
-     * threads if {@link #tryReleaseShared} returns true.
-     *
-     * @param arg the release argument.  This value is conveyed to
-     *        {@link #tryReleaseShared} but is otherwise uninterpreted
-     *        and can represent anything you like.
-     * @return the value returned from {@link #tryReleaseShared}
-     */
-    public final boolean releaseShared(int arg) {
-        if (tryReleaseShared(arg)) {
-            doReleaseShared();
-            return true;
-        }
-        return false;
-    }
-
-    // Queue inspection methods
-
-    /**
-     * Queries whether any threads are waiting to acquire. Note that
-     * because cancellations due to interrupts and timeouts may occur
-     * at any time, a {@code true} return does not guarantee that any
-     * other thread will ever acquire.
-     *
-     * <p>In this implementation, this operation returns in
-     * constant time.
-     *
-     * @return {@code true} if there may be other threads waiting to acquire
-     */
-    public final boolean hasQueuedThreads() {
-        return head != tail;
-    }
-
-    /**
-     * Queries whether any threads have ever contended to acquire this
-     * synchronizer; that is if an acquire method has ever blocked.
-     *
-     * <p>In this implementation, this operation returns in
-     * constant time.
-     *
-     * @return {@code true} if there has ever been contention
-     */
-    public final boolean hasContended() {
-        return head != null;
-    }
-
-    /**
-     * Returns the first (longest-waiting) thread in the queue, or
-     * {@code null} if no threads are currently queued.
-     *
-     * <p>In this implementation, this operation normally returns in
-     * constant time, but may iterate upon contention if other threads are
-     * concurrently modifying the queue.
-     *
-     * @return the first (longest-waiting) thread in the queue, or
-     *         {@code null} if no threads are currently queued
-     */
-    public final Thread getFirstQueuedThread() {
-        // handle only fast path, else relay
-        return (head == tail) ? null : fullGetFirstQueuedThread();
-    }
-
-    /**
-     * Version of getFirstQueuedThread called when fastpath fails
-     */
-    private Thread fullGetFirstQueuedThread() {
-        /*
-         * The first node is normally head.next. Try to get its
-         * thread field, ensuring consistent reads: If thread
-         * field is nulled out or s.prev is no longer head, then
-         * some other thread(s) concurrently performed setHead in
-         * between some of our reads. We try this twice before
-         * resorting to traversal.
-         */
-        Node h, s;
-        Thread st;
-        if (((h = head) != null && (s = h.next) != null &&
-             s.prev == head && (st = s.thread) != null) ||
-            ((h = head) != null && (s = h.next) != null &&
-             s.prev == head && (st = s.thread) != null))
-            return st;
-
-        /*
-         * Head's next field might not have been set yet, or may have
-         * been unset after setHead. So we must check to see if tail
-         * is actually first node. If not, we continue on, safely
-         * traversing from tail back to head to find first,
-         * guaranteeing termination.
-         */
-
-        Node t = tail;
-        Thread firstThread = null;
-        while (t != null && t != head) {
-            Thread tt = t.thread;
-            if (tt != null)
-                firstThread = tt;
-            t = t.prev;
-        }
-        return firstThread;
-    }
-
-    /**
-     * Returns true if the given thread is currently queued.
-     *
-     * <p>This implementation traverses the queue to determine
-     * presence of the given thread.
-     *
-     * @param thread the thread
-     * @return {@code true} if the given thread is on the queue
-     * @throws NullPointerException if the thread is null
-     */
-    public final boolean isQueued(Thread thread) {
-        if (thread == null)
-            throw new NullPointerException();
-        for (Node p = tail; p != null; p = p.prev)
-            if (p.thread == thread)
-                return true;
-        return false;
-    }
-
-    /**
-     * Returns {@code true} if the apparent first queued thread, if one
-     * exists, is waiting in exclusive mode.  If this method returns
-     * {@code true}, and the current thread is attempting to acquire in
-     * shared mode (that is, this method is invoked from {@link
-     * #tryAcquireShared}) then it is guaranteed that the current thread
-     * is not the first queued thread.  Used only as a heuristic in
-     * ReentrantReadWriteLock.
-     */
-    final boolean apparentlyFirstQueuedIsExclusive() {
-        Node h, s;
-        return (h = head) != null &&
-            (s = h.next)  != null &&
-            !s.isShared()         &&
-            s.thread != null;
-    }
-
-    /**
-     * Queries whether any threads have been waiting to acquire longer
-     * than the current thread.
-     *
-     * <p>An invocation of this method is equivalent to (but may be
-     * more efficient than):
-     *  <pre> {@code
-     * getFirstQueuedThread() != Thread.currentThread() &&
-     * hasQueuedThreads()}</pre>
-     *
-     * <p>Note that because cancellations due to interrupts and
-     * timeouts may occur at any time, a {@code true} return does not
-     * guarantee that some other thread will acquire before the current
-     * thread.  Likewise, it is possible for another thread to win a
-     * race to enqueue after this method has returned {@code false},
-     * due to the queue being empty.
-     *
-     * <p>This method is designed to be used by a fair synchronizer to
-     * avoid <a href="AbstractQueuedSynchronizer#barging">barging</a>.
-     * Such a synchronizer's {@link #tryAcquire} method should return
-     * {@code false}, and its {@link #tryAcquireShared} method should
-     * return a negative value, if this method returns {@code true}
-     * (unless this is a reentrant acquire).  For example, the {@code
-     * tryAcquire} method for a fair, reentrant, exclusive mode
-     * synchronizer might look like this:
-     *
-     *  <pre> {@code
-     * protected boolean tryAcquire(int arg) {
-     *   if (isHeldExclusively()) {
-     *     // A reentrant acquire; increment hold count
-     *     return true;
-     *   } else if (hasQueuedPredecessors()) {
-     *     return false;
-     *   } else {
-     *     // try to acquire normally
-     *   }
-     * }}</pre>
-     *
-     * @return {@code true} if there is a queued thread preceding the
-     *         current thread, and {@code false} if the current thread
-     *         is at the head of the queue or the queue is empty
-     * @since 1.7
-     */
-    public final boolean hasQueuedPredecessors() {
-        // The correctness of this depends on head being initialized
-        // before tail and on head.next being accurate if the current
-        // thread is first in queue.
-        Node t = tail; // Read fields in reverse initialization order
-        Node h = head;
-        Node s;
-        return h != t &&
-            ((s = h.next) == null || s.thread != Thread.currentThread());
-    }
-
-
-    // Instrumentation and monitoring methods
-
-    /**
-     * Returns an estimate of the number of threads waiting to
-     * acquire.  The value is only an estimate because the number of
-     * threads may change dynamically while this method traverses
-     * internal data structures.  This method is designed for use in
-     * monitoring system state, not for synchronization
-     * control.
-     *
-     * @return the estimated number of threads waiting to acquire
-     */
-    public final int getQueueLength() {
-        int n = 0;
-        for (Node p = tail; p != null; p = p.prev) {
-            if (p.thread != null)
-                ++n;
-        }
-        return n;
-    }
-
-    /**
-     * Returns a collection containing threads that may be waiting to
-     * acquire.  Because the actual set of threads may change
-     * dynamically while constructing this result, the returned
-     * collection is only a best-effort estimate.  The elements of the
-     * returned collection are in no particular order.  This method is
-     * designed to facilitate construction of subclasses that provide
-     * more extensive monitoring facilities.
-     *
-     * @return the collection of threads
-     */
-    public final Collection<Thread> getQueuedThreads() {
-        ArrayList<Thread> list = new ArrayList<Thread>();
-        for (Node p = tail; p != null; p = p.prev) {
-            Thread t = p.thread;
-            if (t != null)
-                list.add(t);
-        }
-        return list;
-    }
-
-    /**
-     * Returns a collection containing threads that may be waiting to
-     * acquire in exclusive mode. This has the same properties
-     * as {@link #getQueuedThreads} except that it only returns
-     * those threads waiting due to an exclusive acquire.
-     *
-     * @return the collection of threads
-     */
-    public final Collection<Thread> getExclusiveQueuedThreads() {
-        ArrayList<Thread> list = new ArrayList<Thread>();
-        for (Node p = tail; p != null; p = p.prev) {
-            if (!p.isShared()) {
-                Thread t = p.thread;
-                if (t != null)
-                    list.add(t);
-            }
-        }
-        return list;
-    }
-
-    /**
-     * Returns a collection containing threads that may be waiting to
-     * acquire in shared mode. This has the same properties
-     * as {@link #getQueuedThreads} except that it only returns
-     * those threads waiting due to a shared acquire.
-     *
-     * @return the collection of threads
-     */
-    public final Collection<Thread> getSharedQueuedThreads() {
-        ArrayList<Thread> list = new ArrayList<Thread>();
-        for (Node p = tail; p != null; p = p.prev) {
-            if (p.isShared()) {
-                Thread t = p.thread;
-                if (t != null)
-                    list.add(t);
-            }
-        }
-        return list;
-    }
-
-    /**
-     * Returns a string identifying this synchronizer, as well as its state.
-     * The state, in brackets, includes the String {@code "State ="}
-     * followed by the current value of {@link #getState}, and either
-     * {@code "nonempty"} or {@code "empty"} depending on whether the
-     * queue is empty.
-     *
-     * @return a string identifying this synchronizer, as well as its state
-     */
-    public String toString() {
-        int s = getState();
-        String q  = hasQueuedThreads() ? "non" : "";
-        return super.toString() +
-            "[State = " + s + ", " + q + "empty queue]";
-    }
-
-
-    // Internal support methods for Conditions
-
-    /**
-     * Returns true if a node, always one that was initially placed on
-     * a condition queue, is now waiting to reacquire on sync queue.
-     * @param node the node
-     * @return true if is reacquiring
-     */
-    final boolean isOnSyncQueue(Node node) {
-        if (node.waitStatus == Node.CONDITION || node.prev == null)
-            return false;
-        if (node.next != null) // If has successor, it must be on queue
-            return true;
-        /*
-         * node.prev can be non-null, but not yet on queue because
-         * the CAS to place it on queue can fail. So we have to
-         * traverse from tail to make sure it actually made it.  It
-         * will always be near the tail in calls to this method, and
-         * unless the CAS failed (which is unlikely), it will be
-         * there, so we hardly ever traverse much.
-         */
-        return findNodeFromTail(node);
-    }
-
-    /**
-     * Returns true if node is on sync queue by searching backwards from tail.
-     * Called only when needed by isOnSyncQueue.
-     * @return true if present
-     */
-    private boolean findNodeFromTail(Node node) {
-        Node t = tail;
-        for (;;) {
-            if (t == node)
-                return true;
-            if (t == null)
-                return false;
-            t = t.prev;
-        }
-    }
-
-    /**
-     * Transfers a node from a condition queue onto sync queue.
-     * Returns true if successful.
-     * @param node the node
-     * @return true if successfully transferred (else the node was
-     * cancelled before signal).
-     */
-    final boolean transferForSignal(Node node) {
-        /*
-         * If cannot change waitStatus, the node has been cancelled.
-         */
-        if (!compareAndSetWaitStatus(node, Node.CONDITION, 0))
-            return false;
-
-        /*
-         * Splice onto queue and try to set waitStatus of predecessor to
-         * indicate that thread is (probably) waiting. If cancelled or
-         * attempt to set waitStatus fails, wake up to resync (in which
-         * case the waitStatus can be transiently and harmlessly wrong).
-         */
-        Node p = enq(node);
-        int ws = p.waitStatus;
-        if (ws > 0 || !compareAndSetWaitStatus(p, ws, Node.SIGNAL))
-            LockSupport.unpark(node.thread);
-        return true;
-    }
-
-    /**
-     * Transfers node, if necessary, to sync queue after a cancelled
-     * wait. Returns true if thread was cancelled before being
-     * signalled.
-     * @param current the waiting thread
-     * @param node its node
-     * @return true if cancelled before the node was signalled
-     */
-    final boolean transferAfterCancelledWait(Node node) {
-        if (compareAndSetWaitStatus(node, Node.CONDITION, 0)) {
-            enq(node);
-            return true;
-        }
-        /*
-         * If we lost out to a signal(), then we can't proceed
-         * until it finishes its enq().  Cancelling during an
-         * incomplete transfer is both rare and transient, so just
-         * spin.
-         */
-        while (!isOnSyncQueue(node))
-            Thread.yield();
-        return false;
-    }
-
-    /**
-     * Invokes release with current state value; returns saved state.
-     * Cancels node and throws exception on failure.
-     * @param node the condition node for this wait
-     * @return previous sync state
-     */
-    final int fullyRelease(Node node) {
-        boolean failed = true;
-        try {
-            int savedState = getState();
-            if (release(savedState)) {
-                failed = false;
-                return savedState;
-            } else {
-                throw new IllegalMonitorStateException();
-            }
-        } finally {
-            if (failed)
-                node.waitStatus = Node.CANCELLED;
-        }
-    }
-
-    // Instrumentation methods for conditions
-
-    /**
-     * Queries whether the given ConditionObject
-     * uses this synchronizer as its lock.
-     *
-     * @param condition the condition
-     * @return <tt>true</tt> if owned
-     * @throws NullPointerException if the condition is null
-     */
-    public final boolean owns(ConditionObject condition) {
-        if (condition == null)
-            throw new NullPointerException();
-        return condition.isOwnedBy(this);
-    }
-
-    /**
-     * Queries whether any threads are waiting on the given condition
-     * associated with this synchronizer. Note that because timeouts
-     * and interrupts may occur at any time, a <tt>true</tt> return
-     * does not guarantee that a future <tt>signal</tt> will awaken
-     * any threads.  This method is designed primarily for use in
-     * monitoring of the system state.
-     *
-     * @param condition the condition
-     * @return <tt>true</tt> if there are any waiting threads
-     * @throws IllegalMonitorStateException if exclusive synchronization
-     *         is not held
-     * @throws IllegalArgumentException if the given condition is
-     *         not associated with this synchronizer
-     * @throws NullPointerException if the condition is null
-     */
-    public final boolean hasWaiters(ConditionObject condition) {
-        if (!owns(condition))
-            throw new IllegalArgumentException("Not owner");
-        return condition.hasWaiters();
-    }
-
-    /**
-     * Returns an estimate of the number of threads waiting on the
-     * given condition associated with this synchronizer. Note that
-     * because timeouts and interrupts may occur at any time, the
-     * estimate serves only as an upper bound on the actual number of
-     * waiters.  This method is designed for use in monitoring of the
-     * system state, not for synchronization control.
-     *
-     * @param condition the condition
-     * @return the estimated number of waiting threads
-     * @throws IllegalMonitorStateException if exclusive synchronization
-     *         is not held
-     * @throws IllegalArgumentException if the given condition is
-     *         not associated with this synchronizer
-     * @throws NullPointerException if the condition is null
-     */
-    public final int getWaitQueueLength(ConditionObject condition) {
-        if (!owns(condition))
-            throw new IllegalArgumentException("Not owner");
-        return condition.getWaitQueueLength();
-    }
-
-    /**
-     * Returns a collection containing those threads that may be
-     * waiting on the given condition associated with this
-     * synchronizer.  Because the actual set of threads may change
-     * dynamically while constructing this result, the returned
-     * collection is only a best-effort estimate. The elements of the
-     * returned collection are in no particular order.
-     *
-     * @param condition the condition
-     * @return the collection of threads
-     * @throws IllegalMonitorStateException if exclusive synchronization
-     *         is not held
-     * @throws IllegalArgumentException if the given condition is
-     *         not associated with this synchronizer
-     * @throws NullPointerException if the condition is null
-     */
-    public final Collection<Thread> getWaitingThreads(ConditionObject condition) {
-        if (!owns(condition))
-            throw new IllegalArgumentException("Not owner");
-        return condition.getWaitingThreads();
-    }
-
-    /**
-     * Condition implementation for a {@link
-     * AbstractQueuedSynchronizer} serving as the basis of a {@link
-     * Lock} implementation.
-     *
-     * <p>Method documentation for this class describes mechanics,
-     * not behavioral specifications from the point of view of Lock
-     * and Condition users. Exported versions of this class will in
-     * general need to be accompanied by documentation describing
-     * condition semantics that rely on those of the associated
-     * <tt>AbstractQueuedSynchronizer</tt>.
-     *
-     * <p>This class is Serializable, but all fields are transient,
-     * so deserialized conditions have no waiters.
-     */
-    public class ConditionObject implements Condition, java.io.Serializable {
-        private static final long serialVersionUID = 1173984872572414699L;
-        /** First node of condition queue. */
-        private transient Node firstWaiter;
-        /** Last node of condition queue. */
-        private transient Node lastWaiter;
-
-        /**
-         * Creates a new <tt>ConditionObject</tt> instance.
-         */
-        public ConditionObject() { }
-
-        // Internal methods
-
-        /**
-         * Adds a new waiter to wait queue.
-         * @return its new wait node
-         */
-        private Node addConditionWaiter() {
-            Node t = lastWaiter;
-            // If lastWaiter is cancelled, clean out.
-            if (t != null && t.waitStatus != Node.CONDITION) {
-                unlinkCancelledWaiters();
-                t = lastWaiter;
-            }
-            Node node = new Node(Thread.currentThread(), Node.CONDITION);
-            if (t == null)
-                firstWaiter = node;
-            else
-                t.nextWaiter = node;
-            lastWaiter = node;
-            return node;
-        }
-
-        /**
-         * Removes and transfers nodes until hit non-cancelled one or
-         * null. Split out from signal in part to encourage compilers
-         * to inline the case of no waiters.
-         * @param first (non-null) the first node on condition queue
-         */
-        private void doSignal(Node first) {
-            do {
-                if ( (firstWaiter = first.nextWaiter) == null)
-                    lastWaiter = null;
-                first.nextWaiter = null;
-            } while (!transferForSignal(first) &&
-                     (first = firstWaiter) != null);
-        }
-
-        /**
-         * Removes and transfers all nodes.
-         * @param first (non-null) the first node on condition queue
-         */
-        private void doSignalAll(Node first) {
-            lastWaiter = firstWaiter = null;
-            do {
-                Node next = first.nextWaiter;
-                first.nextWaiter = null;
-                transferForSignal(first);
-                first = next;
-            } while (first != null);
-        }
-
-        /**
-         * Unlinks cancelled waiter nodes from condition queue.
-         * Called only while holding lock. This is called when
-         * cancellation occurred during condition wait, and upon
-         * insertion of a new waiter when lastWaiter is seen to have
-         * been cancelled. This method is needed to avoid garbage
-         * retention in the absence of signals. So even though it may
-         * require a full traversal, it comes into play only when
-         * timeouts or cancellations occur in the absence of
-         * signals. It traverses all nodes rather than stopping at a
-         * particular target to unlink all pointers to garbage nodes
-         * without requiring many re-traversals during cancellation
-         * storms.
-         */
-        private void unlinkCancelledWaiters() {
-            Node t = firstWaiter;
-            Node trail = null;
-            while (t != null) {
-                Node next = t.nextWaiter;
-                if (t.waitStatus != Node.CONDITION) {
-                    t.nextWaiter = null;
-                    if (trail == null)
-                        firstWaiter = next;
-                    else
-                        trail.nextWaiter = next;
-                    if (next == null)
-                        lastWaiter = trail;
-                }
-                else
-                    trail = t;
-                t = next;
-            }
-        }
-
-        // public methods
-
-        /**
-         * Moves the longest-waiting thread, if one exists, from the
-         * wait queue for this condition to the wait queue for the
-         * owning lock.
-         *
-         * @throws IllegalMonitorStateException if {@link #isHeldExclusively}
-         *         returns {@code false}
-         */
-        public final void signal() {
-            if (!isHeldExclusively())
-                throw new IllegalMonitorStateException();
-            Node first = firstWaiter;
-            if (first != null)
-                doSignal(first);
-        }
-
-        /**
-         * Moves all threads from the wait queue for this condition to
-         * the wait queue for the owning lock.
-         *
-         * @throws IllegalMonitorStateException if {@link #isHeldExclusively}
-         *         returns {@code false}
-         */
-        public final void signalAll() {
-            if (!isHeldExclusively())
-                throw new IllegalMonitorStateException();
-            Node first = firstWaiter;
-            if (first != null)
-                doSignalAll(first);
-        }
-
-        /**
-         * Implements uninterruptible condition wait.
-         * <ol>
-         * <li> Save lock state returned by {@link #getState}.
-         * <li> Invoke {@link #release} with
-         *      saved state as argument, throwing
-         *      IllegalMonitorStateException if it fails.
-         * <li> Block until signalled.
-         * <li> Reacquire by invoking specialized version of
-         *      {@link #acquire} with saved state as argument.
-         * </ol>
-         */
-        public final void awaitUninterruptibly() {
-            Node node = addConditionWaiter();
-            int savedState = fullyRelease(node);
-            boolean interrupted = false;
-            while (!isOnSyncQueue(node)) {
-                LockSupport.park(this);
-                if (Thread.interrupted())
-                    interrupted = true;
-            }
-            if (acquireQueued(node, savedState) || interrupted)
-                selfInterrupt();
-        }
-
-        /*
-         * For interruptible waits, we need to track whether to throw
-         * InterruptedException, if interrupted while blocked on
-         * condition, versus reinterrupt current thread, if
-         * interrupted while blocked waiting to re-acquire.
-         */
-
-        /** Mode meaning to reinterrupt on exit from wait */
-        private static final int REINTERRUPT =  1;
-        /** Mode meaning to throw InterruptedException on exit from wait */
-        private static final int THROW_IE    = -1;
-
-        /**
-         * Checks for interrupt, returning THROW_IE if interrupted
-         * before signalled, REINTERRUPT if after signalled, or
-         * 0 if not interrupted.
-         */
-        private int checkInterruptWhileWaiting(Node node) {
-            return Thread.interrupted() ?
-                (transferAfterCancelledWait(node) ? THROW_IE : REINTERRUPT) :
-                0;
-        }
-
-        /**
-         * Throws InterruptedException, reinterrupts current thread, or
-         * does nothing, depending on mode.
-         */
-        private void reportInterruptAfterWait(int interruptMode)
-            throws InterruptedException {
-            if (interruptMode == THROW_IE)
-                throw new InterruptedException();
-            else if (interruptMode == REINTERRUPT)
-                selfInterrupt();
-        }
-
-        /**
-         * Implements interruptible condition wait.
-         * <ol>
-         * <li> If current thread is interrupted, throw InterruptedException.
-         * <li> Save lock state returned by {@link #getState}.
-         * <li> Invoke {@link #release} with
-         *      saved state as argument, throwing
-         *      IllegalMonitorStateException if it fails.
-         * <li> Block until signalled or interrupted.
-         * <li> Reacquire by invoking specialized version of
-         *      {@link #acquire} with saved state as argument.
-         * <li> If interrupted while blocked in step 4, throw InterruptedException.
-         * </ol>
-         */
-        public final void await() throws InterruptedException {
-            if (Thread.interrupted())
-                throw new InterruptedException();
-            Node node = addConditionWaiter();
-            int savedState = fullyRelease(node);
-            int interruptMode = 0;
-            while (!isOnSyncQueue(node)) {
-                LockSupport.park(this);
-                if ((interruptMode = checkInterruptWhileWaiting(node)) != 0)
-                    break;
-            }
-            if (acquireQueued(node, savedState) && interruptMode != THROW_IE)
-                interruptMode = REINTERRUPT;
-            if (node.nextWaiter != null) // clean up if cancelled
-                unlinkCancelledWaiters();
-            if (interruptMode != 0)
-                reportInterruptAfterWait(interruptMode);
-        }
-
-        /**
-         * Implements timed condition wait.
-         * <ol>
-         * <li> If current thread is interrupted, throw InterruptedException.
-         * <li> Save lock state returned by {@link #getState}.
-         * <li> Invoke {@link #release} with
-         *      saved state as argument, throwing
-         *      IllegalMonitorStateException if it fails.
-         * <li> Block until signalled, interrupted, or timed out.
-         * <li> Reacquire by invoking specialized version of
-         *      {@link #acquire} with saved state as argument.
-         * <li> If interrupted while blocked in step 4, throw InterruptedException.
-         * </ol>
-         */
-        public final long awaitNanos(long nanosTimeout)
-                throws InterruptedException {
-            if (Thread.interrupted())
-                throw new InterruptedException();
-            Node node = addConditionWaiter();
-            int savedState = fullyRelease(node);
-            long lastTime = System.nanoTime();
-            int interruptMode = 0;
-            while (!isOnSyncQueue(node)) {
-                if (nanosTimeout <= 0L) {
-                    transferAfterCancelledWait(node);
-                    break;
-                }
-                LockSupport.parkNanos(this, nanosTimeout);
-                if ((interruptMode = checkInterruptWhileWaiting(node)) != 0)
-                    break;
-
-                long now = System.nanoTime();
-                nanosTimeout -= now - lastTime;
-                lastTime = now;
-            }
-            if (acquireQueued(node, savedState) && interruptMode != THROW_IE)
-                interruptMode = REINTERRUPT;
-            if (node.nextWaiter != null)
-                unlinkCancelledWaiters();
-            if (interruptMode != 0)
-                reportInterruptAfterWait(interruptMode);
-            return nanosTimeout - (System.nanoTime() - lastTime);
-        }
-
-        /**
-         * Implements absolute timed condition wait.
-         * <ol>
-         * <li> If current thread is interrupted, throw InterruptedException.
-         * <li> Save lock state returned by {@link #getState}.
-         * <li> Invoke {@link #release} with
-         *      saved state as argument, throwing
-         *      IllegalMonitorStateException if it fails.
-         * <li> Block until signalled, interrupted, or timed out.
-         * <li> Reacquire by invoking specialized version of
-         *      {@link #acquire} with saved state as argument.
-         * <li> If interrupted while blocked in step 4, throw InterruptedException.
-         * <li> If timed out while blocked in step 4, return false, else true.
-         * </ol>
-         */
-        public final boolean awaitUntil(Date deadline)
-                throws InterruptedException {
-            if (deadline == null)
-                throw new NullPointerException();
-            long abstime = deadline.getTime();
-            if (Thread.interrupted())
-                throw new InterruptedException();
-            Node node = addConditionWaiter();
-            int savedState = fullyRelease(node);
-            boolean timedout = false;
-            int interruptMode = 0;
-            while (!isOnSyncQueue(node)) {
-                if (System.currentTimeMillis() > abstime) {
-                    timedout = transferAfterCancelledWait(node);
-                    break;
-                }
-                LockSupport.parkUntil(this, abstime);
-                if ((interruptMode = checkInterruptWhileWaiting(node)) != 0)
-                    break;
-            }
-            if (acquireQueued(node, savedState) && interruptMode != THROW_IE)
-                interruptMode = REINTERRUPT;
-            if (node.nextWaiter != null)
-                unlinkCancelledWaiters();
-            if (interruptMode != 0)
-                reportInterruptAfterWait(interruptMode);
-            return !timedout;
-        }
-
-        /**
-         * Implements timed condition wait.
-         * <ol>
-         * <li> If current thread is interrupted, throw InterruptedException.
-         * <li> Save lock state returned by {@link #getState}.
-         * <li> Invoke {@link #release} with
-         *      saved state as argument, throwing
-         *      IllegalMonitorStateException if it fails.
-         * <li> Block until signalled, interrupted, or timed out.
-         * <li> Reacquire by invoking specialized version of
-         *      {@link #acquire} with saved state as argument.
-         * <li> If interrupted while blocked in step 4, throw InterruptedException.
-         * <li> If timed out while blocked in step 4, return false, else true.
-         * </ol>
-         */
-        public final boolean await(long time, TimeUnit unit)
-                throws InterruptedException {
-            if (unit == null)
-                throw new NullPointerException();
-            long nanosTimeout = unit.toNanos(time);
-            if (Thread.interrupted())
-                throw new InterruptedException();
-            Node node = addConditionWaiter();
-            int savedState = fullyRelease(node);
-            long lastTime = System.nanoTime();
-            boolean timedout = false;
-            int interruptMode = 0;
-            while (!isOnSyncQueue(node)) {
-                if (nanosTimeout <= 0L) {
-                    timedout = transferAfterCancelledWait(node);
-                    break;
-                }
-                if (nanosTimeout >= spinForTimeoutThreshold)
-                    LockSupport.parkNanos(this, nanosTimeout);
-                if ((interruptMode = checkInterruptWhileWaiting(node)) != 0)
-                    break;
-                long now = System.nanoTime();
-                nanosTimeout -= now - lastTime;
-                lastTime = now;
-            }
-            if (acquireQueued(node, savedState) && interruptMode != THROW_IE)
-                interruptMode = REINTERRUPT;
-            if (node.nextWaiter != null)
-                unlinkCancelledWaiters();
-            if (interruptMode != 0)
-                reportInterruptAfterWait(interruptMode);
-            return !timedout;
-        }
-
-        //  support for instrumentation
-
-        /**
-         * Returns true if this condition was created by the given
-         * synchronization object.
-         *
-         * @return {@code true} if owned
-         */
-        final boolean isOwnedBy(AbstractQueuedSynchronizer sync) {
-            return sync == AbstractQueuedSynchronizer.this;
-        }
-
-        /**
-         * Queries whether any threads are waiting on this condition.
-         * Implements {@link AbstractQueuedSynchronizer#hasWaiters}.
-         *
-         * @return {@code true} if there are any waiting threads
-         * @throws IllegalMonitorStateException if {@link #isHeldExclusively}
-         *         returns {@code false}
-         */
-        protected final boolean hasWaiters() {
-            if (!isHeldExclusively())
-                throw new IllegalMonitorStateException();
-            for (Node w = firstWaiter; w != null; w = w.nextWaiter) {
-                if (w.waitStatus == Node.CONDITION)
-                    return true;
-            }
-            return false;
-        }
-
-        /**
-         * Returns an estimate of the number of threads waiting on
-         * this condition.
-         * Implements {@link AbstractQueuedSynchronizer#getWaitQueueLength}.
-         *
-         * @return the estimated number of waiting threads
-         * @throws IllegalMonitorStateException if {@link #isHeldExclusively}
-         *         returns {@code false}
-         */
-        protected final int getWaitQueueLength() {
-            if (!isHeldExclusively())
-                throw new IllegalMonitorStateException();
-            int n = 0;
-            for (Node w = firstWaiter; w != null; w = w.nextWaiter) {
-                if (w.waitStatus == Node.CONDITION)
-                    ++n;
-            }
-            return n;
-        }
-
-        /**
-         * Returns a collection containing those threads that may be
-         * waiting on this Condition.
-         * Implements {@link AbstractQueuedSynchronizer#getWaitingThreads}.
-         *
-         * @return the collection of threads
-         * @throws IllegalMonitorStateException if {@link #isHeldExclusively}
-         *         returns {@code false}
-         */
-        protected final Collection<Thread> getWaitingThreads() {
-            if (!isHeldExclusively())
-                throw new IllegalMonitorStateException();
-            ArrayList<Thread> list = new ArrayList<Thread>();
-            for (Node w = firstWaiter; w != null; w = w.nextWaiter) {
-                if (w.waitStatus == Node.CONDITION) {
-                    Thread t = w.thread;
-                    if (t != null)
-                        list.add(t);
-                }
-            }
-            return list;
-        }
-    }
-
-    /**
-     * IKVM specific. We use AtomicReferenceFieldUpdater instead of Unsafe primitives.
-     */
-    private static final AtomicReferenceFieldUpdater<AbstractQueuedSynchronizer, Node> headUpdater = 
-        AtomicReferenceFieldUpdater.newUpdater(AbstractQueuedSynchronizer.class, Node.class, "head");
-    private static final AtomicReferenceFieldUpdater<AbstractQueuedSynchronizer, Node> tailUpdater = 
-        AtomicReferenceFieldUpdater.newUpdater(AbstractQueuedSynchronizer.class, Node.class, "tail");
-
-    /**
-     * CAS head field. Used only by enq.
-     */
-    private final boolean compareAndSetHead(Node update) {
-        return headUpdater.compareAndSet(this, null, update);
-    }
-
-    /**
-     * CAS tail field. Used only by enq.
-     */
-    private final boolean compareAndSetTail(Node expect, Node update) {
-        return tailUpdater.compareAndSet(this, expect, update);
-    }
-
-    /**
-     * CAS waitStatus field of a node.
-     */
-    private static final native boolean compareAndSetWaitStatus(Node node,
-                                                         int expect,
-                                                         int update); // implemented in map.xml
-    /**
-     * CAS next field of a node.
-     */
-    private static final boolean compareAndSetNext(Node node,
-                                                   Node expect,
-                                                   Node update) {
-        return Node.nextUpdater.compareAndSet(node, expect, update);
-    }
-}
diff --git a/openjdk/java/util/concurrent/locks/LockSupport.java b/openjdk/java/util/concurrent/locks/LockSupport.java
deleted file mode 100644
index 45a38112..00000000
--- a/openjdk/java/util/concurrent/locks/LockSupport.java
+++ /dev/null
@@ -1,456 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * This file is available under and governed by the GNU General Public
- * License version 2 only, as published by the Free Software Foundation.
- * However, the following notice accompanied the original version of this
- * file:
- *
- * Written by Doug Lea with assistance from members of JCP JSR-166
- * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-package java.util.concurrent.locks;
-
-/**
- * Basic thread blocking primitives for creating locks and other
- * synchronization classes.
- *
- * <p>This class associates, with each thread that uses it, a permit
- * (in the sense of the {@link java.util.concurrent.Semaphore
- * Semaphore} class). A call to {@code park} will return immediately
- * if the permit is available, consuming it in the process; otherwise
- * it <em>may</em> block.  A call to {@code unpark} makes the permit
- * available, if it was not already available. (Unlike with Semaphores
- * though, permits do not accumulate. There is at most one.)
- *
- * <p>Methods {@code park} and {@code unpark} provide efficient
- * means of blocking and unblocking threads that do not encounter the
- * problems that cause the deprecated methods {@code Thread.suspend}
- * and {@code Thread.resume} to be unusable for such purposes: Races
- * between one thread invoking {@code park} and another thread trying
- * to {@code unpark} it will preserve liveness, due to the
- * permit. Additionally, {@code park} will return if the caller's
- * thread was interrupted, and timeout versions are supported. The
- * {@code park} method may also return at any other time, for "no
- * reason", so in general must be invoked within a loop that rechecks
- * conditions upon return. In this sense {@code park} serves as an
- * optimization of a "busy wait" that does not waste as much time
- * spinning, but must be paired with an {@code unpark} to be
- * effective.
- *
- * <p>The three forms of {@code park} each also support a
- * {@code blocker} object parameter. This object is recorded while
- * the thread is blocked to permit monitoring and diagnostic tools to
- * identify the reasons that threads are blocked. (Such tools may
- * access blockers using method {@link #getBlocker(Thread)}.)
- * The use of these forms rather than the original forms without this
- * parameter is strongly encouraged. The normal argument to supply as
- * a {@code blocker} within a lock implementation is {@code this}.
- *
- * <p>These methods are designed to be used as tools for creating
- * higher-level synchronization utilities, and are not in themselves
- * useful for most concurrency control applications.  The {@code park}
- * method is designed for use only in constructions of the form:
- *
- *  <pre> {@code
- * while (!canProceed()) { ... LockSupport.park(this); }}</pre>
- *
- * where neither {@code canProceed} nor any other actions prior to the
- * call to {@code park} entail locking or blocking.  Because only one
- * permit is associated with each thread, any intermediary uses of
- * {@code park} could interfere with its intended effects.
- *
- * <p><b>Sample Usage.</b> Here is a sketch of a first-in-first-out
- * non-reentrant lock class:
- *  <pre> {@code
- * class FIFOMutex {
- *   private final AtomicBoolean locked = new AtomicBoolean(false);
- *   private final Queue<Thread> waiters
- *     = new ConcurrentLinkedQueue<Thread>();
- *
- *   public void lock() {
- *     boolean wasInterrupted = false;
- *     Thread current = Thread.currentThread();
- *     waiters.add(current);
- *
- *     // Block while not first in queue or cannot acquire lock
- *     while (waiters.peek() != current ||
- *            !locked.compareAndSet(false, true)) {
- *       LockSupport.park(this);
- *       if (Thread.interrupted()) // ignore interrupts while waiting
- *         wasInterrupted = true;
- *     }
- *
- *     waiters.remove();
- *     if (wasInterrupted)          // reassert interrupt status on exit
- *       current.interrupt();
- *   }
- *
- *   public void unlock() {
- *     locked.set(false);
- *     LockSupport.unpark(waiters.peek());
- *   }
- * }}</pre>
- */
-public class LockSupport {
-    private LockSupport() {} // Cannot be instantiated.
-
-    private static void setBlocker(Thread t, Object arg) {
-        t.parkBlocker = arg;
-    }
-
-    private static final int PARK_STATE_RUNNING = 0;
-    private static final int PARK_STATE_PERMIT = 1;
-    private static final int PARK_STATE_PARKED = 2;
-
-    // these native methods are all implemented in map.xml
-    private static native int cmpxchgParkState(Thread t, int newValue, int comparand);
-    private static native Object getParkLock(Thread t);
-    private static native void setParkLock(Thread t, Object obj);
-
-    /**
-     * Makes available the permit for the given thread, if it
-     * was not already available.  If the thread was blocked on
-     * {@code park} then it will unblock.  Otherwise, its next call
-     * to {@code park} is guaranteed not to block. This operation
-     * is not guaranteed to have any effect at all if the given
-     * thread has not been started.
-     *
-     * @param thread the thread to unpark, or {@code null}, in which case
-     *        this operation has no effect
-     */
-    public static void unpark(Thread thread) {
-        if (thread != null)
-        {
-            if (cmpxchgParkState(thread, PARK_STATE_PERMIT, PARK_STATE_RUNNING) == PARK_STATE_PARKED)
-            {
-                if (cmpxchgParkState(thread, PARK_STATE_RUNNING, PARK_STATE_PARKED) == PARK_STATE_PARKED)
-                {
-                    // thread is currently blocking, so we have to release it
-                    Object lock = getParkLock(thread);
-                    synchronized (lock)
-                    {
-                        lock.notify();
-                    }
-                }
-            }
-        }
-    }
-
-    private static void parkImpl(Thread currentThread, boolean deadline, long nanos)
-    {
-        if (cmpxchgParkState(currentThread, PARK_STATE_RUNNING, PARK_STATE_PERMIT) == PARK_STATE_PERMIT)
-        {
-            // we consumed a permit
-            return;
-        }
-
-        Object lock = getParkLock(currentThread);
-        if (lock == null)
-        {
-            // we lazily allocate the lock object
-            lock = new Object();
-            setParkLock(currentThread, lock);
-        }
-        synchronized (lock)
-        {
-            if (cmpxchgParkState(currentThread, PARK_STATE_PARKED, PARK_STATE_RUNNING) == PARK_STATE_PERMIT)
-            {
-                // entering the parked state failed because we got a permit after the previous permit test
-                // release the permit and return
-                cmpxchgParkState(currentThread, PARK_STATE_RUNNING, PARK_STATE_PERMIT);
-                return;
-            }
-            if (deadline)
-            {
-                nanos -= System.currentTimeMillis() * 1000000;
-            }
-            if (nanos >= 0)
-            {
-                try
-                {
-                    lock.wait(nanos / 1000000, (int)(nanos % 1000000));
-                }
-                catch (InterruptedException _)
-                {
-                    currentThread.interrupt();
-                }
-            }
-            cmpxchgParkState(currentThread, PARK_STATE_RUNNING, PARK_STATE_PARKED);
-        }
-    }
-
-    /**
-     * Disables the current thread for thread scheduling purposes unless the
-     * permit is available.
-     *
-     * <p>If the permit is available then it is consumed and the call returns
-     * immediately; otherwise
-     * the current thread becomes disabled for thread scheduling
-     * purposes and lies dormant until one of three things happens:
-     *
-     * <ul>
-     * <li>Some other thread invokes {@link #unpark unpark} with the
-     * current thread as the target; or
-     *
-     * <li>Some other thread {@linkplain Thread#interrupt interrupts}
-     * the current thread; or
-     *
-     * <li>The call spuriously (that is, for no reason) returns.
-     * </ul>
-     *
-     * <p>This method does <em>not</em> report which of these caused the
-     * method to return. Callers should re-check the conditions which caused
-     * the thread to park in the first place. Callers may also determine,
-     * for example, the interrupt status of the thread upon return.
-     *
-     * @param blocker the synchronization object responsible for this
-     *        thread parking
-     * @since 1.6
-     */
-    public static void park(Object blocker) {
-        Thread t = Thread.currentThread();
-        setBlocker(t, blocker);
-        parkImpl(t, false, 0L);
-        setBlocker(t, null);
-    }
-
-    /**
-     * Disables the current thread for thread scheduling purposes, for up to
-     * the specified waiting time, unless the permit is available.
-     *
-     * <p>If the permit is available then it is consumed and the call
-     * returns immediately; otherwise the current thread becomes disabled
-     * for thread scheduling purposes and lies dormant until one of four
-     * things happens:
-     *
-     * <ul>
-     * <li>Some other thread invokes {@link #unpark unpark} with the
-     * current thread as the target; or
-     *
-     * <li>Some other thread {@linkplain Thread#interrupt interrupts}
-     * the current thread; or
-     *
-     * <li>The specified waiting time elapses; or
-     *
-     * <li>The call spuriously (that is, for no reason) returns.
-     * </ul>
-     *
-     * <p>This method does <em>not</em> report which of these caused the
-     * method to return. Callers should re-check the conditions which caused
-     * the thread to park in the first place. Callers may also determine,
-     * for example, the interrupt status of the thread, or the elapsed time
-     * upon return.
-     *
-     * @param blocker the synchronization object responsible for this
-     *        thread parking
-     * @param nanos the maximum number of nanoseconds to wait
-     * @since 1.6
-     */
-    public static void parkNanos(Object blocker, long nanos) {
-        if (nanos > 0) {
-            Thread t = Thread.currentThread();
-            setBlocker(t, blocker);
-            parkImpl(t, false, nanos);
-            setBlocker(t, null);
-        }
-    }
-
-    /**
-     * Disables the current thread for thread scheduling purposes, until
-     * the specified deadline, unless the permit is available.
-     *
-     * <p>If the permit is available then it is consumed and the call
-     * returns immediately; otherwise the current thread becomes disabled
-     * for thread scheduling purposes and lies dormant until one of four
-     * things happens:
-     *
-     * <ul>
-     * <li>Some other thread invokes {@link #unpark unpark} with the
-     * current thread as the target; or
-     *
-     * <li>Some other thread {@linkplain Thread#interrupt interrupts} the
-     * current thread; or
-     *
-     * <li>The specified deadline passes; or
-     *
-     * <li>The call spuriously (that is, for no reason) returns.
-     * </ul>
-     *
-     * <p>This method does <em>not</em> report which of these caused the
-     * method to return. Callers should re-check the conditions which caused
-     * the thread to park in the first place. Callers may also determine,
-     * for example, the interrupt status of the thread, or the current time
-     * upon return.
-     *
-     * @param blocker the synchronization object responsible for this
-     *        thread parking
-     * @param deadline the absolute time, in milliseconds from the Epoch,
-     *        to wait until
-     * @since 1.6
-     */
-    public static void parkUntil(Object blocker, long deadline) {
-        Thread t = Thread.currentThread();
-        setBlocker(t, blocker);
-        parkImpl(t, true, deadline * 1000000);
-        setBlocker(t, null);
-    }
-
-    /**
-     * Returns the blocker object supplied to the most recent
-     * invocation of a park method that has not yet unblocked, or null
-     * if not blocked.  The value returned is just a momentary
-     * snapshot -- the thread may have since unblocked or blocked on a
-     * different blocker object.
-     *
-     * @param t the thread
-     * @return the blocker
-     * @throws NullPointerException if argument is null
-     * @since 1.6
-     */
-    public static Object getBlocker(Thread t) {
-        if (t == null)
-            throw new NullPointerException();
-        return t.parkBlocker;
-    }
-
-    /**
-     * Disables the current thread for thread scheduling purposes unless the
-     * permit is available.
-     *
-     * <p>If the permit is available then it is consumed and the call
-     * returns immediately; otherwise the current thread becomes disabled
-     * for thread scheduling purposes and lies dormant until one of three
-     * things happens:
-     *
-     * <ul>
-     *
-     * <li>Some other thread invokes {@link #unpark unpark} with the
-     * current thread as the target; or
-     *
-     * <li>Some other thread {@linkplain Thread#interrupt interrupts}
-     * the current thread; or
-     *
-     * <li>The call spuriously (that is, for no reason) returns.
-     * </ul>
-     *
-     * <p>This method does <em>not</em> report which of these caused the
-     * method to return. Callers should re-check the conditions which caused
-     * the thread to park in the first place. Callers may also determine,
-     * for example, the interrupt status of the thread upon return.
-     */
-    public static void park() {
-        parkImpl(Thread.currentThread(), false, 0L);
-    }
-
-    /**
-     * Disables the current thread for thread scheduling purposes, for up to
-     * the specified waiting time, unless the permit is available.
-     *
-     * <p>If the permit is available then it is consumed and the call
-     * returns immediately; otherwise the current thread becomes disabled
-     * for thread scheduling purposes and lies dormant until one of four
-     * things happens:
-     *
-     * <ul>
-     * <li>Some other thread invokes {@link #unpark unpark} with the
-     * current thread as the target; or
-     *
-     * <li>Some other thread {@linkplain Thread#interrupt interrupts}
-     * the current thread; or
-     *
-     * <li>The specified waiting time elapses; or
-     *
-     * <li>The call spuriously (that is, for no reason) returns.
-     * </ul>
-     *
-     * <p>This method does <em>not</em> report which of these caused the
-     * method to return. Callers should re-check the conditions which caused
-     * the thread to park in the first place. Callers may also determine,
-     * for example, the interrupt status of the thread, or the elapsed time
-     * upon return.
-     *
-     * @param nanos the maximum number of nanoseconds to wait
-     */
-    public static void parkNanos(long nanos) {
-        if (nanos > 0)
-            parkImpl(Thread.currentThread(), false, nanos);
-    }
-
-    /**
-     * Disables the current thread for thread scheduling purposes, until
-     * the specified deadline, unless the permit is available.
-     *
-     * <p>If the permit is available then it is consumed and the call
-     * returns immediately; otherwise the current thread becomes disabled
-     * for thread scheduling purposes and lies dormant until one of four
-     * things happens:
-     *
-     * <ul>
-     * <li>Some other thread invokes {@link #unpark unpark} with the
-     * current thread as the target; or
-     *
-     * <li>Some other thread {@linkplain Thread#interrupt interrupts}
-     * the current thread; or
-     *
-     * <li>The specified deadline passes; or
-     *
-     * <li>The call spuriously (that is, for no reason) returns.
-     * </ul>
-     *
-     * <p>This method does <em>not</em> report which of these caused the
-     * method to return. Callers should re-check the conditions which caused
-     * the thread to park in the first place. Callers may also determine,
-     * for example, the interrupt status of the thread, or the current time
-     * upon return.
-     *
-     * @param deadline the absolute time, in milliseconds from the Epoch,
-     *        to wait until
-     */
-    public static void parkUntil(long deadline) {
-        parkImpl(Thread.currentThread(), true, deadline * 1000000);
-    }
-
-    /**
-     * Returns the pseudo-randomly initialized or updated secondary seed.
-     * Copied from ThreadLocalRandom due to package access restrictions.
-     */
-    static final int nextSecondarySeed() {
-        int r;
-        Thread t = Thread.currentThread();
-        if ((r = t.threadLocalRandomSecondarySeed) != 0) {
-            r ^= r << 13;   // xorshift
-            r ^= r >>> 17;
-            r ^= r << 5;
-        }
-        else if ((r = java.util.concurrent.ThreadLocalRandom.current().nextInt()) == 0)
-            r = 1; // avoid zero
-        t.threadLocalRandomSecondarySeed = r;
-        return r;
-    }
-
-}
diff --git a/openjdk/java/util/zip/Adler32.java b/openjdk/java/util/zip/Adler32.java
deleted file mode 100644
index fc1536aa..00000000
--- a/openjdk/java/util/zip/Adler32.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/* Adler32.java - Computes Adler32 data checksum of a data stream
-   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package java.util.zip;
-
-/*
- * Written using on-line Java Platform 1.2 API Specification, as well
- * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
- * The actual Adler32 algorithm is taken from RFC 1950.
- * Status:  Believed complete and correct.
- */
-
-/**
- * Computes Adler32 checksum for a stream of data. An Adler32 
- * checksum is not as reliable as a CRC32 checksum, but a lot faster to 
- * compute.
- *<p>
- * The specification for Adler32 may be found in RFC 1950.
- * (ZLIB Compressed Data Format Specification version 3.3)
- *<p>
- *<p>
- * From that document:
- *<p>
- *      "ADLER32 (Adler-32 checksum)
- *       This contains a checksum value of the uncompressed data
- *       (excluding any dictionary data) computed according to Adler-32
- *       algorithm. This algorithm is a 32-bit extension and improvement
- *       of the Fletcher algorithm, used in the ITU-T X.224 / ISO 8073
- *       standard. 
- *<p>
- *       Adler-32 is composed of two sums accumulated per byte: s1 is
- *       the sum of all bytes, s2 is the sum of all s1 values. Both sums
- *       are done modulo 65521. s1 is initialized to 1, s2 to zero.  The
- *       Adler-32 checksum is stored as s2*65536 + s1 in most-
- *       significant-byte first (network) order."
- *<p>
- * "8.2. The Adler-32 algorithm
- *<p>
- *    The Adler-32 algorithm is much faster than the CRC32 algorithm yet
- *    still provides an extremely low probability of undetected errors.
- *<p>
- *    The modulo on unsigned long accumulators can be delayed for 5552
- *    bytes, so the modulo operation time is negligible.  If the bytes
- *    are a, b, c, the second sum is 3a + 2b + c + 3, and so is position
- *    and order sensitive, unlike the first sum, which is just a
- *    checksum.  That 65521 is prime is important to avoid a possible
- *    large class of two-byte errors that leave the check unchanged.
- *    (The Fletcher checksum uses 255, which is not prime and which also
- *    makes the Fletcher check insensitive to single byte changes 0 <->
- *    255.)
- *<p>
- *    The sum s1 is initialized to 1 instead of zero to make the length
- *    of the sequence part of s2, so that the length does not have to be
- *   checked separately. (Any sequence of zeroes has a Fletcher
- *    checksum of zero.)"
- *
- * @author John Leuner, Per Bothner
- * @since JDK 1.1
- *
- * @see InflaterInputStream
- * @see DeflaterOutputStream
- */
-public class Adler32 implements Checksum
-{
-
-  /** largest prime smaller than 65536 */
-  private static final int BASE = 65521;
-
-  private int adler; //we do all in int.
-
-  //Note that java doesn't have unsigned integers,
-  //so we have to be careful with what arithmetic 
-  //we do. We return the checksum as a long to 
-  //avoid sign confusion.
-
-  /**
-   * Creates a new instance of the <code>Adler32</code> class. 
-   * The checksum starts off with a value of 1. 
-   */
-  public Adler32 ()
-  {
-    reset();
-  }
-
-  /**
-   * Resets the Adler32 checksum to the initial value.
-   */
-  public void reset () 
-  {
-    adler = 1; //Initialize to 1    
-  }
-
-  /**
-   * Updates the checksum with the byte b. 
-   *
-   * @param bval the data value to add. The high byte of the int is ignored.
-   */
-  public void update (int bval)
-  {
-    //We could make a length 1 byte array and call update again, but I
-    //would rather not have that overhead
-    int s1 = adler & 0xffff;
-    int s2 = adler >>> 16;
-    
-    s1 = (s1 + (bval & 0xFF)) % BASE;
-    s2 = (s1 + s2) % BASE;
-    
-    adler = (s2 << 16) + s1;
-  }
-
-  /**
-   * Updates the checksum with the bytes taken from the array. 
-   * 
-   * @param buffer an array of bytes
-   */
-  public void update (byte[] buffer)
-  {
-    update(buffer, 0, buffer.length);
-  }
-
-  /**
-   * Updates the checksum with the bytes taken from the array. 
-   * 
-   * @param buf an array of bytes
-   * @param off the start of the data used for this update
-   * @param len the number of bytes to use for this update
-   */
-  public void update (byte[] buf, int off, int len)
-  {
-    //(By Per Bothner)
-    int s1 = adler & 0xffff;
-    int s2 = adler >>> 16;
-
-    while (len > 0)
-      {
-        // We can defer the modulo operation:
-        // s1 maximally grows from 65521 to 65521 + 255 * 3800
-        // s2 maximally grows by 3800 * median(s1) = 2090079800 < 2^31
-        int n = 3800;
-        if (n > len)
-          n = len;
-        len -= n;
-        while (--n >= 0)
-          {
-            s1 = s1 + (buf[off++] & 0xFF);
-            s2 = s2 + s1;
-          }
-        s1 %= BASE;
-        s2 %= BASE;
-      }
-
-    /*Old implementation, borrowed from somewhere:
-    int n;
-    
-    while (len-- > 0) {
-
-      s1 = (s1 + (bs[offset++] & 0xff)) % BASE; 
-      s2 = (s2 + s1) % BASE;
-    }*/
-    
-    adler = (s2 << 16) | s1;
-  }
-
-  /**
-   * Returns the Adler32 data checksum computed so far.
-   */
-  public long getValue()
-  {
-    return (long) adler & 0xffffffffL;
-  }
-}
diff --git a/openjdk/java/util/zip/CRC32.java b/openjdk/java/util/zip/CRC32.java
deleted file mode 100644
index cea9a848..00000000
--- a/openjdk/java/util/zip/CRC32.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/* CRC32.java - Computes CRC32 data checksum of a data stream
-   Copyright (C) 1999. 2000, 2001 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package java.util.zip;
-
-/*
- * Written using on-line Java Platform 1.2 API Specification, as well
- * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
- * The actual CRC32 algorithm is taken from RFC 1952.
- * Status:  Believed complete and correct.
- */
-
-/**
- * Computes CRC32 data checksum of a data stream.
- * The actual CRC32 algorithm is described in RFC 1952
- * (GZIP file format specification version 4.3).
- * Can be used to get the CRC32 over a stream if used with checked input/output
- * streams.
- *
- * @see InflaterInputStream
- * @see DeflaterOutputStream
- *
- * @author Per Bothner
- * @date April 1, 1999.
- */
-public class CRC32 implements Checksum
-{
-  /** The crc data checksum so far. */
-  private int crc = 0;
-
-  /** The fast CRC table. Computed once when the CRC32 class is loaded. */
-  private static int[] crc_table = make_crc_table();
-
-  /** Make the table for a fast CRC. */
-  private static int[] make_crc_table ()
-  {
-    int[] crc_table = new int[256];
-    for (int n = 0; n < 256; n++)
-      {
-        int c = n;
-        for (int k = 8;  --k >= 0; )
-          {
-            if ((c & 1) != 0)
-              c = 0xedb88320 ^ (c >>> 1);
-            else
-              c = c >>> 1;
-          }
-        crc_table[n] = c;
-      }
-    return crc_table;
-  }
-
-  /**
-   * Returns the CRC32 data checksum computed so far.
-   */
-  public long getValue ()
-  {
-    return (long) crc & 0xffffffffL;
-  }
-
-  /**
-   * Resets the CRC32 data checksum as if no update was ever called.
-   */
-  public void reset () { crc = 0; }
-
-  /**
-   * Updates the checksum with the int bval. 
-   *
-   * @param bval (the byte is taken as the lower 8 bits of bval)
-   */
-
-  public void update (int bval)
-  {
-    int c = ~crc;
-    c = crc_table[(c ^ bval) & 0xff] ^ (c >>> 8);
-    crc = ~c;
-  }
-
-  /**
-   * Adds the byte array to the data checksum.
-   *
-   * @param buf the buffer which contains the data
-   * @param off the offset in the buffer where the data starts
-   * @param len the length of the data
-   */
-  public void update (byte[] buf, int off, int len)
-  {
-    int c = ~crc;
-    while (--len >= 0)
-      c = crc_table[(c ^ buf[off++]) & 0xff] ^ (c >>> 8);
-    crc = ~c;
-  }
-
-  /**
-   * Adds the complete byte array to the data checksum.
-   */
-  public void update (byte[] buf) { update(buf, 0, buf.length); }
-}
diff --git a/openjdk/java/util/zip/ClassStubZipEntry.java b/openjdk/java/util/zip/ClassStubZipEntry.java
deleted file mode 100644
index 6a2a6df5..00000000
--- a/openjdk/java/util/zip/ClassStubZipEntry.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-  Copyright (C) 2013 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-package java.util.zip;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.util.LinkedHashMap;
-
-final class ClassStubZipEntry extends ZipEntry
-{
-    private final String zipFilePath;
-
-    ClassStubZipEntry(String zipFilePath, String name)
-    {
-        super(name);
-        this.zipFilePath = zipFilePath;
-    }
-
-    private File getFile()
-    {
-        return new File(new File(zipFilePath).getParentFile().getParentFile(), "classes" + File.separator + name);
-    }
-
-    public long getSize()
-    {
-        if (size == -1)
-        {
-            size = getFile().length();
-        }
-        return size;
-    }
-
-    public long getCompressedSize()
-    {
-        if (csize == -1)
-        {
-            csize = getSize();
-        }
-        return csize;
-    }
-
-    public long getCrc()
-    {
-        if (crc == -1)
-        {
-            crc = computeCrc();
-        }
-        return crc;
-    }
-
-    private long computeCrc()
-    {
-        try (InputStream in = getInputStream())
-        {
-            CRC32 crc = new CRC32();
-            int b;
-            while ((b = in.read()) != -1)
-            {
-                crc.update(b);
-            }
-            return crc.getValue();
-        }
-        catch (IOException _)
-        {
-            return 0;
-        }
-    }
-
-    final InputStream getInputStream() throws IOException
-    {
-        return new FileInputStream(getFile());
-    }
-
-    static native void expandIkvmClasses(ZipFile zipFile, LinkedHashMap<String, ZipEntry> entries);
-}
diff --git a/openjdk/java/util/zip/Deflater.java b/openjdk/java/util/zip/Deflater.java
deleted file mode 100644
index 3c2a48ef..00000000
--- a/openjdk/java/util/zip/Deflater.java
+++ /dev/null
@@ -1,569 +0,0 @@
-/* Deflater.java - Compress a data stream
-   Copyright (C) 1999, 2000, 2001, 2004, 2005, 2011
-   Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package java.util.zip;
-
-/**
- * This is the Deflater class.  The deflater class compresses input
- * with the deflate algorithm described in RFC 1951.  It has several
- * compression levels and three different strategies described below.
- * 
- * This class is <i>not</i> thread safe.  This is inherent in the API, due
- * to the split of deflate and setInput.
- * 
- * @author Jochen Hoenicke
- * @author Tom Tromey
- */
-public class Deflater
-{
-  /**
-   * The best and slowest compression level.  This tries to find very
-   * long and distant string repetitions.  
-   */
-  public static final int BEST_COMPRESSION = 9;
-  /**
-   * The worst but fastest compression level.  
-   */
-  public static final int BEST_SPEED = 1;
-  /**
-   * The default compression level.
-   */
-  public static final int DEFAULT_COMPRESSION = -1;
-  /**
-   * This level won't compress at all but output uncompressed blocks.
-   */
-  public static final int NO_COMPRESSION = 0;
-
-  /**
-   * Flush operation.
-   */
-  public static final int NO_FLUSH = 0;
-  public static final int SYNC_FLUSH = 2;
-  public static final int FULL_FLUSH = 3;
-
-  /**
-   * The default strategy.
-   */
-  public static final int DEFAULT_STRATEGY = 0;
-  /**
-   * This strategy will only allow longer string repetitions.  It is
-   * useful for random data with a small character set.
-   */
-  public static final int FILTERED = 1;
-
-  /** 
-   * This strategy will not look for string repetitions at all.  It
-   * only encodes with Huffman trees (which means, that more common
-   * characters get a smaller encoding.  
-   */
-  public static final int HUFFMAN_ONLY = 2;
-
-  /**
-   * The compression method.  This is the only method supported so far.
-   * There is no need to use this constant at all.
-   */
-  public static final int DEFLATED = 8;
-
-  /*
-   * The Deflater can do the following state transitions:
-   *
-   * (1) -> INIT_STATE   ----> INIT_FINISHING_STATE ---.
-   *        /  | (2)      (5)                         |
-   *       /   v          (5)                         |
-   *   (3)| SETDICT_STATE ---> SETDICT_FINISHING_STATE |(3)
-   *       \   | (3)                 |        ,-------'
-   *        |  |                     | (3)   /
-   *        v  v          (5)        v      v
-   * (1) -> BUSY_STATE   ----> FINISHING_STATE
-   *                                | (6)
-   *                                v
-   *                           FINISHED_STATE
-   *    \_____________________________________/
-   *          | (7)
-   *          v
-   *        CLOSED_STATE
-   *
-   * (1) If we should produce a header we start in INIT_STATE, otherwise
-   *     we start in BUSY_STATE.
-   * (2) A dictionary may be set only when we are in INIT_STATE, then
-   *     we change the state as indicated.
-   * (3) Whether a dictionary is set or not, on the first call of deflate
-   *     we change to BUSY_STATE.
-   * (4) -- intentionally left blank -- :)
-   * (5) FINISHING_STATE is entered, when flush() is called to indicate that
-   *     there is no more INPUT.  There are also states indicating, that
-   *     the header wasn't written yet.
-   * (6) FINISHED_STATE is entered, when everything has been flushed to the
-   *     internal pending output buffer.
-   * (7) At any time (7)
-   * 
-   */
-
-  private static final int IS_SETDICT              = 0x01;
-  private static final int IS_FINISHING            = 0x08;
-  
-  private static final int INIT_STATE              = 0x00;
-  private static final int SETDICT_STATE           = 0x01;
-  private static final int INIT_FINISHING_STATE    = 0x08;
-  private static final int SETDICT_FINISHING_STATE = 0x09;
-  private static final int BUSY_STATE              = 0x10;
-  private static final int FINISHING_STATE         = 0x18;
-  private static final int FINISHED_STATE          = 0x1e;
-  private static final int CLOSED_STATE            = 0x7f;
-
-  /** Compression level. */
-  private int level;
-
-  /** should we include a header. */
-  private boolean noHeader;
-
-  /** The current state. */
-  private int state;
-
-  /** The flush level the previous deflate call used. */
-  private int lastFlush;
-
-  /** The total bytes of output written. */
-  private long totalOut;
- 
-  /** The pending output. */
-  private DeflaterPending pending;
-
-  /** The deflater engine. */
-  private DeflaterEngine engine;
-
-  /**
-   * Creates a new deflater with default compression level.
-   */
-  public Deflater()
-  {
-    this(DEFAULT_COMPRESSION, false);
-  }
-
-  /**
-   * Creates a new deflater with given compression level.
-   * @param lvl the compression level, a value between NO_COMPRESSION
-   * and BEST_COMPRESSION, or DEFAULT_COMPRESSION.  
-   * @exception IllegalArgumentException if lvl is out of range.
-   */
-  public Deflater(int lvl)
-  {
-    this(lvl, false);
-  }
-
-  /**
-   * Creates a new deflater with given compression level.
-   * @param lvl the compression level, a value between NO_COMPRESSION
-   * and BEST_COMPRESSION.  
-   * @param nowrap true, iff we should suppress the deflate header at the
-   * beginning and the adler checksum at the end of the output.  This is
-   * useful for the GZIP format.
-   * @exception IllegalArgumentException if lvl is out of range.
-   */
-  public Deflater(int lvl, boolean nowrap)
-  {
-    if (lvl == DEFAULT_COMPRESSION)
-      lvl = 6;
-    else if (lvl < NO_COMPRESSION || lvl > BEST_COMPRESSION)
-      throw new IllegalArgumentException();
-
-    pending = new DeflaterPending();
-    engine = new DeflaterEngine(pending);
-    this.noHeader = nowrap;
-    setStrategy(DEFAULT_STRATEGY);
-    setLevel(lvl);
-    reset();
-  }
-
-  /** 
-   * Resets the deflater.  The deflater acts afterwards as if it was
-   * just created with the same compression level and strategy as it
-   * had before.  
-   */
-  public void reset() 
-  {
-    state = (noHeader ? BUSY_STATE : INIT_STATE);
-    totalOut = 0;
-    pending.reset();
-    engine.reset();
-  }
-  
-  /**
-   * Frees all objects allocated by the compressor.  There's no
-   * reason to call this, since you can just rely on garbage
-   * collection.  Exists only for compatibility against Sun's JDK,
-   * where the compressor allocates native memory.
-   * If you call any method (even reset) afterwards the behaviour is
-   * <i>undefined</i>.  
-   */
-  public void end()
-  {
-    engine = null;
-    pending = null;
-    state = CLOSED_STATE;
-  }
-
-  /** 
-   * Gets the current adler checksum of the data that was processed so
-   * far.
-   */
-  public int getAdler()
-  {
-    return engine.getAdler();
-  }
-
-  /** 
-   * Gets the number of input bytes processed so far.
-   */
-  public int getTotalIn()
-  {
-    return (int) engine.getTotalIn();
-  }
-
-  /** 
-   * Gets the number of input bytes processed so far.
-   * @since 1.5
-   */
-  public long getBytesRead()
-  {
-    return engine.getTotalIn();
-  }
-
-  /** 
-   * Gets the number of output bytes so far.
-   */
-  public int getTotalOut()
-  {
-    return (int) totalOut;
-  }
-
-  /** 
-   * Gets the number of output bytes so far.
-   * @since 1.5
-   */
-  public long getBytesWritten()
-  {
-    return totalOut;
-  }
-
-  /** 
-   * Finalizes this object.
-   */
-  protected void finalize()
-  {
-    /* Exists solely for compatibility.  We don't have any native state. */
-  }
-
-  /** 
-   * Finishes the deflater with the current input block.  It is an error
-   * to give more input after this method was called.  This method must
-   * be called to force all bytes to be flushed.
-   */
-  public void finish() {
-    state |= IS_FINISHING;
-  }
-
-  /** 
-   * Returns true iff the stream was finished and no more output bytes
-   * are available.
-   */
-  public boolean finished()
-  {
-    return state == FINISHED_STATE && pending.isFlushed();
-  }
-
-  /**
-   * Returns true, if the input buffer is empty.
-   * You should then call setInput(). <br>
-   *
-   * <em>NOTE</em>: This method can also return true when the stream
-   * was finished.  
-   */
-  public boolean needsInput()
-  {
-    return engine.needsInput();
-  }
-
-  /**
-   * Sets the data which should be compressed next.  This should be only
-   * called when needsInput indicates that more input is needed.
-   * If you call setInput when needsInput() returns false, the
-   * previous input that is still pending will be thrown away.
-   * The given byte array should not be changed, before needsInput() returns
-   * true again.
-   * This call is equivalent to <code>setInput(input, 0, input.length)</code>.
-   * @param input the buffer containing the input data.
-   * @exception IllegalStateException if the buffer was finished() or ended().
-   */
-  public void setInput(byte[] input)
-  {
-    setInput(input, 0, input.length);
-  }
-
-  /**
-   * Sets the data which should be compressed next.  This should be
-   * only called when needsInput indicates that more input is needed.
-   * The given byte array should not be changed, before needsInput() returns
-   * true again.
-   * @param input the buffer containing the input data.
-   * @param off the start of the data.
-   * @param len the length of the data.  
-   * @exception IllegalStateException if the buffer was finished() or ended()
-   * or if previous input is still pending.
-   */
-  public void setInput(byte[] input, int off, int len)
-  {
-    if (input == null)
-        throw new NullPointerException();
-    if (off < 0 || len < 0 || off > input.length - len)
-        throw new ArrayIndexOutOfBoundsException();
-    engine.setInput(input, off, len);
-  }
-
-  /** 
-   * Sets the compression level.  There is no guarantee of the exact
-   * position of the change, but if you call this when needsInput is
-   * true the change of compression level will occur somewhere near
-   * before the end of the so far given input.  
-   * @param lvl the new compression level.
-   */
-  public void setLevel(int lvl)
-  {
-    if (lvl == DEFAULT_COMPRESSION)
-      lvl = 6;
-    else if (lvl < NO_COMPRESSION || lvl > BEST_COMPRESSION)
-      throw new IllegalArgumentException();
-
-
-    if (level != lvl)
-      {
-        level = lvl;
-        engine.setLevel(lvl);
-      }
-  }
-
-  /** 
-   * Sets the compression strategy. Strategy is one of
-   * DEFAULT_STRATEGY, HUFFMAN_ONLY and FILTERED.  For the exact
-   * position where the strategy is changed, the same as for
-   * setLevel() applies.
-   * @param stgy the new compression strategy.
-   */
-  public void setStrategy(int stgy)
-  {
-    if (stgy != DEFAULT_STRATEGY && stgy != FILTERED
-        && stgy != HUFFMAN_ONLY)
-      throw new IllegalArgumentException();
-    engine.setStrategy(stgy);
-  }
-
-  /**
-   * Deflates the current input block to the given array.  It returns 
-   * the number of bytes compressed, or 0 if either 
-   * needsInput() or finished() returns true or length is zero.
-   * @param output the buffer where to write the compressed data.
-   */
-  public int deflate(byte[] output)
-  {
-    return deflate(output, 0, output.length, NO_FLUSH);
-  }
-
-  /**
-   * Deflates the current input block to the given array.  It returns 
-   * the number of bytes compressed, or 0 if either 
-   * needsInput() or finished() returns true or length is zero.
-   * @param output the buffer where to write the compressed data.
-   * @param offset the offset into the output array.
-   * @param length the maximum number of bytes that may be written.
-   * @exception IllegalStateException if end() was called.
-   * @exception IndexOutOfBoundsException if offset and/or length
-   * don't match the array length.  
-   */
-  public int deflate(byte[] output, int offset, int length)
-  {
-    return deflate(output, offset, length, NO_FLUSH);
-  }
-
-  /**
-   * Deflates the current input block to the given array.  It returns 
-   * the number of bytes compressed, or 0 if either 
-   * needsInput() or finished() returns true or length is zero.
-   * @param output the buffer where to write the compressed data.
-   * @param offset the offset into the output array.
-   * @param length the maximum number of bytes that may be written.
-   * @param flush the compression flush mode
-   * @exception IllegalStateException if end() was called.
-   * @exception IndexOutOfBoundsException if offset and/or length
-   * don't match the array length.  
-   */
-  public int deflate(byte[] output, int offset, int length, int flush)
-  {
-    if (output.length - offset < length || offset < 0 || length < 0)
-      throw new ArrayIndexOutOfBoundsException();
-
-    if (flush < NO_FLUSH || flush > FULL_FLUSH)
-      throw new IllegalArgumentException();
-
-    int origLength = length;
-
-    if (state == CLOSED_STATE)
-      throw new IllegalStateException("Deflater closed");
-
-    if (state < BUSY_STATE)
-      {
-        /* output header */
-        int header = (DEFLATED + 
-                      ((DeflaterConstants.MAX_WBITS - 8) << 4)) << 8;
-        int level_flags = (level - 1) >> 1;
-        if (level_flags < 0 || level_flags > 3) 
-          level_flags = 3;
-        header |= level_flags << 6;
-        if ((state & IS_SETDICT) != 0)
-          /* Dictionary was set */
-          header |= DeflaterConstants.PRESET_DICT;
-        header += 31 - (header % 31);
-
-        pending.writeShortMSB(header);
-        if ((state & IS_SETDICT) != 0)
-          {
-            int chksum = engine.getAdler();
-            engine.resetAdler();
-            pending.writeShortMSB(chksum >> 16);
-            pending.writeShortMSB(chksum & 0xffff);
-          }
-
-        state = BUSY_STATE | (state & IS_FINISHING);
-      }
-
-    int oldFlush = lastFlush;
-    lastFlush = flush;
-
-    if (engine.needsInput() && flush <= oldFlush && (state & IS_FINISHING) == 0)
-      {
-        int count = pending.flush(output, offset, length);
-        totalOut += count;
-        return count;
-      }
-
-    boolean done = state == FINISHED_STATE;
-
-    for (;;)
-      {
-        int count = pending.flush(output, offset, length);
-        offset += count;
-        totalOut += count;
-        length -= count;
-        if (length == 0 || done)
-          return origLength - length;
-
-        if (!engine.deflate((state & IS_FINISHING) != 0 || flush != NO_FLUSH,
-                            (state & IS_FINISHING) != 0))
-          {
-            done = true;
-            if (state == FINISHING_STATE)
-              {
-                pending.alignToByte();
-                /* We have completed the stream */
-                if (!noHeader)
-                  {
-                    int adler = engine.getAdler();
-                    pending.writeShortMSB(adler >> 16);
-                    pending.writeShortMSB(adler & 0xffff);
-                  }
-                state = FINISHED_STATE;
-              }
-            else if (flush != NO_FLUSH)
-              {
-                if (level != NO_COMPRESSION)
-                  {
-                    /* We have to supply some lookahead.  8 bit lookahead
-                     * are needed by the zlib inflater, and we must fill 
-                     * the next byte, so that all bits are flushed.
-                     */
-                    int neededbits = 8 + ((-pending.getBitCount()) & 7);
-                    while (neededbits > 0)
-                      {
-                        /* write a static tree block consisting solely of
-                         * an EOF:
-                         */
-                        pending.writeBits(2, 10);
-                        neededbits -= 10;
-                      }
-                  }
-                if (flush == FULL_FLUSH)
-                  engine.clearHash();
-              }
-          }
-      }
-  }
-
-  /**
-   * Sets the dictionary which should be used in the deflate process.
-   * This call is equivalent to <code>setDictionary(dict, 0,
-   * dict.length)</code>.  
-   * @param dict the dictionary.  
-   * @exception IllegalStateException if setInput () or deflate ()
-   * were already called or another dictionary was already set.  
-   */
-  public void setDictionary(byte[] dict)
-  {
-    setDictionary(dict, 0, dict.length);
-  }
-
-  /**
-   * Sets the dictionary which should be used in the deflate process.
-   * The dictionary should be a byte array containing strings that are
-   * likely to occur in the data which should be compressed.  The
-   * dictionary is not stored in the compressed output, only a
-   * checksum.  To decompress the output you need to supply the same
-   * dictionary again.
-   * @param dict the dictionary.
-   * @param offset an offset into the dictionary.
-   * @param length the length of the dictionary.
-   * @exception IllegalStateException if setInput () or deflate () were
-   * already called or another dictionary was already set.
-   */
-  public void setDictionary(byte[] dict, int offset, int length)
-  {
-    if (state != INIT_STATE)
-      throw new IllegalStateException();
-
-    state = SETDICT_STATE;
-    engine.setDictionary(dict, offset, length);
-  }
-}
diff --git a/openjdk/java/util/zip/DeflaterConstants.java b/openjdk/java/util/zip/DeflaterConstants.java
deleted file mode 100644
index bfef8634..00000000
--- a/openjdk/java/util/zip/DeflaterConstants.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* java.util.zip.DeflaterConstants
-   Copyright (C) 2001 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package java.util.zip;
-
-interface DeflaterConstants
-{
-  boolean DEBUGGING = false;
-
-  int STORED_BLOCK = 0;
-  int STATIC_TREES = 1;
-  int DYN_TREES    = 2;
-  int PRESET_DICT  = 0x20;
-
-  int DEFAULT_MEM_LEVEL = 8;
-
-  int MAX_MATCH = 258;
-  int MIN_MATCH = 3;
-
-  int MAX_WBITS = 15;
-  int WSIZE = 1 << MAX_WBITS;
-  int WMASK = WSIZE - 1;
-
-  int HASH_BITS = DEFAULT_MEM_LEVEL + 7;
-  int HASH_SIZE = 1 << HASH_BITS;
-  int HASH_MASK = HASH_SIZE - 1;
-  int HASH_SHIFT = (HASH_BITS + MIN_MATCH - 1) / MIN_MATCH;
-
-  int MIN_LOOKAHEAD = MAX_MATCH + MIN_MATCH + 1;
-  int MAX_DIST = WSIZE - MIN_LOOKAHEAD;
-
-  int PENDING_BUF_SIZE = 1 << (DEFAULT_MEM_LEVEL + 8);
-  int MAX_BLOCK_SIZE = Math.min(65535, PENDING_BUF_SIZE-5);
-
-  int DEFLATE_STORED = 0;
-  int DEFLATE_FAST   = 1;
-  int DEFLATE_SLOW   = 2;
-
-  int GOOD_LENGTH[] = { 0,4, 4, 4, 4, 8,  8,  8,  32,  32 };
-  int MAX_LAZY[]    = { 0,4, 5, 6, 4,16, 16, 32, 128, 258 };
-  int NICE_LENGTH[] = { 0,8,16,32,16,32,128,128, 258, 258 };
-  int MAX_CHAIN[]   = { 0,4, 8,32,16,32,128,256,1024,4096 };
-  int COMPR_FUNC[]  = { 0,1, 1, 1, 1, 2,  2,  2,   2,   2 };
-}
diff --git a/openjdk/java/util/zip/DeflaterEngine.java b/openjdk/java/util/zip/DeflaterEngine.java
deleted file mode 100644
index 474e4913..00000000
--- a/openjdk/java/util/zip/DeflaterEngine.java
+++ /dev/null
@@ -1,692 +0,0 @@
-/* DeflaterEngine.java --
-   Copyright (C) 2001, 2004, 2005  Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package java.util.zip;
-
-final class DeflaterEngine implements DeflaterConstants
-{
-  private static final int TOO_FAR = 4096;
-
-  private int ins_h;
-
-  /**
-   * Hashtable, hashing three characters to an index for window, so
-   * that window[index]..window[index+2] have this hash code.  
-   * Note that the array should really be unsigned short, so you need
-   * to and the values with 0xffff.
-   */
-  private short[] head;
-
-  /**
-   * prev[index & WMASK] points to the previous index that has the
-   * same hash code as the string starting at index.  This way 
-   * entries with the same hash code are in a linked list.
-   * Note that the array should really be unsigned short, so you need
-   * to and the values with 0xffff.
-   */
-  private short[] prev;
-
-  private int matchStart, matchLen;
-  private boolean prevAvailable;
-  private int blockStart;
-
-  /**
-   * strstart points to the current character in window.
-   */
-  private int strstart;
-
-  /**
-   * lookahead is the number of characters starting at strstart in
-   * window that are valid.
-   * So window[strstart] until window[strstart+lookahead-1] are valid
-   * characters.
-   */
-  private int lookahead;
-
-  /**
-   * This array contains the part of the uncompressed stream that 
-   * is of relevance.  The current character is indexed by strstart.
-   */
-  private byte[] window;
-
-  private int strategy, max_chain, max_lazy, niceLength, goodLength;
-
-  /** The current compression function. */
-  private int comprFunc;
-
-  /** The input data for compression. */
-  private byte[] inputBuf;
-
-  /** The total bytes of input read. */
-  private long totalIn;
-
-  /** The offset into inputBuf, where input data starts. */
-  private int inputOff;
-
-  /** The end offset of the input data. */
-  private int inputEnd;
-
-  private DeflaterPending pending;
-  private DeflaterHuffman huffman;
-
-  /** The adler checksum */
-  private Adler32 adler;
-
-  /* DEFLATE ALGORITHM:
-   *
-   * The uncompressed stream is inserted into the window array.  When
-   * the window array is full the first half is thrown away and the
-   * second half is copied to the beginning.
-   *
-   * The head array is a hash table.  Three characters build a hash value
-   * and they the value points to the corresponding index in window of 
-   * the last string with this hash.  The prev array implements a
-   * linked list of matches with the same hash: prev[index & WMASK] points
-   * to the previous index with the same hash.
-   * 
-   * 
-   */
-
-
-  DeflaterEngine(DeflaterPending pending) {
-    this.pending = pending;
-    huffman = new DeflaterHuffman(pending);
-    adler = new Adler32();
-
-    window = new byte[2*WSIZE];
-    head   = new short[HASH_SIZE];
-    prev   = new short[WSIZE];
-
-    /* We start at index 1, to avoid a implementation deficiency, that
-     * we cannot build a repeat pattern at index 0.
-     */
-    blockStart = strstart = 1;
-  }
-
-  public void reset()
-  {
-    huffman.reset();
-    adler.reset();
-    clearHash();
-    totalIn = 0;
-  }
-  
-  final void clearHash()
-  {
-    blockStart = strstart = 1;
-    lookahead = 0;
-    prevAvailable = false;
-    matchLen = MIN_MATCH - 1;
-    for (int i = 0; i < HASH_SIZE; i++)
-      head[i] = 0;
-    for (int i = 0; i < WSIZE; i++)
-      prev[i] = 0;
-  }
-
-  public final void resetAdler()
-  {
-    adler.reset();
-  }
-
-  public final int getAdler()
-  {
-    int chksum = (int) adler.getValue();
-    return chksum;
-  }
-
-  public final long getTotalIn()
-  {
-    return totalIn;
-  }
-
-  public final void setStrategy(int strat)
-  {
-    strategy = strat;
-  }
-
-  public void setLevel(int lvl)
-  {
-    goodLength = DeflaterConstants.GOOD_LENGTH[lvl];
-    max_lazy    = DeflaterConstants.MAX_LAZY[lvl];
-    niceLength = DeflaterConstants.NICE_LENGTH[lvl];
-    max_chain   = DeflaterConstants.MAX_CHAIN[lvl];
-
-    if (DeflaterConstants.COMPR_FUNC[lvl] != comprFunc) 
-      {
-        if (DeflaterConstants.DEBUGGING)
-          System.err.println("Change from "+comprFunc +" to "
-                             + DeflaterConstants.COMPR_FUNC[lvl]);
-        switch (comprFunc)
-          {
-          case DEFLATE_STORED:
-            if (strstart > blockStart)
-              {
-                huffman.flushStoredBlock(window, blockStart, 
-                                         strstart - blockStart, false);
-                blockStart = strstart;
-              }
-            updateHash();
-            break;
-          case DEFLATE_FAST:
-            if (strstart > blockStart)
-              {
-                huffman.flushBlock(window, blockStart, strstart - blockStart,
-                                   false);
-                blockStart = strstart;
-              }
-            break;
-          case DEFLATE_SLOW:
-            if (prevAvailable)
-              huffman.tallyLit(window[strstart-1] & 0xff);
-            if (strstart > blockStart)
-              {
-                huffman.flushBlock(window, blockStart, strstart - blockStart,
-                                   false);
-                blockStart = strstart;
-              }
-            prevAvailable = false;
-            matchLen = MIN_MATCH - 1;
-            break;
-          }
-        comprFunc = COMPR_FUNC[lvl];
-      }
-  }
-
-  private void updateHash() {
-    if (DEBUGGING)
-      System.err.println("updateHash: "+strstart);
-    ins_h = (window[strstart] << HASH_SHIFT) ^ window[strstart + 1];
-  }    
-
-  /**
-   * Inserts the current string in the head hash and returns the previous
-   * value for this hash.
-   */
-  private int insertString() {
-    short match;
-    int hash = ((ins_h << HASH_SHIFT) ^ window[strstart + (MIN_MATCH -1)])
-      & HASH_MASK;
-
-    if (DEBUGGING)
-      {
-        if (hash != (((window[strstart] << (2*HASH_SHIFT))
-                      ^ (window[strstart + 1] << HASH_SHIFT)
-                      ^ (window[strstart + 2])) & HASH_MASK))
-          throw new InternalError("hash inconsistent: "+hash+"/"
-                                  +window[strstart]+","
-                                  +window[strstart+1]+","
-                                  +window[strstart+2]+","+HASH_SHIFT);
-      }
-
-    prev[strstart & WMASK] = match = head[hash];
-    head[hash] = (short) strstart;
-    ins_h = hash;
-    return match & 0xffff;
-  }
-
-  private void slideWindow()
-  {
-    System.arraycopy(window, WSIZE, window, 0, WSIZE);
-    matchStart -= WSIZE;
-    strstart -= WSIZE;
-    blockStart -= WSIZE;
-    
-    /* Slide the hash table (could be avoided with 32 bit values
-     * at the expense of memory usage).
-     */
-    for (int i = 0; i < HASH_SIZE; i++) 
-      {
-        int m = head[i] & 0xffff;
-        head[i] = m >= WSIZE ? (short) (m - WSIZE) : 0;
-      }
-
-    /* Slide the prev table.
-     */
-    for (int i = 0; i < WSIZE; i++) 
-      {
-        int m = prev[i] & 0xffff;
-        prev[i] = m >= WSIZE ? (short) (m - WSIZE) : 0;
-      }
-  }
-
-  /**
-   * Fill the window when the lookahead becomes insufficient.
-   * Updates strstart and lookahead.
-   *
-   * OUT assertions: strstart + lookahead <= 2*WSIZE
-   *    lookahead >= MIN_LOOKAHEAD or inputOff == inputEnd
-   */
-  private void fillWindow()
-  {
-    /* If the window is almost full and there is insufficient lookahead,
-     * move the upper half to the lower one to make room in the upper half.
-     */
-    if (strstart >= WSIZE + MAX_DIST)
-      slideWindow();
-
-    /* If there is not enough lookahead, but still some input left,
-     * read in the input
-     */
-    while (lookahead < DeflaterConstants.MIN_LOOKAHEAD && inputOff < inputEnd)
-      {
-        int more = 2*WSIZE - lookahead - strstart;
-        
-        if (more > inputEnd - inputOff)
-          more = inputEnd - inputOff;
-
-        System.arraycopy(inputBuf, inputOff, 
-                         window, strstart + lookahead, more);
-        adler.update(inputBuf, inputOff, more);
-        inputOff += more;
-        totalIn  += more;
-        lookahead += more;
-      }
-
-    if (lookahead >= MIN_MATCH) 
-      updateHash();
-  }
-
-  /**
-   * Find the best (longest) string in the window matching the 
-   * string starting at strstart.
-   *
-   * Preconditions:
-   *    strstart + MAX_MATCH <= window.length.
-   *    
-   *
-   * @param curMatch
-   */
-  private boolean findLongestMatch(int curMatch) {
-    int chainLength = this.max_chain;
-    int niceLength = this.niceLength;
-    short[] prev = this.prev;
-    int scan  = this.strstart;
-    int match;
-    int best_end = this.strstart + matchLen;
-    int best_len = Math.max(matchLen, MIN_MATCH - 1);
-    
-    int limit = Math.max(strstart - MAX_DIST, 0);
-
-    int strend = scan + MAX_MATCH - 1;
-    byte scan_end1 = window[best_end - 1];
-    byte scan_end  = window[best_end];
-
-    /* Do not waste too much time if we already have a good match: */
-    if (best_len >= this.goodLength)
-      chainLength >>= 2;
-
-    /* Do not look for matches beyond the end of the input. This is necessary
-     * to make deflate deterministic.
-     */
-    if (niceLength > lookahead)
-      niceLength = lookahead;
-
-    if (DeflaterConstants.DEBUGGING 
-        && strstart > 2*WSIZE - MIN_LOOKAHEAD)
-      throw new InternalError("need lookahead");
-    
-    do {
-      if (DeflaterConstants.DEBUGGING && curMatch >= strstart)
-        throw new InternalError("future match");
-      if (window[curMatch + best_len] != scan_end
-          || window[curMatch + best_len - 1] != scan_end1
-          || window[curMatch] != window[scan]
-          || window[curMatch+1] != window[scan + 1])
-        continue;
-
-      match = curMatch + 2;      
-      scan += 2;
-
-      /* We check for insufficient lookahead only every 8th comparison;
-       * the 256th check will be made at strstart+258.
-       */
-      while (window[++scan] == window[++match]
-             && window[++scan] == window[++match]
-             && window[++scan] == window[++match]
-             && window[++scan] == window[++match]
-             && window[++scan] == window[++match]
-             && window[++scan] == window[++match]
-             && window[++scan] == window[++match]
-             && window[++scan] == window[++match]
-             && scan < strend)
-        ;
-
-      if (scan > best_end) {
-//      if (DeflaterConstants.DEBUGGING && ins_h == 0)
-//        System.err.println("Found match: "+curMatch+"-"+(scan-strstart));
-        matchStart = curMatch;
-        best_end = scan;
-        best_len = scan - strstart;
-        if (best_len >= niceLength)
-          break;
-
-        scan_end1  = window[best_end-1];
-        scan_end   = window[best_end];
-      }
-      scan = strstart;
-    } while ((curMatch = (prev[curMatch & WMASK] & 0xffff)) > limit
-             && --chainLength != 0);
-
-    matchLen = Math.min(best_len, lookahead);
-    return matchLen >= MIN_MATCH;
-  }
-
-  void setDictionary(byte[] buffer, int offset, int length) {
-    if (DeflaterConstants.DEBUGGING && strstart != 1)
-      throw new IllegalStateException("strstart not 1");
-    adler.update(buffer, offset, length);
-    if (length < MIN_MATCH)
-      return;
-    if (length > MAX_DIST) {
-      offset += length - MAX_DIST;
-      length = MAX_DIST;
-    }
-
-    System.arraycopy(buffer, offset, window, strstart, length);
-
-    updateHash();
-    length--;
-    while (--length > 0)
-      {
-        insertString();
-        strstart++;
-      }
-    strstart += 2;
-    blockStart = strstart;
-  }    
-    
-  private boolean deflateStored(boolean flush, boolean finish)
-  {
-    if (!flush && lookahead == 0)
-      return false;
-
-    strstart += lookahead;
-    lookahead = 0;
-
-    int storedLen = strstart - blockStart;
-
-    if ((storedLen >= DeflaterConstants.MAX_BLOCK_SIZE) 
-        /* Block is full */
-        || (blockStart < WSIZE && storedLen >= MAX_DIST)
-        /* Block may move out of window */
-        || flush)
-      {
-        boolean lastBlock = finish;
-        if (storedLen > DeflaterConstants.MAX_BLOCK_SIZE)
-          {
-            storedLen = DeflaterConstants.MAX_BLOCK_SIZE;
-            lastBlock = false;
-          }
-
-        if (DeflaterConstants.DEBUGGING)
-          System.err.println("storedBlock["+storedLen+","+lastBlock+"]");
-
-        huffman.flushStoredBlock(window, blockStart, storedLen, lastBlock);
-        blockStart += storedLen;
-        return !lastBlock;
-      }
-    return true;
-  }
-
-  private boolean deflateFast(boolean flush, boolean finish)
-  {
-    if (lookahead < MIN_LOOKAHEAD && !flush)
-      return false;
-
-    while (lookahead >= MIN_LOOKAHEAD || flush)
-      {
-        if (lookahead == 0)
-          {
-            /* We are flushing everything */
-            huffman.flushBlock(window, blockStart, strstart - blockStart,
-                               finish);
-            blockStart = strstart;
-            return false;
-          }
-
-        if (strstart > 2 * WSIZE - MIN_LOOKAHEAD)
-          {
-            /* slide window, as findLongestMatch need this.
-             * This should only happen when flushing and the window
-             * is almost full.
-             */
-            slideWindow();
-          }
-
-        int hashHead;
-        if (lookahead >= MIN_MATCH 
-            && (hashHead = insertString()) != 0
-            && strategy != Deflater.HUFFMAN_ONLY
-            && strstart - hashHead <= MAX_DIST
-            && findLongestMatch(hashHead))
-          {
-            /* longestMatch sets matchStart and matchLen */
-            if (DeflaterConstants.DEBUGGING)
-              {
-                for (int i = 0 ; i < matchLen; i++)
-                  {
-                    if (window[strstart+i] != window[matchStart + i])
-                      throw new InternalError();
-                  }
-              }
-            boolean full = huffman.tallyDist(strstart - matchStart, matchLen);
-            
-            lookahead -= matchLen;
-            if (matchLen <= max_lazy && lookahead >= MIN_MATCH)
-              {
-                while (--matchLen > 0)
-                  {
-                    strstart++;
-                    insertString();
-                  }
-                strstart++;
-              }
-            else
-              {
-                strstart += matchLen;
-                if (lookahead >= MIN_MATCH - 1)
-                  updateHash();
-              }
-            matchLen = MIN_MATCH - 1;
-            if (!full)
-              continue;
-          }
-        else
-          {
-            /* No match found */
-            huffman.tallyLit(window[strstart] & 0xff);
-            strstart++;
-            lookahead--;
-          }
-
-        if (huffman.isFull())
-          {
-            boolean lastBlock = finish && lookahead == 0;
-            huffman.flushBlock(window, blockStart, strstart - blockStart,
-                               lastBlock);
-            blockStart = strstart;
-            return !lastBlock;
-          }
-      }
-    return true;
-  }
-
-  private boolean deflateSlow(boolean flush, boolean finish)
-  {
-    if (lookahead < MIN_LOOKAHEAD && !flush)
-      return false;
-
-    while (lookahead >= MIN_LOOKAHEAD || flush)
-      {
-        if (lookahead == 0)
-          {
-            if (prevAvailable)
-              huffman.tallyLit(window[strstart-1] & 0xff);
-            prevAvailable = false;
-
-            /* We are flushing everything */
-            if (DeflaterConstants.DEBUGGING && !flush)
-              throw new InternalError("Not flushing, but no lookahead");
-            huffman.flushBlock(window, blockStart, strstart - blockStart,
-                               finish);
-            blockStart = strstart;
-            return false;
-          }
-
-        if (strstart >= 2 * WSIZE - MIN_LOOKAHEAD)
-          {
-            /* slide window, as findLongestMatch need this.
-             * This should only happen when flushing and the window
-             * is almost full.
-             */
-            slideWindow();
-          }
-
-        int prevMatch = matchStart;
-        int prevLen = matchLen;
-        if (lookahead >= MIN_MATCH)
-          {
-            int hashHead = insertString();
-            if (strategy != Deflater.HUFFMAN_ONLY
-                && hashHead != 0 && strstart - hashHead <= MAX_DIST
-                && findLongestMatch(hashHead))
-              {
-                /* longestMatch sets matchStart and matchLen */
-                
-                /* Discard match if too small and too far away */
-                if (matchLen <= 5
-                    && (strategy == Deflater.FILTERED
-                        || (matchLen == MIN_MATCH
-                            && strstart - matchStart > TOO_FAR))) {
-                  matchLen = MIN_MATCH - 1;
-                }
-              }
-          }
-        
-        /* previous match was better */
-        if (prevLen >= MIN_MATCH && matchLen <= prevLen)
-          {
-            if (DeflaterConstants.DEBUGGING)
-              {
-                for (int i = 0 ; i < matchLen; i++)
-                  {
-                    if (window[strstart-1+i] != window[prevMatch + i])
-                      throw new InternalError();
-                  }
-              }
-            huffman.tallyDist(strstart - 1 - prevMatch, prevLen);
-            prevLen -= 2;
-            do 
-              {
-                strstart++;
-                lookahead--;
-                if (lookahead >= MIN_MATCH)
-                  insertString();
-              }
-            while (--prevLen > 0);
-            strstart ++;
-            lookahead--;
-            prevAvailable = false;
-            matchLen = MIN_MATCH - 1;
-          }
-        else
-          {
-            if (prevAvailable)
-              huffman.tallyLit(window[strstart-1] & 0xff);
-            prevAvailable = true;
-            strstart++;
-            lookahead--;
-          }
-
-        if (huffman.isFull())
-          {
-            int len = strstart - blockStart;
-            if (prevAvailable)
-              len--;
-            boolean lastBlock = (finish && lookahead == 0 && !prevAvailable);
-            huffman.flushBlock(window, blockStart, len, lastBlock);
-            blockStart += len;
-            return !lastBlock;
-          }
-      }
-    return true;
-  } 
-
-  public boolean deflate(boolean flush, boolean finish) 
-  {
-    boolean progress;
-    do
-      {
-        fillWindow();
-        boolean canFlush = flush && inputOff == inputEnd;
-        if (DeflaterConstants.DEBUGGING)
-          System.err.println("window: ["+blockStart+","+strstart+","
-                             +lookahead+"], "+comprFunc+","+canFlush);
-        switch (comprFunc)
-          {
-          case DEFLATE_STORED:
-            progress = deflateStored(canFlush, finish);
-            break;
-          case DEFLATE_FAST:
-            progress = deflateFast(canFlush, finish);
-            break;
-          case DEFLATE_SLOW:
-            progress = deflateSlow(canFlush, finish);
-            break;
-          default:
-            throw new InternalError();
-          }
-      }
-    while (pending.isFlushed()  /* repeat while we have no pending output */
-           && progress);        /* and progress was made */
-
-    return progress;
-  }
-
-  void setInput(byte[] buf, int off, int len)
-  {
-    // caller has already checked parameters
-    inputBuf = buf;
-    inputOff = off;
-    inputEnd = off + len;
-  }
-
-  public final boolean needsInput()
-  {
-    return inputEnd == inputOff;
-  }
-}
diff --git a/openjdk/java/util/zip/DeflaterHuffman.java b/openjdk/java/util/zip/DeflaterHuffman.java
deleted file mode 100644
index 3d10cdda..00000000
--- a/openjdk/java/util/zip/DeflaterHuffman.java
+++ /dev/null
@@ -1,776 +0,0 @@
-/* DeflaterHuffman.java --
-   Copyright (C) 2001, 2004, 2005  Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package java.util.zip;
-
-/**
- * This is the DeflaterHuffman class.
- *
- * This class is <i>not</i> thread safe.  This is inherent in the API, due
- * to the split of deflate and setInput.
- *
- * @author Jochen Hoenicke
- * @date Jan 6, 2000 
- */
-class DeflaterHuffman
-{
-  private static final int BUFSIZE = 1 << (DeflaterConstants.DEFAULT_MEM_LEVEL + 6);
-  private static final int LITERAL_NUM = 286;
-  private static final int DIST_NUM = 30;
-  private static final int BITLEN_NUM = 19;
-  private static final int REP_3_6    = 16;
-  private static final int REP_3_10   = 17;
-  private static final int REP_11_138 = 18;
-  private static final int EOF_SYMBOL = 256;
-  private static final int[] BL_ORDER =
-  { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 };
-
-  private static final String bit4Reverse =
-    "\000\010\004\014\002\012\006\016\001\011\005\015\003\013\007\017";
-
-  class Tree {
-    short[] freqs;
-    short[] codes;
-    byte[]  length;
-    int[]   bl_counts;
-    int     minNumCodes, numCodes;
-    int     maxLength;
-
-    Tree(int elems, int minCodes, int maxLength) {
-      this.minNumCodes = minCodes;
-      this.maxLength  = maxLength;
-      freqs  = new short[elems];
-      bl_counts = new int[maxLength];
-    }
-
-    void reset() {
-      for (int i = 0; i < freqs.length; i++)
-        freqs[i] = 0;
-      codes = null;
-      length = null;
-    }
-
-    final void writeSymbol(int code)
-    {
-      if (DeflaterConstants.DEBUGGING)
-        {
-          freqs[code]--;
-//        System.err.print("writeSymbol("+freqs.length+","+code+"): ");
-        }
-      pending.writeBits(codes[code] & 0xffff, length[code]);
-    }
-
-    final void checkEmpty()
-    {
-      boolean empty = true;
-      for (int i = 0; i < freqs.length; i++)
-        if (freqs[i] != 0)
-          {
-            System.err.println("freqs["+i+"] == "+freqs[i]);
-            empty = false;
-          }
-      if (!empty)
-        throw new InternalError();
-      System.err.println("checkEmpty suceeded!");
-    }
-
-    void setStaticCodes(short[] stCodes, byte[] stLength)
-    {
-      codes = stCodes;
-      length = stLength;
-    }
-
-    public void buildCodes() {
-      int[] nextCode = new int[maxLength];
-      int code = 0;
-      codes = new short[freqs.length];
-
-      if (DeflaterConstants.DEBUGGING)
-        System.err.println("buildCodes: "+freqs.length);
-      for (int bits = 0; bits < maxLength; bits++) 
-        {
-          nextCode[bits] = code;
-          code += bl_counts[bits] << (15 - bits);
-          if (DeflaterConstants.DEBUGGING)
-            System.err.println("bits: "+(bits+1)+" count: "+bl_counts[bits]
-                               +" nextCode: "+Integer.toHexString(code));
-        }
-      if (DeflaterConstants.DEBUGGING && code != 65536)
-        throw new RuntimeException("Inconsistent bl_counts!");
-      
-      for (int i=0; i < numCodes; i++)
-        {
-          int bits = length[i];
-          if (bits > 0)
-            {
-              if (DeflaterConstants.DEBUGGING)
-                System.err.println("codes["+i+"] = rev("
-                                   +Integer.toHexString(nextCode[bits-1])+"),"
-                                   +bits);
-              codes[i] = bitReverse(nextCode[bits-1]);
-              nextCode[bits-1] += 1 << (16 - bits);
-            }
-        }
-    }
-
-    private void buildLength(int childs[])
-    {
-      this.length = new byte [freqs.length];
-      int numNodes = childs.length / 2;
-      int numLeafs = (numNodes + 1) / 2;
-      int overflow = 0;
-      
-      for (int i = 0; i < maxLength; i++)
-        bl_counts[i] = 0;
-
-      /* First calculate optimal bit lengths */
-      int lengths[] = new int[numNodes];
-      lengths[numNodes-1] = 0;
-      for (int i = numNodes - 1; i >= 0; i--)
-        {
-          if (childs[2*i+1] != -1)
-            {
-              int bitLength = lengths[i] + 1;
-              if (bitLength > maxLength)
-                {
-                  bitLength = maxLength;
-                  overflow++;
-                }
-              lengths[childs[2*i]] = lengths[childs[2*i+1]] = bitLength;
-            }
-          else
-            {
-              /* A leaf node */
-              int bitLength = lengths[i];
-              bl_counts[bitLength - 1]++;
-              this.length[childs[2*i]] = (byte) lengths[i];
-            }
-        }
-      
-      if (DeflaterConstants.DEBUGGING)
-        {
-          System.err.println("Tree "+freqs.length+" lengths:");
-          for (int i=0; i < numLeafs; i++)
-            System.err.println("Node "+childs[2*i]+" freq: "+freqs[childs[2*i]]
-                               + " len: "+length[childs[2*i]]);
-        }
-      
-      if (overflow == 0)
-        return;
-      
-      int incrBitLen = maxLength - 1;
-      do
-        {
-          /* Find the first bit length which could increase: */
-          while (bl_counts[--incrBitLen] == 0)
-            ;
-          
-          /* Move this node one down and remove a corresponding
-           * amount of overflow nodes.
-           */
-          do
-            {
-              bl_counts[incrBitLen]--;
-              bl_counts[++incrBitLen]++;
-              overflow -= 1 << (maxLength - 1 - incrBitLen);
-            }
-          while (overflow > 0 && incrBitLen < maxLength - 1);
-        }
-      while (overflow > 0);
-
-      /* We may have overshot above.  Move some nodes from maxLength to
-       * maxLength-1 in that case.
-       */
-      bl_counts[maxLength-1] += overflow;
-      bl_counts[maxLength-2] -= overflow;
-      
-      /* Now recompute all bit lengths, scanning in increasing
-       * frequency.  It is simpler to reconstruct all lengths instead of
-       * fixing only the wrong ones. This idea is taken from 'ar'
-       * written by Haruhiko Okumura.
-       *
-       * The nodes were inserted with decreasing frequency into the childs
-       * array.
-       */
-      int nodePtr = 2 * numLeafs;
-      for (int bits = maxLength; bits != 0; bits--) 
-        {
-          int n = bl_counts[bits-1];
-          while (n > 0) 
-            {
-              int childPtr = 2*childs[nodePtr++];
-              if (childs[childPtr + 1] == -1)
-                {
-                  /* We found another leaf */
-                  length[childs[childPtr]] = (byte) bits;
-                  n--;
-                }
-            }
-        }
-      if (DeflaterConstants.DEBUGGING)
-        {
-          System.err.println("*** After overflow elimination. ***");
-          for (int i=0; i < numLeafs; i++)
-            System.err.println("Node "+childs[2*i]+" freq: "+freqs[childs[2*i]]
-                               + " len: "+length[childs[2*i]]);
-        }
-    }
-    
-    void buildTree() 
-    {
-      int numSymbols = freqs.length;
-
-      /* heap is a priority queue, sorted by frequency, least frequent
-       * nodes first.  The heap is a binary tree, with the property, that
-       * the parent node is smaller than both child nodes.  This assures
-       * that the smallest node is the first parent.
-       *
-       * The binary tree is encoded in an array:  0 is root node and
-       * the nodes 2*n+1, 2*n+2 are the child nodes of node n.
-       */
-      int[] heap = new int[numSymbols];
-      int heapLen = 0;
-      int maxCode = 0;
-      for (int n = 0; n < numSymbols; n++)
-        {
-          int freq = freqs[n];
-          if (freq != 0)
-            {
-              /* Insert n into heap */
-              int pos = heapLen++;
-              int ppos;
-              while (pos > 0 &&
-                     freqs[heap[ppos = (pos - 1) / 2]] > freq) {
-                heap[pos] = heap[ppos];
-                pos = ppos;
-              }
-              heap[pos] = n;
-              maxCode = n;
-            }
-        }
-      
-      /* We could encode a single literal with 0 bits but then we
-       * don't see the literals.  Therefore we force at least two
-       * literals to avoid this case.  We don't care about order in
-       * this case, both literals get a 1 bit code.  
-       */
-      while (heapLen < 2)
-        {
-          int node = maxCode < 2 ? ++maxCode : 0;
-          heap[heapLen++] = node;
-        }
-
-      numCodes = Math.max(maxCode + 1, minNumCodes);
-      
-      int numLeafs = heapLen;
-      int[] childs = new int[4*heapLen - 2];
-      int[] values = new int[2*heapLen - 1];
-      int numNodes = numLeafs;
-      for (int i = 0; i < heapLen; i++)
-        {
-          int node = heap[i];
-          childs[2*i]   = node;
-          childs[2*i+1] = -1;
-          values[i] = freqs[node] << 8;
-          heap[i] = i;
-        }
-      
-      /* Construct the Huffman tree by repeatedly combining the least two
-       * frequent nodes.
-       */
-      do
-        {
-          int first = heap[0];
-          int last  = heap[--heapLen];
-          
-          /* Propagate the hole to the leafs of the heap */
-          int ppos = 0;
-          int path = 1;
-          while (path < heapLen)
-            {
-              if (path + 1 < heapLen 
-                  && values[heap[path]] > values[heap[path+1]])
-                path++;
-              
-              heap[ppos] = heap[path];
-              ppos = path;
-              path = path * 2 + 1;
-            }
-          
-          /* Now propagate the last element down along path.  Normally
-           * it shouldn't go too deep.
-           */
-          int lastVal = values[last];
-          while ((path = ppos) > 0
-                 && values[heap[ppos = (path - 1)/2]] > lastVal)
-            heap[path] = heap[ppos];
-          heap[path] = last;
-          
-          
-          int second = heap[0];
-          
-          /* Create a new node father of first and second */
-          last = numNodes++;
-          childs[2*last] = first;
-          childs[2*last+1] = second;
-          int mindepth = Math.min(values[first] & 0xff, values[second] & 0xff);
-          values[last] = lastVal = values[first] + values[second] - mindepth + 1;
-          
-          /* Again, propagate the hole to the leafs */
-          ppos = 0;
-          path = 1;
-          while (path < heapLen)
-            {
-              if (path + 1 < heapLen 
-                  && values[heap[path]] > values[heap[path+1]])
-                path++;
-              
-              heap[ppos] = heap[path];
-              ppos = path;
-              path = ppos * 2 + 1;
-            }
-          
-          /* Now propagate the new element down along path */
-          while ((path = ppos) > 0
-                 && values[heap[ppos = (path - 1)/2]] > lastVal)
-            heap[path] = heap[ppos];
-          heap[path] = last;
-        }
-      while (heapLen > 1);
-      
-      if (heap[0] != childs.length / 2 - 1)
-        throw new RuntimeException("Weird!");
-      
-      buildLength(childs);
-    }
-
-    int getEncodedLength() 
-    {
-      int len = 0;
-      for (int i = 0; i < freqs.length; i++)
-        len += freqs[i] * length[i];
-      return len;
-    }
-
-    void calcBLFreq(Tree blTree) {
-      int max_count;               /* max repeat count */
-      int min_count;               /* min repeat count */
-      int count;                   /* repeat count of the current code */
-      int curlen = -1;             /* length of current code */
-      
-      int i = 0;
-      while (i < numCodes)
-        {
-          count = 1;
-          int nextlen = length[i];
-          if (nextlen == 0) 
-            {
-              max_count = 138;
-              min_count = 3;
-            }
-          else
-            {
-              max_count = 6;
-              min_count = 3;
-              if (curlen != nextlen)
-                {
-                  blTree.freqs[nextlen]++;
-                  count = 0;
-                }
-            }
-          curlen = nextlen;
-          i++;
-
-          while (i < numCodes && curlen == length[i])
-            {
-              i++;
-              if (++count >= max_count)
-                break;
-            }
-
-          if (count < min_count)
-            blTree.freqs[curlen] += count;
-          else if (curlen != 0)
-            blTree.freqs[REP_3_6]++;
-          else if (count <= 10)
-            blTree.freqs[REP_3_10]++;
-          else
-            blTree.freqs[REP_11_138]++;
-        }
-    }
-
-    void writeTree(Tree blTree)
-    {
-      int max_count;               /* max repeat count */
-      int min_count;               /* min repeat count */
-      int count;                   /* repeat count of the current code */
-      int curlen = -1;             /* length of current code */
-      
-      int i = 0;
-      while (i < numCodes)
-        {
-          count = 1;
-          int nextlen = length[i];
-          if (nextlen == 0) 
-            {
-              max_count = 138;
-              min_count = 3;
-            }
-          else
-            {
-              max_count = 6;
-              min_count = 3;
-              if (curlen != nextlen)
-                {
-                  blTree.writeSymbol(nextlen);
-                  count = 0;
-                }
-            }
-          curlen = nextlen;
-          i++;
-
-          while (i < numCodes && curlen == length[i])
-            {
-              i++;
-              if (++count >= max_count)
-                break;
-            }
-
-          if (count < min_count)
-            {
-              while (count-- > 0)
-                blTree.writeSymbol(curlen);
-            }
-          else if (curlen != 0)
-            {
-              blTree.writeSymbol(REP_3_6);
-              pending.writeBits(count - 3, 2);
-            }
-          else if (count <= 10)
-            {
-              blTree.writeSymbol(REP_3_10);
-              pending.writeBits(count - 3, 3);
-            }
-          else
-            {
-              blTree.writeSymbol(REP_11_138);
-              pending.writeBits(count - 11, 7);
-            }
-        }
-    }
-  }
-
-
-
-  DeflaterPending pending;
-  private Tree literalTree, distTree, blTree;
-
-  private short d_buf[];
-  private byte l_buf[];
-  private int last_lit;
-  private int extra_bits;
-
-  private static short staticLCodes[];
-  private static byte  staticLLength[];
-  private static short staticDCodes[];
-  private static byte  staticDLength[];
-
-  /**
-   * Reverse the bits of a 16 bit value.
-   */
-  static short bitReverse(int value) {
-    return (short) (bit4Reverse.charAt(value & 0xf) << 12
-                    | bit4Reverse.charAt((value >> 4) & 0xf) << 8
-                    | bit4Reverse.charAt((value >> 8) & 0xf) << 4
-                    | bit4Reverse.charAt(value >> 12));
-  }
-
-  static {
-    /* See RFC 1951 3.2.6 */
-    /* Literal codes */
-    staticLCodes = new short[LITERAL_NUM];
-    staticLLength = new byte[LITERAL_NUM];
-    int i = 0;
-    while (i < 144) {
-      staticLCodes[i] = bitReverse((0x030 + i) << 8);
-      staticLLength[i++] = 8;
-    }
-    while (i < 256) {
-      staticLCodes[i] = bitReverse((0x190 - 144 + i) << 7);
-      staticLLength[i++] = 9;
-    }
-    while (i < 280) {
-      staticLCodes[i] = bitReverse((0x000 - 256 + i) << 9);
-      staticLLength[i++] = 7;
-    }
-    while (i < LITERAL_NUM) {
-      staticLCodes[i] = bitReverse((0x0c0 - 280 + i)  << 8);
-      staticLLength[i++] = 8;
-    }
-
-    /* Distant codes */
-    staticDCodes = new short[DIST_NUM];
-    staticDLength = new byte[DIST_NUM];
-    for (i = 0; i < DIST_NUM; i++) {
-      staticDCodes[i] = bitReverse(i << 11);
-      staticDLength[i] = 5;
-    }
-  }
-    
-  public DeflaterHuffman(DeflaterPending pending) 
-  {
-    this.pending = pending;
-
-    literalTree = new Tree(LITERAL_NUM, 257, 15);
-    distTree    = new Tree(DIST_NUM, 1, 15);
-    blTree      = new Tree(BITLEN_NUM, 4, 7);
-
-    d_buf = new short[BUFSIZE];
-    l_buf = new byte [BUFSIZE];
-  }
-
-  public final void reset() {
-    last_lit = 0;
-    extra_bits = 0;
-    literalTree.reset();
-    distTree.reset();
-    blTree.reset();
-  }
-
-  private int l_code(int len) {
-    if (len == 255)
-      return 285;
-
-    int code = 257;
-    while (len >= 8)
-      {
-        code += 4;
-        len >>= 1;
-      }
-    return code + len;
-  }
-
-  private int d_code(int distance) {
-    int code = 0;
-    while (distance >= 4)
-      {
-        code += 2;
-        distance >>= 1;
-      }
-    return code + distance;
-  }
-
-  public void sendAllTrees(int blTreeCodes) {
-    blTree.buildCodes();
-    literalTree.buildCodes();
-    distTree.buildCodes();
-    pending.writeBits(literalTree.numCodes - 257, 5);
-    pending.writeBits(distTree.numCodes - 1, 5);
-    pending.writeBits(blTreeCodes - 4, 4);
-    for (int rank = 0; rank < blTreeCodes; rank++)
-      pending.writeBits(blTree.length[BL_ORDER[rank]], 3);
-    literalTree.writeTree(blTree);
-    distTree.writeTree(blTree);
-    if (DeflaterConstants.DEBUGGING)
-      blTree.checkEmpty();
-  }
-
-  public void compressBlock() {
-    for (int i = 0; i < last_lit; i++) 
-      {
-        int litlen = l_buf[i] & 0xff;
-        int dist = d_buf[i];
-        if (dist-- != 0)
-          {
-            if (DeflaterConstants.DEBUGGING)
-              System.err.print("["+(dist+1)+","+(litlen+3)+"]: ");
-
-            int lc = l_code(litlen);
-            literalTree.writeSymbol(lc);
-
-            int bits = (lc - 261) / 4;
-            if (bits > 0 && bits <= 5)
-              pending.writeBits(litlen & ((1 << bits) - 1), bits);
-
-            int dc = d_code(dist);
-            distTree.writeSymbol(dc);
-
-            bits = dc / 2 - 1;
-            if (bits > 0)
-              pending.writeBits(dist & ((1 << bits) - 1), bits);
-          }
-        else
-          {
-            if (DeflaterConstants.DEBUGGING)
-              {
-                if (litlen > 32 && litlen < 127)
-                  System.err.print("("+(char)litlen+"): ");
-                else
-                  System.err.print("{"+litlen+"}: ");
-              }
-            literalTree.writeSymbol(litlen);
-          }
-      }
-    if (DeflaterConstants.DEBUGGING)
-      System.err.print("EOF: ");
-    literalTree.writeSymbol(EOF_SYMBOL);
-    if (DeflaterConstants.DEBUGGING)
-      {
-        literalTree.checkEmpty();
-        distTree.checkEmpty();
-      }
-  }
-
-  public void flushStoredBlock(byte[] stored, 
-                               int stored_offset, int stored_len,
-                               boolean lastBlock) {
-    if (DeflaterConstants.DEBUGGING)
-      System.err.println("Flushing stored block "+ stored_len);
-    pending.writeBits((DeflaterConstants.STORED_BLOCK << 1)
-                      + (lastBlock ? 1 : 0), 3);
-    pending.alignToByte();
-    pending.writeShort(stored_len);
-    pending.writeShort(~stored_len);
-    pending.writeBlock(stored, stored_offset, stored_len);
-    reset();
-  }
-
-  public void flushBlock(byte[] stored, int stored_offset, int stored_len,
-                         boolean lastBlock) {
-    literalTree.freqs[EOF_SYMBOL]++;
-
-    /* Build trees */
-    literalTree.buildTree();
-    distTree.buildTree();
-
-    /* Calculate bitlen frequency */
-    literalTree.calcBLFreq(blTree);
-    distTree.calcBLFreq(blTree);
-
-    /* Build bitlen tree */
-    blTree.buildTree();
-
-    int blTreeCodes = 4;
-    for (int i = 18; i > blTreeCodes; i--)
-      {
-        if (blTree.length[BL_ORDER[i]] > 0)
-          blTreeCodes = i+1;
-      }
-    int opt_len = 14 + blTreeCodes * 3 + blTree.getEncodedLength()
-      + literalTree.getEncodedLength() + distTree.getEncodedLength()
-      + extra_bits;
-
-    int static_len = extra_bits;
-    for (int i = 0; i < LITERAL_NUM; i++)
-      static_len += literalTree.freqs[i] * staticLLength[i];
-    for (int i = 0; i < DIST_NUM; i++)
-      static_len += distTree.freqs[i] * staticDLength[i];
-    if (opt_len >= static_len)
-      {
-        /* Force static trees */
-        opt_len = static_len;
-      }
-
-    if (stored_offset >= 0 && stored_len+4 < opt_len >> 3)
-      {
-        /* Store Block */
-        if (DeflaterConstants.DEBUGGING)
-          System.err.println("Storing, since " + stored_len + " < " + opt_len
-                             + " <= " + static_len);
-        flushStoredBlock(stored, stored_offset, stored_len, lastBlock);
-      }
-    else if (opt_len == static_len)
-      {
-        /* Encode with static tree */
-        pending.writeBits((DeflaterConstants.STATIC_TREES << 1)
-                          + (lastBlock ? 1 : 0), 3);
-        literalTree.setStaticCodes(staticLCodes, staticLLength);
-        distTree.setStaticCodes(staticDCodes, staticDLength);
-        compressBlock();
-        reset();
-      }
-    else
-      {
-        /* Encode with dynamic tree */
-        pending.writeBits((DeflaterConstants.DYN_TREES << 1)
-                          + (lastBlock ? 1 : 0), 3);
-        sendAllTrees(blTreeCodes);
-        compressBlock();
-        reset();
-      }
-  }
-
-  public final boolean isFull()
-  {
-    return last_lit == BUFSIZE;
-  }
-
-  public final boolean tallyLit(int lit) 
-  {
-    if (DeflaterConstants.DEBUGGING)
-      {
-        if (lit > 32 && lit < 127)
-          System.err.println("("+(char)lit+")");
-        else
-          System.err.println("{"+lit+"}");
-      }
-    d_buf[last_lit] = 0;
-    l_buf[last_lit++] = (byte) lit;
-    literalTree.freqs[lit]++;
-    return last_lit == BUFSIZE;
-  }
-
-  public final boolean tallyDist(int dist, int len) 
-  {
-    if (DeflaterConstants.DEBUGGING)
-      System.err.println("["+dist+","+len+"]");
-
-    d_buf[last_lit] = (short) dist;
-    l_buf[last_lit++] = (byte) (len - 3);
-
-    int lc = l_code(len-3);
-    literalTree.freqs[lc]++;
-    if (lc >= 265 && lc < 285)
-      extra_bits += (lc - 261) / 4;
-
-    int dc = d_code(dist-1);
-    distTree.freqs[dc]++;
-    if (dc >= 4)
-      extra_bits += dc / 2 - 1;
-    return last_lit == BUFSIZE;
-  }
-}
diff --git a/openjdk/java/util/zip/DeflaterPending.java b/openjdk/java/util/zip/DeflaterPending.java
deleted file mode 100644
index f38212c3..00000000
--- a/openjdk/java/util/zip/DeflaterPending.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/* java.util.zip.DeflaterPending
-   Copyright (C) 2001 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package java.util.zip;
-
-/**
- * This class stores the pending output of the Deflater.
- *
- * @author Jochen Hoenicke
- * @date Jan 5, 2000 
- */
-
-class DeflaterPending extends PendingBuffer
-{
-  public DeflaterPending()
-  {
-    super(DeflaterConstants.PENDING_BUF_SIZE);
-  }
-}
-
diff --git a/openjdk/java/util/zip/Inflater.java b/openjdk/java/util/zip/Inflater.java
deleted file mode 100644
index a5912bdf..00000000
--- a/openjdk/java/util/zip/Inflater.java
+++ /dev/null
@@ -1,727 +0,0 @@
-/* Inflater.java - Decompress a data stream
-   Copyright (C) 1999, 2000, 2001, 2003, 2005  Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
- 
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package java.util.zip;
-
-/* Written using on-line Java Platform 1.2 API Specification
- * and JCL book.
- * Believed complete and correct.
- */
-
-/**
- * Inflater is used to decompress data that has been compressed according 
- * to the "deflate" standard described in rfc1950.
- *
- * The usage is as following.  First you have to set some input with
- * <code>setInput()</code>, then inflate() it.  If inflate doesn't
- * inflate any bytes there may be three reasons:
- * <ul>
- * <li>needsInput() returns true because the input buffer is empty.
- * You have to provide more input with <code>setInput()</code>.  
- * NOTE: needsInput() also returns true when, the stream is finished.
- * </li>
- * <li>needsDictionary() returns true, you have to provide a preset 
- *     dictionary with <code>setDictionary()</code>.</li>
- * <li>finished() returns true, the inflater has finished.</li>
- * </ul>
- * Once the first output byte is produced, a dictionary will not be
- * needed at a later stage.
- *
- * @author John Leuner, Jochen Hoenicke
- * @author Tom Tromey
- * @date May 17, 1999
- * @since JDK 1.1
- */
-public class Inflater
-{
-  /* Copy lengths for literal codes 257..285 */
-  private static final int CPLENS[] = 
-  { 
-    3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
-    35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258
-  };
-  
-  /* Extra bits for literal codes 257..285 */  
-  private static final int CPLEXT[] = 
-  { 
-    0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
-    3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0
-  };
-
-  /* Copy offsets for distance codes 0..29 */
-  private static final int CPDIST[] = {
-    1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
-    257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
-    8193, 12289, 16385, 24577
-  };
-  
-  /* Extra bits for distance codes */
-  private static final int CPDEXT[] = {
-    0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
-    7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 
-    12, 12, 13, 13
-  };
-
-  /* This are the state in which the inflater can be.  */
-  private static final int DECODE_HEADER           = 0;
-  private static final int DECODE_DICT             = 1;
-  private static final int DECODE_BLOCKS           = 2;
-  private static final int DECODE_STORED_LEN1      = 3;
-  private static final int DECODE_STORED_LEN2      = 4;
-  private static final int DECODE_STORED           = 5;
-  private static final int DECODE_DYN_HEADER       = 6;
-  private static final int DECODE_HUFFMAN          = 7;
-  private static final int DECODE_HUFFMAN_LENBITS  = 8;
-  private static final int DECODE_HUFFMAN_DIST     = 9;
-  private static final int DECODE_HUFFMAN_DISTBITS = 10;
-  private static final int DECODE_CHKSUM           = 11;
-  private static final int FINISHED                = 12;
-
-  /** This variable contains the current state. */
-  private int mode;
-
-  /**
-   * The adler checksum of the dictionary or of the decompressed
-   * stream, as it is written in the header resp. footer of the
-   * compressed stream.  <br>
-   *
-   * Only valid if mode is DECODE_DICT or DECODE_CHKSUM.
-   */
-  private int readAdler;
-  /** 
-   * The number of bits needed to complete the current state.  This
-   * is valid, if mode is DECODE_DICT, DECODE_CHKSUM,
-   * DECODE_HUFFMAN_LENBITS or DECODE_HUFFMAN_DISTBITS.  
-   */
-  private int neededBits;
-  private int repLength, repDist;
-  private int uncomprLen;
-  /**
-   * True, if the last block flag was set in the last block of the
-   * inflated stream.  This means that the stream ends after the
-   * current block.  
-   */
-  private boolean isLastBlock;
-
-  /**
-   * The total number of inflated bytes.
-   */
-  private long totalOut;
-  /**
-   * The total number of bytes set with setInput().  This is not the
-   * value returned by getTotalIn(), since this also includes the 
-   * unprocessed input.
-   */
-  private long totalIn;
-  /**
-   * This variable stores the nowrap flag that was given to the constructor.
-   * True means, that the inflated stream doesn't contain a header nor the
-   * checksum in the footer.
-   */
-  private boolean nowrap;
-
-  private StreamManipulator input;
-  private OutputWindow outputWindow;
-  private InflaterDynHeader dynHeader;
-  private InflaterHuffmanTree litlenTree, distTree;
-  private Adler32 adler;
-
-  /**
-   * Creates a new inflater.
-   */
-  public Inflater ()
-  {
-    this (false);
-  }
-
-  /**
-   * Creates a new inflater.
-   * @param nowrap true if no header and checksum field appears in the
-   * stream.  This is used for GZIPed input.  For compatibility with
-   * Sun JDK you should provide one byte of input more than needed in
-   * this case.
-   */
-  public Inflater (boolean nowrap)
-  {
-    this.nowrap = nowrap;
-    this.adler = new Adler32();
-    input = new StreamManipulator();
-    outputWindow = new OutputWindow();
-    mode = nowrap ? DECODE_BLOCKS : DECODE_HEADER;
-  }
-
-  /**
-   * Finalizes this object.
-   */
-  protected void finalize ()
-  {
-    /* Exists only for compatibility */
-  }
-
-  /**
-   * Frees all objects allocated by the inflater.  There's no reason
-   * to call this, since you can just rely on garbage collection (even
-   * for the Sun implementation).  Exists only for compatibility
-   * with Sun's JDK, where the compressor allocates native memory.
-   * If you call any method (even reset) afterwards the behaviour is
-   * <i>undefined</i>.  
-   */
-  public void end ()
-  {
-    outputWindow = null;
-    input = null;
-    dynHeader = null;
-    litlenTree = null;
-    distTree = null;
-    adler = null;
-  }
-
-  /**
-   * Returns true, if the inflater has finished.  This means, that no
-   * input is needed and no output can be produced.
-   */
-  public boolean finished() 
-  {
-    return mode == FINISHED
-        && (outputWindow == null || outputWindow.getAvailable() == 0);
-  }
-
-  /**
-   * Gets the adler checksum.  This is either the checksum of all
-   * uncompressed bytes returned by inflate(), or if needsDictionary()
-   * returns true (and thus no output was yet produced) this is the
-   * adler checksum of the expected dictionary.
-   * @returns the adler checksum.
-   */
-  public int getAdler()
-  {
-    return needsDictionary() ? readAdler : (int) adler.getValue();
-  }
-  
-  /**
-   * Gets the number of unprocessed input.  Useful, if the end of the
-   * stream is reached and you want to further process the bytes after
-   * the deflate stream.  
-   * @return the number of bytes of the input which were not processed.
-   */
-  public int getRemaining()
-  {
-    return input.getAvailableBytes();
-  }
-  
-  /**
-   * Gets the total number of processed compressed input bytes.
-   * @return the total number of bytes of processed input bytes.
-   */
-  public int getTotalIn()
-  {
-    return (int) (totalIn - getRemaining());
-  }
-
-  /**
-   * Gets the total number of processed compressed input bytes.
-   * @return the total number of bytes of processed input bytes.
-   * @since 1.5
-   */
-  public long getBytesRead()
-  {
-    return totalIn - getRemaining();
-  }
-
-  /**
-   * Gets the total number of output bytes returned by inflate().
-   * @return the total number of output bytes.
-   */
-  public int getTotalOut()
-  {
-    return (int) totalOut;
-  }
-
-  /**
-   * Gets the total number of output bytes returned by inflate().
-   * @return the total number of output bytes.
-   * @since 1.5
-   */
-  public long getBytesWritten()
-  {
-    return totalOut;
-  }
-
-  /**
-   * Inflates the compressed stream to the output buffer.  If this
-   * returns 0, you should check, whether needsDictionary(),
-   * needsInput() or finished() returns true, to determine why no 
-   * further output is produced.
-   * @param buf the output buffer.
-   * @return the number of bytes written to the buffer, 0 if no further
-   * output can be produced.  
-   * @exception DataFormatException if deflated stream is invalid.
-   * @exception IllegalArgumentException if buf has length 0.
-   */
-  public int inflate (byte[] buf) throws DataFormatException
-  {
-    return inflate (buf, 0, buf.length);
-  }
-
-  /**
-   * Inflates the compressed stream to the output buffer.  If this
-   * returns 0, you should check, whether needsDictionary(),
-   * needsInput() or finished() returns true, to determine why no 
-   * further output is produced.
-   * @param buf the output buffer.
-   * @param off the offset into buffer where the output should start.
-   * @param len the maximum length of the output.
-   * @return the number of bytes written to the buffer, 0 if no further
-   * output can be produced.  
-   * @exception DataFormatException if deflated stream is invalid.
-   * @exception IndexOutOfBoundsException if the off and/or len are wrong.
-   */
-  public int inflate (byte[] buf, int off, int len) throws DataFormatException
-  {
-    /* Check for correct buff, off, len triple */
-    if (0 > off || off > off + len || off + len > buf.length)
-      throw new ArrayIndexOutOfBoundsException();
-    int count = 0;
-    for (;;)
-      {
-        if (outputWindow.getAvailable() == 0)
-          {
-            if (!decode())
-              break;
-          }
-        else if (len > 0)
-          {
-            int more = outputWindow.copyOutput(buf, off, len);
-            adler.update(buf, off, more);
-            off += more;
-            count += more;
-            totalOut += more;
-            len -= more;
-          }
-        else
-          break;
-      }
-    return count;
-  }
-
-  /**
-   * Returns true, if a preset dictionary is needed to inflate the input.
-   */
-  public boolean needsDictionary ()
-  {
-    return mode == DECODE_DICT && neededBits == 0;
-  }
-
-  /**
-   * Returns true, if the input buffer is empty.
-   * You should then call setInput(). <br>
-   *
-   * <em>NOTE</em>: This method also returns true when the stream is finished.
-   */
-  public boolean needsInput () 
-  {
-    return input == null || input.needsInput ();
-  }
-
-  /**
-   * Resets the inflater so that a new stream can be decompressed.  All
-   * pending input and output will be discarded.
-   */
-  public void reset ()
-  {
-    mode = nowrap ? DECODE_BLOCKS : DECODE_HEADER;
-    totalIn = totalOut = 0;
-    input.reset();
-    outputWindow.reset();
-    dynHeader = null;
-    litlenTree = null;
-    distTree = null;
-    isLastBlock = false;
-    adler.reset();
-  }
-
-  /**
-   * Sets the preset dictionary.  This should only be called, if
-   * needsDictionary() returns true and it should set the same
-   * dictionary, that was used for deflating.  The getAdler()
-   * function returns the checksum of the dictionary needed.
-   * @param buffer the dictionary.
-   * @exception IllegalStateException if no dictionary is needed.
-   * @exception IllegalArgumentException if the dictionary checksum is
-   * wrong.  
-   */
-  public void setDictionary (byte[] buffer)
-  {
-    setDictionary(buffer, 0, buffer.length);
-  }
-
-  /**
-   * Sets the preset dictionary.  This should only be called, if
-   * needsDictionary() returns true and it should set the same
-   * dictionary, that was used for deflating.  The getAdler()
-   * function returns the checksum of the dictionary needed.
-   * @param buffer the dictionary.
-   * @param off the offset into buffer where the dictionary starts.
-   * @param len the length of the dictionary.
-   * @exception IllegalStateException if no dictionary is needed.
-   * @exception IllegalArgumentException if the dictionary checksum is
-   * wrong.  
-   * @exception IndexOutOfBoundsException if the off and/or len are wrong.
-   */
-  public void setDictionary (byte[] buffer, int off, int len)
-  {
-    if (!needsDictionary())
-      throw new IllegalStateException();
-
-    adler.update(buffer, off, len);
-    if ((int) adler.getValue() != readAdler)
-      throw new IllegalArgumentException("Wrong adler checksum");
-    adler.reset();
-    outputWindow.copyDict(buffer, off, len);
-    mode = DECODE_BLOCKS;
-  }
-
-  /**
-   * Sets the input.  This should only be called, if needsInput()
-   * returns true.
-   * @param buf the input.
-   * @exception IllegalStateException if no input is needed.
-   */
-  public void setInput (byte[] buf) 
-  {
-    setInput (buf, 0, buf.length);
-  }
-
-  /**
-   * Sets the input.  This should only be called, if needsInput()
-   * returns true.
-   * @param buf the input.
-   * @param off the offset into buffer where the input starts.
-   * @param len the length of the input.  
-   * @exception IllegalStateException if no input is needed.
-   * @exception IndexOutOfBoundsException if the off and/or len are wrong.
-   */
-  public void setInput (byte[] buf, int off, int len) 
-  {
-    input.setInput (buf, off, len);
-    totalIn += len;
-  }
-
-  /**
-   * Decodes the deflate header.
-   * @return false if more input is needed. 
-   * @exception DataFormatException if header is invalid.
-   */
-  private boolean decodeHeader () throws DataFormatException
-  {
-    int header = input.peekBits(16);
-    if (header < 0)
-      return false;
-    input.dropBits(16);
-    
-    /* The header is written in "wrong" byte order */
-    header = ((header << 8) | (header >> 8)) & 0xffff;
-    if (header % 31 != 0)
-      throw new DataFormatException("Header checksum illegal");
-    
-    if ((header & 0x0f00) != (Deflater.DEFLATED << 8))
-      throw new DataFormatException("Compression Method unknown");
-
-    /* Maximum size of the backwards window in bits. 
-     * We currently ignore this, but we could use it to make the
-     * inflater window more space efficient. On the other hand the
-     * full window (15 bits) is needed most times, anyway.
-     int max_wbits = ((header & 0x7000) >> 12) + 8;
-     */
-    
-    if ((header & 0x0020) == 0) // Dictionary flag?
-      {
-        mode = DECODE_BLOCKS;
-      }
-    else
-      {
-        mode = DECODE_DICT;
-        neededBits = 32;      
-      }
-    return true;
-  }
-   
-  /**
-   * Decodes the dictionary checksum after the deflate header.
-   * @return false if more input is needed. 
-   */
-  private boolean decodeDict ()
-  {
-    while (neededBits > 0)
-      {
-        int dictByte = input.peekBits(8);
-        if (dictByte < 0)
-          return false;
-        input.dropBits(8);
-        readAdler = (readAdler << 8) | dictByte;
-        neededBits -= 8;
-      }
-    return false;
-  }
-
-  /**
-   * Decodes the huffman encoded symbols in the input stream.
-   * @return false if more input is needed, true if output window is
-   * full or the current block ends.
-   * @exception DataFormatException if deflated stream is invalid.  
-   */
-  private boolean decodeHuffman () throws DataFormatException
-  {
-    int free = outputWindow.getFreeSpace();
-    while (free >= 258)
-      {
-        int symbol;
-        switch (mode)
-          {
-          case DECODE_HUFFMAN:
-            /* This is the inner loop so it is optimized a bit */
-            while (((symbol = litlenTree.getSymbol(input)) & ~0xff) == 0)
-              {
-                outputWindow.write(symbol);
-                if (--free < 258)
-                  return true;
-              } 
-            if (symbol < 257)
-              {
-                if (symbol < 0)
-                  return false;
-                else
-                  {
-                    /* symbol == 256: end of block */
-                    distTree = null;
-                    litlenTree = null;
-                    mode = DECODE_BLOCKS;
-                    return true;
-                  }
-              }
-                
-            try
-              {
-                repLength = CPLENS[symbol - 257];
-                neededBits = CPLEXT[symbol - 257];
-              }
-            catch (ArrayIndexOutOfBoundsException ex)
-              {
-                throw new DataFormatException("Illegal rep length code");
-              }
-            /* fall through */
-          case DECODE_HUFFMAN_LENBITS:
-            if (neededBits > 0)
-              {
-                mode = DECODE_HUFFMAN_LENBITS;
-                int i = input.peekBits(neededBits);
-                if (i < 0)
-                  return false;
-                input.dropBits(neededBits);
-                repLength += i;
-              }
-            mode = DECODE_HUFFMAN_DIST;
-            /* fall through */
-          case DECODE_HUFFMAN_DIST:
-            symbol = distTree.getSymbol(input);
-            if (symbol < 0)
-              return false;
-            try 
-              {
-                repDist = CPDIST[symbol];
-                neededBits = CPDEXT[symbol];
-              }
-            catch (ArrayIndexOutOfBoundsException ex)
-              {
-                throw new DataFormatException("Illegal rep dist code");
-              }
-            /* fall through */
-          case DECODE_HUFFMAN_DISTBITS:
-            if (neededBits > 0)
-              {
-                mode = DECODE_HUFFMAN_DISTBITS;
-                int i = input.peekBits(neededBits);
-                if (i < 0)
-                  return false;
-                input.dropBits(neededBits);
-                repDist += i;
-              }
-            outputWindow.repeat(repLength, repDist);
-            free -= repLength;
-            mode = DECODE_HUFFMAN;
-            break;
-          default:
-            throw new IllegalStateException();
-          }
-      }
-    return true;
-  }
-
-  /**
-   * Decodes the adler checksum after the deflate stream.
-   * @return false if more input is needed. 
-   * @exception DataFormatException if checksum doesn't match.
-   */
-  private boolean decodeChksum () throws DataFormatException
-  {
-    while (neededBits > 0)
-      {
-        int chkByte = input.peekBits(8);
-        if (chkByte < 0)
-          return false;
-        input.dropBits(8);
-        readAdler = (readAdler << 8) | chkByte;
-        neededBits -= 8;
-      }
-    if ((int) adler.getValue() != readAdler)
-      throw new DataFormatException("Adler chksum doesn't match: "
-                                    +Integer.toHexString((int)adler.getValue())
-                                    +" vs. "+Integer.toHexString(readAdler));
-    mode = FINISHED;
-    return false;
-  }
-
-  /**
-   * Decodes the deflated stream.
-   * @return false if more input is needed, or if finished. 
-   * @exception DataFormatException if deflated stream is invalid.
-   */
-  private boolean decode () throws DataFormatException
-  {
-    switch (mode) 
-      {
-      case DECODE_HEADER:
-        return decodeHeader();
-      case DECODE_DICT:
-        return decodeDict();
-      case DECODE_CHKSUM:
-        return decodeChksum();
-
-      case DECODE_BLOCKS:
-        if (isLastBlock)
-          {
-            if (nowrap)
-              {
-                mode = FINISHED;
-                return false;
-              }
-            else
-              {
-                input.skipToByteBoundary();
-                neededBits = 32;
-                mode = DECODE_CHKSUM;
-                return true;
-              }
-          }
-
-        int type = input.peekBits(3);
-        if (type < 0)
-          return false;
-        input.dropBits(3);
-
-        if ((type & 1) != 0)
-          isLastBlock = true;
-        switch (type >> 1)
-          {
-          case DeflaterConstants.STORED_BLOCK:
-            input.skipToByteBoundary();
-            mode = DECODE_STORED_LEN1;
-            break;
-          case DeflaterConstants.STATIC_TREES:
-            litlenTree = InflaterHuffmanTree.defLitLenTree;
-            distTree = InflaterHuffmanTree.defDistTree;
-            mode = DECODE_HUFFMAN;
-            break;
-          case DeflaterConstants.DYN_TREES:
-            dynHeader = new InflaterDynHeader();
-            mode = DECODE_DYN_HEADER;
-            break;
-          default:
-            throw new DataFormatException("Unknown block type "+type);
-          }
-        return true;
-
-      case DECODE_STORED_LEN1:
-        {
-          if ((uncomprLen = input.peekBits(16)) < 0)
-            return false;
-          input.dropBits(16);
-          mode = DECODE_STORED_LEN2;
-        }
-        /* fall through */
-      case DECODE_STORED_LEN2:
-        {
-          int nlen = input.peekBits(16);
-          if (nlen < 0)
-            return false;
-          input.dropBits(16);
-          if (nlen != (uncomprLen ^ 0xffff))
-            throw new DataFormatException("broken uncompressed block");
-          mode = DECODE_STORED;
-        }
-        /* fall through */
-      case DECODE_STORED:
-        {
-          int more = outputWindow.copyStored(input, uncomprLen);
-          uncomprLen -= more;
-          if (uncomprLen == 0)
-            {
-              mode = DECODE_BLOCKS;
-              return true;
-            }
-          return !input.needsInput();
-        }
-
-      case DECODE_DYN_HEADER:
-        if (!dynHeader.decode(input))
-          return false;
-        litlenTree = dynHeader.buildLitLenTree();
-        distTree = dynHeader.buildDistTree();
-        mode = DECODE_HUFFMAN;
-        /* fall through */
-      case DECODE_HUFFMAN:
-      case DECODE_HUFFMAN_LENBITS:
-      case DECODE_HUFFMAN_DIST:
-      case DECODE_HUFFMAN_DISTBITS:
-        return decodeHuffman();
-      case FINISHED:
-        return false;
-      default:
-        throw new IllegalStateException();
-      } 
-  }
-}
diff --git a/openjdk/java/util/zip/InflaterDynHeader.java b/openjdk/java/util/zip/InflaterDynHeader.java
deleted file mode 100644
index ad931e49..00000000
--- a/openjdk/java/util/zip/InflaterDynHeader.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/* java.util.zip.InflaterDynHeader
-   Copyright (C) 2001 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package java.util.zip;
-
-class InflaterDynHeader
-{
-  private static final int LNUM   = 0;
-  private static final int DNUM   = 1;
-  private static final int BLNUM  = 2;
-  private static final int BLLENS = 3;
-  private static final int LENS   = 4;
-  private static final int REPS   = 5;
-
-  private static final int repMin[]  = { 3, 3, 11 };
-  private static final int repBits[] = { 2, 3,  7 };
-
-  
-  private byte[] blLens;
-  private byte[] litdistLens;
-
-  private InflaterHuffmanTree blTree;
-  
-  private int mode;
-  private int lnum, dnum, blnum, num;
-  private int repSymbol;
-  private byte lastLen;
-  private int ptr;
-
-  private static final int[] BL_ORDER =
-  { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 };
-  
-  public InflaterDynHeader()
-  {
-  }
-  
-  public boolean decode(StreamManipulator input) throws DataFormatException
-  {
-  decode_loop:
-    for (;;)
-      {
-        switch (mode)
-          {
-          case LNUM:
-            lnum = input.peekBits(5);
-            if (lnum < 0)
-              return false;
-            lnum += 257;
-            input.dropBits(5);
-//          System.err.println("LNUM: "+lnum);
-            mode = DNUM;
-            /* fall through */
-          case DNUM:
-            dnum = input.peekBits(5);
-            if (dnum < 0)
-              return false;
-            dnum++;
-            input.dropBits(5);
-//          System.err.println("DNUM: "+dnum);
-            num = lnum+dnum;
-            litdistLens = new byte[num];
-            mode = BLNUM;
-            /* fall through */
-          case BLNUM:
-            blnum = input.peekBits(4);
-            if (blnum < 0)
-              return false;
-            blnum += 4;
-            input.dropBits(4);
-            blLens = new byte[19];
-            ptr = 0;
-//          System.err.println("BLNUM: "+blnum);
-            mode = BLLENS;
-            /* fall through */
-          case BLLENS:
-            while (ptr < blnum)
-              {
-                int len = input.peekBits(3);
-                if (len < 0)
-                  return false;
-                input.dropBits(3);
-//              System.err.println("blLens["+BL_ORDER[ptr]+"]: "+len);
-                blLens[BL_ORDER[ptr]] = (byte) len;
-                ptr++;
-              }
-            blTree = new InflaterHuffmanTree(blLens);
-            blLens = null;
-            ptr = 0;
-            mode = LENS;
-            /* fall through */
-          case LENS:
-            {
-              int symbol;
-              while (((symbol = blTree.getSymbol(input)) & ~15) == 0)
-                {
-                  /* Normal case: symbol in [0..15] */
-
-//                System.err.println("litdistLens["+ptr+"]: "+symbol);
-                  litdistLens[ptr++] = lastLen = (byte) symbol;
-
-                  if (ptr == num)
-                    {
-                      /* Finished */
-                      return true;
-                    }
-                }
-              
-              /* need more input ? */
-              if (symbol < 0)
-                return false;
-
-              /* otherwise repeat code */
-              if (symbol >= 17)
-                {
-                  /* repeat zero */
-//                System.err.println("repeating zero");
-                  lastLen = 0;
-                }
-              else
-                {
-                  if (ptr == 0)
-                    throw new DataFormatException();
-                }
-              repSymbol = symbol-16;
-              mode = REPS;
-            }
-            /* fall through */
-
-          case REPS:
-            {
-              int bits = repBits[repSymbol];
-              int count = input.peekBits(bits);
-              if (count < 0)
-                return false;
-              input.dropBits(bits);
-              count += repMin[repSymbol];
-//            System.err.println("litdistLens repeated: "+count);
-
-              if (ptr + count > num)
-                throw new DataFormatException();
-              while (count-- > 0)
-                litdistLens[ptr++] = lastLen;
-
-              if (ptr == num)
-                {
-                  /* Finished */
-                  return true;
-                }
-            }
-            mode = LENS;
-            continue decode_loop;
-          }
-      }
-  }
-
-  public InflaterHuffmanTree buildLitLenTree() throws DataFormatException
-  {
-    byte[] litlenLens = new byte[lnum];
-    System.arraycopy(litdistLens, 0, litlenLens, 0, lnum);
-    return new InflaterHuffmanTree(litlenLens);
-  }
-
-  public InflaterHuffmanTree buildDistTree() throws DataFormatException
-  {
-    byte[] distLens = new byte[dnum];
-    System.arraycopy(litdistLens, lnum, distLens, 0, dnum);
-    return new InflaterHuffmanTree(distLens);
-  }
-}
diff --git a/openjdk/java/util/zip/InflaterHuffmanTree.java b/openjdk/java/util/zip/InflaterHuffmanTree.java
deleted file mode 100644
index 1a152d2b..00000000
--- a/openjdk/java/util/zip/InflaterHuffmanTree.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/* InflaterHuffmanTree.java --
-   Copyright (C) 2001, 2004  Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package java.util.zip;
-
-class InflaterHuffmanTree
-{
-  private static final int MAX_BITLEN = 15;
-
-  private short[] tree;
-
-  static InflaterHuffmanTree defLitLenTree, defDistTree;
-
-  static
-  {
-    try
-      {
-        byte[] codeLengths = new byte[288];
-        int i = 0;
-        while (i < 144)
-          codeLengths[i++] = 8;
-        while (i < 256)
-          codeLengths[i++] = 9;
-        while (i < 280)
-          codeLengths[i++] = 7;
-        while (i < 288)
-          codeLengths[i++] = 8;
-        defLitLenTree = new InflaterHuffmanTree(codeLengths);
-
-        codeLengths = new byte[32];
-        i = 0;
-        while (i < 32)
-          codeLengths[i++] = 5;
-        defDistTree = new InflaterHuffmanTree(codeLengths);
-      }
-    catch (DataFormatException ex)
-      {
-        throw new InternalError
-          ("InflaterHuffmanTree: static tree length illegal");
-      }
-  }
-
-  /**
-   * Constructs a Huffman tree from the array of code lengths.
-   *
-   * @param codeLengths the array of code lengths
-   */
-  InflaterHuffmanTree(byte[] codeLengths) throws DataFormatException
-  {
-    buildTree(codeLengths);
-  }
-
-  private void buildTree(byte[] codeLengths) throws DataFormatException
-  {
-    int[] blCount = new int[MAX_BITLEN+1];
-    int[] nextCode = new int[MAX_BITLEN+1];
-    for (int i = 0; i < codeLengths.length; i++)
-      {
-        int bits = codeLengths[i];
-        if (bits > 0)
-          blCount[bits]++;
-      }
-
-    int max = 0;
-    int code = 0;
-    int treeSize = 512;
-    for (int bits = 1; bits <= MAX_BITLEN; bits++)
-      {
-        nextCode[bits] = code;
-        if (blCount[bits] > 0)
-          max = bits;
-        code += blCount[bits] << (16 - bits);
-        if (bits >= 10)
-          {
-            /* We need an extra table for bit lengths >= 10. */
-            int start = nextCode[bits] & 0x1ff80;
-            int end   = code & 0x1ff80;
-            treeSize += (end - start) >> (16 - bits);
-          }
-      }
-    if (code != 65536 && max > 1)
-      throw new DataFormatException("incomplete dynamic bit lengths tree");
-
-    /* Now create and fill the extra tables from longest to shortest
-     * bit len.  This way the sub trees will be aligned.
-     */
-    tree = new short[treeSize];
-    int treePtr = 512;
-    for (int bits = MAX_BITLEN; bits >= 10; bits--)
-      {
-        int end   = code & 0x1ff80;
-        code -= blCount[bits] << (16 - bits);
-        int start = code & 0x1ff80;
-        for (int i = start; i < end; i += 1 << 7)
-          {
-            tree[DeflaterHuffman.bitReverse(i)]
-              = (short) ((-treePtr << 4) | bits);
-            treePtr += 1 << (bits-9);
-          }
-      }
-
-    for (int i = 0; i < codeLengths.length; i++)
-      {
-        int bits = codeLengths[i];
-        if (bits == 0)
-          continue;
-        code = nextCode[bits];
-        int revcode = DeflaterHuffman.bitReverse(code);
-        if (bits <= 9)
-          {
-            do
-              {
-                tree[revcode] = (short) ((i << 4) | bits);
-                revcode += 1 << bits;
-              }
-            while (revcode < 512);
-          }
-        else
-          {
-            int subTree = tree[revcode & 511];
-            int treeLen = 1 << (subTree & 15);
-            subTree = -(subTree >> 4);
-            do
-              {
-                tree[subTree | (revcode >> 9)] = (short) ((i << 4) | bits);
-                revcode += 1 << bits;
-              }
-            while (revcode < treeLen);
-          }
-        nextCode[bits] = code + (1 << (16 - bits));
-      }
-  }
-
-  /**
-   * Reads the next symbol from input.  The symbol is encoded using the
-   * huffman tree.
-   * @param input the input source.
-   * @return the next symbol, or -1 if not enough input is available.
-   */
-  int getSymbol(StreamManipulator input) throws DataFormatException
-  {
-    int lookahead, symbol;
-    if ((lookahead = input.peekBits(9)) >= 0)
-      {
-        if ((symbol = tree[lookahead]) >= 0)
-          {
-            input.dropBits(symbol & 15);
-            return symbol >> 4;
-          }
-        int subtree = -(symbol >> 4);
-        int bitlen = symbol & 15;
-        if ((lookahead = input.peekBits(bitlen)) >= 0)
-          {
-            symbol = tree[subtree | (lookahead >> 9)];
-            input.dropBits(symbol & 15);
-            return symbol >> 4;
-          }
-        else
-          {
-            int bits = input.getAvailableBits();
-            lookahead = input.peekBits(bits);
-            symbol = tree[subtree | (lookahead >> 9)];
-            if ((symbol & 15) <= bits)
-              {
-                input.dropBits(symbol & 15);
-                return symbol >> 4;
-              }
-            else
-              return -1;
-          }
-      }
-    else
-      {
-        int bits = input.getAvailableBits();
-        lookahead = input.peekBits(bits);
-        symbol = tree[lookahead];
-        if (symbol >= 0 && (symbol & 15) <= bits)
-          {
-            input.dropBits(symbol & 15);
-            return symbol >> 4;
-          }
-        else
-          return -1;
-      }
-  }
-}
diff --git a/openjdk/java/util/zip/OutputWindow.java b/openjdk/java/util/zip/OutputWindow.java
deleted file mode 100644
index f4326053..00000000
--- a/openjdk/java/util/zip/OutputWindow.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/* OutputWindow.java --
-   Copyright (C) 2001, 2004  Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package java.util.zip;
-
-/**
- * Contains the output from the Inflation process.
- *
- * We need to have a window so that we can refer backwards into the output stream
- * to repeat stuff.
- *
- * @author John Leuner
- * @since 1.1
- */
-class OutputWindow
-{
-  private static final int WINDOW_SIZE = 1 << 15;
-  private static final int WINDOW_MASK = WINDOW_SIZE - 1;
-
-  private byte[] window = new byte[WINDOW_SIZE]; //The window is 2^15 bytes
-  private int window_end  = 0;
-  private int window_filled = 0;
-
-  public void write(int abyte)
-  {
-    if (window_filled++ == WINDOW_SIZE)
-      throw new IllegalStateException("Window full");
-    window[window_end++] = (byte) abyte;
-    window_end &= WINDOW_MASK;
-  }
-
-  private void slowRepeat(int rep_start, int len, int dist)
-  {
-    while (len-- > 0)
-      {
-        window[window_end++] = window[rep_start++];
-        window_end &= WINDOW_MASK;
-        rep_start &= WINDOW_MASK;
-      }
-  }
-
-  public void repeat(int len, int dist)
-  {
-    if ((window_filled += len) > WINDOW_SIZE)
-      throw new IllegalStateException("Window full");
-
-    int rep_start = (window_end - dist) & WINDOW_MASK;
-    int border = WINDOW_SIZE - len;
-    if (rep_start <= border && window_end < border)
-      {
-        if (len <= dist)
-          {
-            System.arraycopy(window, rep_start, window, window_end, len);
-            window_end += len;
-          }
-        else
-          {
-            /* We have to copy manually, since the repeat pattern overlaps.
-             */
-            while (len-- > 0)
-              window[window_end++] = window[rep_start++];
-          }
-      }
-    else
-      slowRepeat(rep_start, len, dist);
-  }
-
-  public int copyStored(StreamManipulator input, int len)
-  {
-    len = Math.min(Math.min(len, WINDOW_SIZE - window_filled), 
-                   input.getAvailableBytes());
-    int copied;
-
-    int tailLen = WINDOW_SIZE - window_end;
-    if (len > tailLen)
-      {
-        copied = input.copyBytes(window, window_end, tailLen);
-        if (copied == tailLen)
-          copied += input.copyBytes(window, 0, len - tailLen);
-      }
-    else
-      copied = input.copyBytes(window, window_end, len);
-
-    window_end = (window_end + copied) & WINDOW_MASK;
-    window_filled += copied;
-    return copied;
-  }
-
-  public void copyDict(byte[] dict, int offset, int len)
-  {
-    if (window_filled > 0)
-      throw new IllegalStateException();
-
-    if (len > WINDOW_SIZE)
-      {
-        offset += len - WINDOW_SIZE;
-        len = WINDOW_SIZE;
-      }
-    System.arraycopy(dict, offset, window, 0, len);
-    window_end = len & WINDOW_MASK;
-  }
-
-  public int getFreeSpace()
-  {
-    return WINDOW_SIZE - window_filled;
-  }
-
-  public int getAvailable()
-  {
-    return window_filled;
-  }
-
-  public int copyOutput(byte[] output, int offset, int len)
-  {
-    int copy_end = window_end;
-    if (len > window_filled)
-      len = window_filled;
-    else
-      copy_end = (window_end - window_filled + len) & WINDOW_MASK;
-
-    int copied = len;
-    int tailLen = len - copy_end;
-
-    if (tailLen > 0)
-      {
-        System.arraycopy(window, WINDOW_SIZE - tailLen,
-                         output, offset, tailLen);
-        offset += tailLen;
-        len = copy_end;
-      }
-    System.arraycopy(window, copy_end - len, output, offset, len);
-    window_filled -= copied;
-    if (window_filled < 0)
-      throw new IllegalStateException();
-    return copied;
-  }
-
-  public void reset() {
-    window_filled = window_end = 0;
-  }
-}
-
-
-
diff --git a/openjdk/java/util/zip/PendingBuffer.java b/openjdk/java/util/zip/PendingBuffer.java
deleted file mode 100644
index 4c7e2165..00000000
--- a/openjdk/java/util/zip/PendingBuffer.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/* java.util.zip.PendingBuffer
-   Copyright (C) 2001 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package java.util.zip;
-
-/**
- * This class is general purpose class for writing data to a buffer.
- *
- * It allows you to write bits as well as bytes 
- *
- * Based on DeflaterPending.java
- *
- * @author Jochen Hoenicke
- * @date Jan 5, 2000 
- */
-
-class PendingBuffer
-{
-  protected byte[] buf;
-  int    start;
-  int    end;
-
-  int    bits;
-  int    bitCount;
-
-  public PendingBuffer()
-  {
-    this( 4096 );
-  }
-
-  public PendingBuffer(int bufsize)
-  {
-    buf = new byte[bufsize];
-  }
-
-  public final void reset() {
-    start = end = bitCount = 0;
-  }
-
-  public final void writeByte(int b) 
-  {
-    if (DeflaterConstants.DEBUGGING && start != 0)
-      throw new IllegalStateException();
-    buf[end++] = (byte) b;
-  }
-
-  public final void writeShort(int s) 
-  {
-    if (DeflaterConstants.DEBUGGING && start != 0)
-      throw new IllegalStateException();
-    buf[end++] = (byte) s;
-    buf[end++] = (byte) (s >> 8);
-  }
-
-  public final void writeInt(int s) 
-  {
-    if (DeflaterConstants.DEBUGGING && start != 0)
-      throw new IllegalStateException();
-    buf[end++] = (byte) s;
-    buf[end++] = (byte) (s >> 8);
-    buf[end++] = (byte) (s >> 16);
-    buf[end++] = (byte) (s >> 24);
-  }
-
-  public final void writeBlock(byte[] block, int offset, int len) 
-  {
-    if (DeflaterConstants.DEBUGGING && start != 0)
-      throw new IllegalStateException();
-    System.arraycopy(block, offset, buf, end, len);
-    end += len;
-  }
-
-  public final int getBitCount() {
-    return bitCount;
-  }
-
-  public final void alignToByte() {
-    if (DeflaterConstants.DEBUGGING && start != 0)
-      throw new IllegalStateException();
-    if (bitCount > 0)
-      {
-        buf[end++] = (byte) bits;
-        if (bitCount > 8)
-          buf[end++] = (byte) (bits >>> 8);
-      }
-    bits = 0;
-    bitCount = 0;
-  }
-
-  public final void writeBits(int b, int count)
-  {
-     if (DeflaterConstants.DEBUGGING && start != 0)
-       throw new IllegalStateException();
-     if (DeflaterConstants.DEBUGGING)
-       System.err.println("writeBits("+Integer.toHexString(b)+","+count+")");
-    bits |= b << bitCount;
-    bitCount += count;
-    if (bitCount >= 16) {
-      buf[end++] = (byte) bits;
-      buf[end++] = (byte) (bits >>> 8);
-      bits >>>= 16;
-      bitCount -= 16;
-    }
-  }
-
-  public final void writeShortMSB(int s) {
-    if (DeflaterConstants.DEBUGGING && start != 0)
-      throw new IllegalStateException();
-    buf[end++] = (byte) (s >> 8);
-    buf[end++] = (byte) s;
-  }
-
-  public final boolean isFlushed() {
-    return end == 0;
-  }
-
-  /**
-   * Flushes the pending buffer into the given output array.  If the
-   * output array is to small, only a partial flush is done.
-   *
-   * @param output the output array;
-   * @param offset the offset into output array;
-   * @param length the maximum number of bytes to store;
-   * @exception IndexOutOfBoundsException if offset or length are
-   * invalid.
-   */
-  public final int flush(byte[] output, int offset, int length) {
-    if (bitCount >= 8)
-      {
-        buf[end++] = (byte) bits;
-        bits >>>= 8;
-        bitCount -= 8;
-      }
-    if (length > end - start)
-      {
-        length = end - start;
-        System.arraycopy(buf, start, output, offset, length);
-        start = 0;
-        end = 0;
-      }
-    else
-      {
-        System.arraycopy(buf, start, output, offset, length);
-        start += length;
-      }
-    return length;
-  }
-
-  /**
-   * Flushes the pending buffer and returns that data in a new array
-   * 
-   * @return the output stream
-   */
-
-  public final byte[] toByteArray()
-  {
-    byte[] ret = new byte[ end - start ];
-    System.arraycopy(buf, start, ret, 0, ret.length);
-    start = 0;
-    end = 0;
-    return ret;
-  }
-
-
-}
-
diff --git a/openjdk/java/util/zip/StreamManipulator.java b/openjdk/java/util/zip/StreamManipulator.java
deleted file mode 100644
index 16585def..00000000
--- a/openjdk/java/util/zip/StreamManipulator.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/* java.util.zip.StreamManipulator
-   Copyright (C) 2001 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-package java.util.zip;
-
-/**
- * This class allows us to retrieve a specified amount of bits from
- * the input buffer, as well as copy big byte blocks.
- *
- * It uses an int buffer to store up to 31 bits for direct
- * manipulation.  This guarantees that we can get at least 16 bits,
- * but we only need at most 15, so this is all safe.
- *
- * There are some optimizations in this class, for example, you must
- * never peek more then 8 bits more than needed, and you must first 
- * peek bits before you may drop them.  This is not a general purpose
- * class but optimized for the behaviour of the Inflater.
- *
- * @author John Leuner, Jochen Hoenicke
- */
-
-class StreamManipulator
-{
-  private byte[] window;
-  private int window_start = 0;
-  private int window_end = 0;
-
-  private int buffer = 0;
-  private int bits_in_buffer = 0;
-
-  /**
-   * Get the next n bits but don't increase input pointer.  n must be
-   * less or equal 16 and if you if this call succeeds, you must drop
-   * at least n-8 bits in the next call.
-   * 
-   * @return the value of the bits, or -1 if not enough bits available.  */
-  public final int peekBits(int n)
-  {
-    if (bits_in_buffer < n)
-      {
-        if (window_start == window_end)
-          return -1;
-        buffer |= (window[window_start++] & 0xff
-                   | (window[window_start++] & 0xff) << 8) << bits_in_buffer;
-        bits_in_buffer += 16;
-      }
-    return buffer & ((1 << n) - 1);
-  }
-
-  /* Drops the next n bits from the input.  You should have called peekBits
-   * with a bigger or equal n before, to make sure that enough bits are in
-   * the bit buffer.
-   */
-  public final void dropBits(int n)
-  {
-    buffer >>>= n;
-    bits_in_buffer -= n;
-  }
-
-  /**
-   * Gets the next n bits and increases input pointer.  This is equivalent
-   * to peekBits followed by dropBits, except for correct error handling.
-   * @return the value of the bits, or -1 if not enough bits available. 
-   */
-  public final int getBits(int n)
-  {
-    int bits = peekBits(n);
-    if (bits >= 0)
-      dropBits(n);
-    return bits;
-  }
-  /**
-   * Gets the number of bits available in the bit buffer.  This must be
-   * only called when a previous peekBits() returned -1.
-   * @return the number of bits available.
-   */
-  public final int getAvailableBits()
-  {
-    return bits_in_buffer;
-  }
-
-  /**
-   * Gets the number of bytes available.  
-   * @return the number of bytes available.
-   */
-  public final int getAvailableBytes()
-  {
-    return window_end - window_start + (bits_in_buffer >> 3);
-  }
-
-  /**
-   * Skips to the next byte boundary.
-   */
-  public void skipToByteBoundary()
-  {
-    buffer >>= (bits_in_buffer & 7);
-    bits_in_buffer &= ~7;
-  }
-
-  public final boolean needsInput() {
-    return window_start == window_end;
-  }
-
-
-  /* Copies length bytes from input buffer to output buffer starting
-   * at output[offset].  You have to make sure, that the buffer is
-   * byte aligned.  If not enough bytes are available, copies fewer
-   * bytes.
-   * @param length the length to copy, 0 is allowed.
-   * @return the number of bytes copied, 0 if no byte is available.  
-   */
-  public int copyBytes(byte[] output, int offset, int length)
-  {
-    if (length < 0)
-      throw new IllegalArgumentException("length negative");
-    if ((bits_in_buffer & 7) != 0)  
-      /* bits_in_buffer may only be 0 or 8 */
-      throw new IllegalStateException("Bit buffer is not aligned!");
-
-    int count = 0;
-    while (bits_in_buffer > 0 && length > 0)
-      {
-        output[offset++] = (byte) buffer;
-        buffer >>>= 8;
-        bits_in_buffer -= 8;
-        length--;
-        count++;
-      }
-    if (length == 0)
-      return count;
-
-    int avail = window_end - window_start;
-    if (length > avail)
-      length = avail;
-    System.arraycopy(window, window_start, output, offset, length);
-    window_start += length;
-
-    if (((window_start - window_end) & 1) != 0)
-      {
-        /* We always want an even number of bytes in input, see peekBits */
-        buffer = (window[window_start++] & 0xff);
-        bits_in_buffer = 8;
-      }
-    return count + length;
-  }
-
-  public StreamManipulator()
-  {
-  }
-
-  public void reset()
-  {
-    window_start = window_end = buffer = bits_in_buffer = 0;
-  }
-
-  public void setInput(byte[] buf, int off, int len)
-  {
-    if (window_start < window_end)
-      throw new IllegalStateException
-        ("Old input was not completely processed");
-
-    int end = off + len;
-
-    /* We want to throw an ArrayIndexOutOfBoundsException early.  The
-     * check is very tricky: it also handles integer wrap around.  
-     */
-    if (0 > off || off > end || end > buf.length)
-      throw new ArrayIndexOutOfBoundsException();
-    
-    if ((len & 1) != 0)
-      {
-        /* We always want an even number of bytes in input, see peekBits */
-        buffer |= (buf[off++] & 0xff) << bits_in_buffer;
-        bits_in_buffer += 8;
-      }
-    
-    window = buf;
-    window_start = off;
-    window_end = end;
-  }
-}
-
diff --git a/openjdk/java/util/zip/ZipEntry.java b/openjdk/java/util/zip/ZipEntry.java
deleted file mode 100644
index 4d7e3f24..00000000
--- a/openjdk/java/util/zip/ZipEntry.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/* ZipEntry.java --
-   Copyright (C) 2001, 2002, 2004, 2005, 2011 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-
-package java.util.zip;
-
-import java.util.Date;
-
-/**
- * This class represents a member of a zip archive.  ZipFile and
- * ZipInputStream will give you instances of this class as information
- * about the members in an archive.  On the other hand ZipOutputStream
- * needs an instance of this class to create a new member.
- *
- * @author Jochen Hoenicke 
- */
-public class ZipEntry implements ZipConstants, Cloneable
-{
-    String name;
-    long time = -1;
-    long crc = -1;
-    long size = -1;
-    long csize = -1;
-    int method = -1;
-    int flag;
-    byte[] extra;
-    String comment;
-
-    long offset;             /* used by ZipFile */
-
-    /**
-     * Compression method.  This method doesn't compress at all.
-     */
-    public static final int STORED = 0;
-    /**
-     * Compression method.  This method uses the Deflater.
-     */
-    public static final int DEFLATED = 8;
-
-    /**
-     * Creates a zip entry with the given name.
-     * @param name the name. May include directory components separated
-     * by '/'.
-     *
-     * @exception NullPointerException when name is null.
-     * @exception IllegalArgumentException when name is bigger then 65535 chars.
-     */
-    public ZipEntry(String name)
-    {
-        int length = name.length();
-        if (length > 65535)
-            throw new IllegalArgumentException("name length is " + length);
-        this.name = name;
-    }
-
-    /**
-     * Creates a copy of the given zip entry.
-     * @param e the entry to copy.
-     */
-    public ZipEntry(ZipEntry e)
-    {
-        name = e.name;
-        time = e.time;
-        crc = e.crc;
-        size = e.size;
-        csize = e.csize;
-        method = e.method;
-        flag = e.flag;
-        extra = e.extra;
-        comment = e.comment;
-    }
-
-    ZipEntry()
-    {
-    }
-
-    /**
-     * Creates a copy of this zip entry.
-     */
-    /**
-     * Clones the entry.
-     */
-    public Object clone()
-    {
-        try
-        {
-            // The JCL says that the `extra' field is also copied.
-            ZipEntry clone = (ZipEntry)super.clone();
-            if (extra != null)
-                clone.extra = (byte[])extra.clone();
-            return clone;
-        }
-        catch (CloneNotSupportedException ex)
-        {
-            throw new InternalError();
-        }
-    }
-
-    /**
-     * Returns the entry name.  The path components in the entry are
-     * always separated by slashes ('/').  
-     */
-    public String getName()
-    {
-        return name;
-    }
-
-    /**
-     * Sets the time of last modification of the entry.
-     * @time the time of last modification of the entry.
-     */
-    public void setTime(long time)
-    {
-        Date d = new Date(time);
-        if (d.getYear() < 80)
-        {
-            d = new Date(80, 0, 1);
-        }
-        this.time = ((d.getYear() - 80) << 25)
-            | ((d.getMonth() + 1) << 21)
-            | (d.getDate() << 16)
-            | (d.getHours() << 11)
-            | (d.getMinutes() << 5)
-            | (d.getSeconds() >> 1);
-    }
-
-    /**
-     * Gets the time of last modification of the entry.
-     * @return the time of last modification of the entry, or -1 if unknown.
-     */
-    public long getTime()
-    {
-        if (time == -1)
-        {
-            return -1;
-        }
-        Date d = new Date((int)(((time >> 25) & 0x7f) + 80),
-                  (int)(((time >> 21) & 0x0f) - 1),
-                  (int)((time >> 16) & 0x1f),
-                  (int)((time >> 11) & 0x1f),
-                  (int)((time >> 5) & 0x3f),
-                  (int)((time << 1) & 0x3e));
-        return d.getTime();
-    }
-
-    /**
-     * Sets the size of the uncompressed data.
-     * @exception IllegalArgumentException if size is negative.
-     */
-    public void setSize(long size)
-    {
-        if (size < 0)
-            throw new IllegalArgumentException();
-        this.size = size;
-    }
-
-    /**
-     * Gets the size of the uncompressed data.
-     * @return the size or -1 if unknown.
-     */
-    public long getSize()
-    {
-        return size;
-    }
-
-    /**
-     * Sets the size of the compressed data.
-     */
-    public void setCompressedSize(long csize)
-    {
-        this.csize = csize;
-    }
-
-    /**
-     * Gets the size of the compressed data.
-     * @return the size or -1 if unknown.
-     */
-    public long getCompressedSize()
-    {
-        return csize;
-    }
-
-    /**
-     * Sets the crc of the uncompressed data.
-     * @exception IllegalArgumentException if crc is not in 0..0xffffffffL
-     */
-    public void setCrc(long crc)
-    {
-        if ((crc & 0xffffffff00000000L) != 0)
-            throw new IllegalArgumentException();
-        this.crc = crc;
-    }
-
-    /**
-     * Gets the crc of the uncompressed data.
-     * @return the crc or -1 if unknown.
-     */
-    public long getCrc()
-    {
-        return crc;
-    }
-
-    /**
-     * Sets the compression method.  Only DEFLATED and STORED are
-     * supported.
-     * @exception IllegalArgumentException if method is not supported.
-     * @see ZipOutputStream#DEFLATED
-     * @see ZipOutputStream#STORED 
-     */
-    public void setMethod(int method)
-    {
-        if (method != ZipOutputStream.STORED
-            && method != ZipOutputStream.DEFLATED)
-            throw new IllegalArgumentException();
-        this.method = method;
-    }
-
-    /**
-     * Gets the compression method.  
-     * @return the compression method or -1 if unknown.
-     */
-    public int getMethod()
-    {
-        return method;
-    }
-
-    /**
-     * Sets the extra data.
-     * @exception IllegalArgumentException if extra is longer than 0xffff bytes.
-     */
-    public void setExtra(byte[] extra)
-    {
-        if (extra == null)
-        {
-            this.extra = null;
-            return;
-        }
-        if (extra.length > 0xffff)
-            throw new IllegalArgumentException();
-        this.extra = extra;
-    }
-
-    /**
-     * Gets the extra data.
-     * @return the extra data or null if not set.
-     */
-    public byte[] getExtra()
-    {
-        return extra;
-    }
-
-    /**
-     * Sets the entry comment.
-     */
-    public void setComment(String comment)
-    {
-        this.comment = comment;
-    }
-
-    /**
-     * Gets the comment.
-     * @return the comment or null if not set.
-     */
-    public String getComment()
-    {
-        return comment;
-    }
-
-    /**
-     * Gets true, if the entry is a directory.  This is solely
-     * determined by the name, a trailing slash '/' marks a directory.  
-     */
-    public boolean isDirectory()
-    {
-        int nlen = name.length();
-        return nlen > 0 && name.charAt(nlen - 1) == '/';
-    }
-
-    /**
-     * Gets the string representation of this ZipEntry.  This is just
-     * the name as returned by getName().
-     */
-    public String toString()
-    {
-        return getName();
-    }
-
-    /**
-     * Gets the hashCode of this ZipEntry.  This is just the hashCode
-     * of the name.  Note that the equals method isn't changed, though.
-     */
-    public int hashCode()
-    {
-        return name.hashCode();
-    }
-}
diff --git a/openjdk/java/util/zip/ZipFile.java b/openjdk/java/util/zip/ZipFile.java
deleted file mode 100644
index 35fbc665..00000000
--- a/openjdk/java/util/zip/ZipFile.java
+++ /dev/null
@@ -1,889 +0,0 @@
-/* ZipFile.java --
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2011
-   Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-
-package java.util.zip;
-
-import java.io.Closeable;
-import java.io.EOFException;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.RandomAccessFile;
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import static java.util.zip.ZipConstants64.*;
-
-/**
- * This class represents a Zip archive.  You can ask for the contained
- * entries, or get an input stream for a file entry.  The entry is
- * automatically decompressed.
- *
- * This class is thread safe:  You can open input streams for arbitrary
- * entries in different threads.
- *
- * @author Jochen Hoenicke
- * @author Artur Biesiadowski
- */
-public class ZipFile implements ZipConstants, Closeable
-{
-
-  /**
-   * Mode flag to open a zip file for reading.
-   */
-  public static final int OPEN_READ = 0x1;
-
-  /**
-   * Mode flag to delete a zip file after reading.
-   */
-  public static final int OPEN_DELETE = 0x4;
-
-  /**
-   * This field isn't defined in the JDK's ZipConstants, but should be.
-   */
-  static final int ENDNRD =  4;
-
-  // Name of this zip file.
-  private final String name;
-
-  // Encoding to use for name and comment strings
-  private final Charset charset;
-
-  // File from which zip entries are read.
-  private final RandomAccessFile raf;
-
-  // The entries of this zip file when initialized and not yet closed.
-  private LinkedHashMap<String, ZipEntry> entries;
-
-  private boolean closed = false;
-
-  /**
-   * Opens a Zip file with the given name for reading.
-   * @exception IOException if a i/o error occured.
-   * @exception ZipException if the file doesn't contain a valid zip
-   * archive.  
-   */
-  public ZipFile(String name) throws ZipException, IOException
-  {
-    this(new File(name), OPEN_READ);
-  }
-
-  /**
-   * Opens a Zip file reading the given File.
-   * @exception IOException if a i/o error occured.
-   * @exception ZipException if the file doesn't contain a valid zip
-   * archive.  
-   */
-  public ZipFile(File file) throws ZipException, IOException
-  {
-    this(file, OPEN_READ);
-  }
-
-  /**
-   * Opens a Zip file reading the given File.
-   * @exception IOException if a i/o error occured.
-   * @exception ZipException if the file doesn't contain a valid zip
-   * archive.  
-   */
-  public ZipFile(File file, Charset charset) throws IOException
-  {
-    this(file, OPEN_READ, charset);
-  }
-
-  /**
-   * Opens a Zip file reading the given File.
-   * @exception IOException if a i/o error occured.
-   * @exception ZipException if the file doesn't contain a valid zip
-   * archive.  
-   */
-  public ZipFile(String name, Charset charset) throws IOException
-  {
-    this(new File(name), OPEN_READ, charset);
-  }
-
-  /**
-   * Opens a Zip file reading the given File in the given mode.
-   *
-   * If the OPEN_DELETE mode is specified, the zip file will be deleted at
-   * some time moment after it is opened. It will be deleted before the zip
-   * file is closed or the Virtual Machine exits.
-   * 
-   * The contents of the zip file will be accessible until it is closed.
-   *
-   * @since JDK1.3
-   * @param mode Must be one of OPEN_READ or OPEN_READ | OPEN_DELETE
-   *
-   * @exception IOException if a i/o error occured.
-   * @exception ZipException if the file doesn't contain a valid zip
-   * archive.  
-   */
-  public ZipFile(File file, int mode) throws IOException
-  {
-    this(file, mode, StandardCharsets.UTF_8);
-  }
-
-  /**
-   * Opens a Zip file reading the given File in the given mode.
-   *
-   * If the OPEN_DELETE mode is specified, the zip file will be deleted at
-   * some time moment after it is opened. It will be deleted before the zip
-   * file is closed or the Virtual Machine exits.
-   * 
-   * The contents of the zip file will be accessible until it is closed.
-   *
-   * @since JDK1.7
-   * @param mode Must be one of OPEN_READ or OPEN_READ | OPEN_DELETE
-   * @param charset Character encoding to use for names and comments
-   *
-   * @exception IOException if a i/o error occured.
-   * @exception ZipException if the file doesn't contain a valid zip
-   * archive.  
-   */
-  public ZipFile(File file, int mode, Charset charset) throws IOException
-  {
-    if (mode != OPEN_READ && mode != (OPEN_READ | OPEN_DELETE))
-      throw new IllegalArgumentException("Illegal mode: 0x" + Integer.toHexString(mode));
-    if (charset == null)
-      throw new NullPointerException("charset is null");
-    if ((mode & OPEN_DELETE) != 0)
-      file.deleteOnExit();
-    this.raf = new RandomAccessFile(file, "r");
-    this.name = file.getPath();
-    this.charset = charset;
-
-    boolean valid = false;
-
-    try 
-      {
-        readEntries();
-        ClassStubZipEntry.expandIkvmClasses(this, entries);
-        valid = true;
-      }
-    catch (EOFException _)
-      {
-        throw new ZipException("invalid CEN header (bad header size)");
-      } 
-    finally
-      {
-        if (!valid)
-          {
-            try
-              {
-                raf.close();
-              }
-            catch (IOException _)
-              {
-              }
-          }
-      }
-  }
-
-  /**
-   * Checks if file is closed and throws an exception.
-   */
-  private void checkClosed()
-  {
-    if (closed)
-      throw new IllegalStateException("zip file closed");
-  }
-
-  /**
-   * Read the central directory of a zip file and fill the entries
-   * array.  This is called exactly once when first needed. It is called
-   * while holding the lock on <code>raf</code>.
-   *
-   * @exception IOException if a i/o error occured.
-   * @exception ZipException if the central directory is malformed 
-   */
-  private void readEntries() throws IOException
-  {
-    PartialInputStream inp = new PartialInputStream(4096);
-    long pos = inp.seekEndOfCentralDirectory();
-    inp.skip(6);
-    int count = inp.readLeUnsignedShort();
-    long centralSize = inp.readLeUnsignedInt();    
-    long centralOffset = inp.readLeUnsignedInt();
-
-    if (centralSize == ZIP64_MAGICVAL
-        || centralOffset == ZIP64_MAGICVAL
-        || count == ZIP64_MAGICCOUNT)
-      {
-        inp.seek(pos - ZIP64_LOCHDR);
-        if (inp.readLeInt() == ZIP64_LOCSIG)
-          {
-            inp.skip(4);
-            long zip64end = inp.readLeLong();
-            inp.seek(zip64end);
-            if (inp.readLeInt() == ZIP64_ENDSIG)
-              {
-                inp.skip(ZIP64_ENDSIZ - 4);
-                centralSize = inp.readLeLong();
-                centralOffset = inp.readLeLong();
-                pos = zip64end;
-              }
-          }
-      }
-
-    if (centralSize > pos)
-      throw new ZipException("invalid END header (bad central directory size)");
-
-    if (centralOffset > pos - centralSize)
-      throw new ZipException("invalid END header (bad central directory offset)");
-
-    entries = new LinkedHashMap<String, ZipEntry> (count+count/2);
-    inp.seek(pos - centralSize);
-    
-    while (inp.position() <= pos - CENHDR)
-      {
-        if (inp.readLeInt() != CENSIG)
-          throw new ZipException("invalid CEN header (bad signature)");
-
-        inp.skip(4);
-        int flags = inp.readLeUnsignedShort();
-        if ((flags & 1) != 0)
-          throw new ZipException("invalid CEN header (encrypted entry)");
-        int method = inp.readLeUnsignedShort();
-        if (method != ZipEntry.STORED && method != ZipEntry.DEFLATED)
-          throw new ZipException("invalid CEN header (bad compression method)");
-        ZipEntry entry = new ZipEntry();
-        entry.flag = flags;
-        entry.method = method;
-        entry.time = inp.readLeUnsignedInt();
-        entry.crc = inp.readLeUnsignedInt();
-        entry.csize = inp.readLeUnsignedInt();
-        entry.size = inp.readLeUnsignedInt();
-        int nameLen = inp.readLeUnsignedShort();
-        int extraLen = inp.readLeUnsignedShort();
-        int commentLen = inp.readLeUnsignedShort();
-        inp.skip(8);
-        entry.offset = inp.readLeUnsignedInt();
-        entry.name = inp.readString(nameLen, (flags & EFS) != 0);
-
-        if (extraLen > 0)
-          {
-            byte[] extra = new byte[extraLen];
-            inp.readFully(extra);
-            entry.extra = extra;
-            readZip64ExtraField(entry, extra);
-          }
-        if (commentLen > 0)
-          {
-            entry.comment = inp.readString(commentLen, (flags & EFS) != 0);
-          }
-        entries.put(entry.name, entry);
-      }
-
-    if (inp.position() != pos)
-      throw new ZipException("invalid CEN header (bad header size)");
-  }
-
-  private static void readZip64ExtraField(ZipEntry entry, byte[] extra)
-  {
-    if (entry.csize == ZIP64_MAGICVAL || entry.size == ZIP64_MAGICVAL
-        || entry.offset == ZIP64_MAGICVAL)
-      {
-        for (int pos = 0; pos < extra.length - 4; )
-          {
-            int headerID = decodeLeUnsignedShort(extra, pos);
-            int dataSize = decodeLeUnsignedShort(extra, pos + 2);
-            pos += 4;
-            if (headerID == ZIP64_EXTID)
-              {
-                if (entry.size == ZIP64_MAGICVAL)
-                  {
-                    entry.size = decodeLeLong(extra, pos);
-                    pos += 8;
-                  }
-                if (entry.csize == ZIP64_MAGICVAL)
-                  {
-                    entry.csize = decodeLeLong(extra, pos);
-                    pos += 8;
-                  }
-                if (entry.offset == ZIP64_MAGICVAL)
-                  {
-                    entry.offset = decodeLeLong(extra, pos);
-                    pos += 8;
-                  }
-                break;
-              }
-            pos += dataSize;
-          }
-      }
-  }
-
-  private static int decodeLeUnsignedShort(byte[] b, int off)
-  {
-    return (b[off] & 0xFF) | ((b[off + 1] & 0xFF) << 8);
-  }
-
-  private static long decodeLeLong(byte[] b, int off)
-  {
-    return 0
-        | ((b[off + 0] & 0xFFL) << 0)
-        | ((b[off + 1] & 0xFFL) << 8)
-        | ((b[off + 2] & 0xFFL) << 16)
-        | ((b[off + 3] & 0xFFL) << 24)
-        | ((b[off + 4] & 0xFFL) << 32)
-        | ((b[off + 5] & 0xFFL) << 40)
-        | ((b[off + 6] & 0xFFL) << 48)
-        | ((b[off + 7] & 0xFFL) << 56);
-  }
-
-  /**
-   * Closes the ZipFile.  This also closes all input streams given by
-   * this class.  After this is called, no further method should be
-   * called.
-   * 
-   * @exception IOException if a i/o error occured.
-   */
-  public void close() throws IOException
-  {
-    RandomAccessFile raf = this.raf;
-    if (raf == null)
-      return;
-
-    synchronized (raf)
-      {
-        closed = true;
-        entries = null;
-        raf.close();
-      }
-  }
-
-  /**
-   * Calls the <code>close()</code> method when this ZipFile has not yet
-   * been explicitly closed.
-   */
-  protected void finalize() throws IOException
-  {
-    if (!closed && raf != null) close();
-  }
-
-  /**
-   * Returns an enumeration of all Zip entries in this Zip file.
-   *
-   * @exception IllegalStateException when the ZipFile has already been closed
-   */
-  public Enumeration<? extends ZipEntry> entries()
-  {
-    checkClosed();
-    return new ZipEntryEnumeration(entries.values().iterator());
-  }
-
-  /**
-   * Searches for a zip entry in this archive with the given name.
-   *
-   * @param name the name. May contain directory components separated by
-   * slashes ('/').
-   * @return the zip entry, or null if no entry with that name exists.
-   *
-   * @exception IllegalStateException when the ZipFile has already been closed
-   */
-  public ZipEntry getEntry(String name)
-  {
-    checkClosed();
-    ZipEntry entry = entries.get(name);
-    // If we didn't find it, maybe it's a directory.
-    if (entry == null && !name.endsWith("/"))
-      entry = entries.get(name + '/');
-    return entry != null ? (ZipEntry)entry.clone() : null;
-  }
-
-  /**
-   * Creates an input stream reading the given zip entry as
-   * uncompressed data.  Normally zip entry should be an entry
-   * returned by getEntry() or entries().
-   *
-   * This implementation returns null if the requested entry does not
-   * exist.  This decision is not obviously correct, however, it does
-   * appear to mirror Sun's implementation, and it is consistant with
-   * their javadoc.  On the other hand, the old JCL book, 2nd Edition,
-   * claims that this should return a "non-null ZIP entry".  We have
-   * chosen for now ignore the old book, as modern versions of Ant (an
-   * important application) depend on this behaviour.  See discussion
-   * in this thread:
-   * http://gcc.gnu.org/ml/java-patches/2004-q2/msg00602.html
-   *
-   * @param entry the entry to create an InputStream for.
-   * @return the input stream, or null if the requested entry does not exist.
-   *
-   * @exception IllegalStateException when the ZipFile has already been closed
-   * @exception IOException if a i/o error occured.
-   * @exception ZipException if the Zip archive is malformed.  
-   */
-  public InputStream getInputStream(ZipEntry entry) throws IOException
-  {
-    checkClosed();
-
-    final ZipEntry zipEntry = entries.get(entry.getName());
-    if (zipEntry == null)
-      return null;
-
-    if (zipEntry instanceof ClassStubZipEntry)
-      return ((ClassStubZipEntry)zipEntry).getInputStream();
-
-    PartialInputStream inp = new PartialInputStream(1024) {
-        void lazyInitialSeek() throws IOException {
-            seek(zipEntry.offset);
-
-            if (readLeInt() != LOCSIG)
-              throw new ZipException("invalid LOC header (bad signature)");
-
-            skip(22);
-
-            int nameLen = readLeUnsignedShort();
-            int extraLen = readLeUnsignedShort();
-            skip(nameLen + extraLen);
-
-            setLength(zipEntry.getCompressedSize());
-        }
-    };
-
-    switch (zipEntry.getMethod())
-      {
-      case ZipOutputStream.STORED:
-        return inp;
-      case ZipOutputStream.DEFLATED:
-        inp.addDummyByte();
-        final Inflater inf = new Inflater(true);
-        final int sz = (int) zipEntry.getSize();
-        return new InflaterInputStream(inp, inf)
-        {
-          private boolean closed;
-          public void close() throws IOException
-          {
-            closed = true;
-            super.close();
-          }
-          public int available() throws IOException
-          {
-            if (closed)
-              return 0;
-            if (sz == -1)
-              return super.available();
-            if (super.available() != 0)
-              return sz - inf.getTotalOut();
-            return 0;
-          }
-        };
-      default:
-        throw new ZipException("invalid compression method");
-      }
-  }
-  
-  /**
-   * Returns the (path) name of this zip file.
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * Returns the number of entries in this zip file.
-   *
-   * @exception IllegalStateException when the ZipFile has already been closed
-   */
-  public int size()
-  {
-    checkClosed();
-    return entries.size();
-  }
-
-  /**
-   * Returns the zip file comment.
-   *
-   * @exception IllegalStateException when the ZipFile has already been closed
-   */
-  public synchronized String getComment()
-  {
-    checkClosed();
-    try
-      {
-        PartialInputStream inp = new PartialInputStream(4096);
-        long pos = inp.seekEndOfCentralDirectory();
-        inp.skip(16);
-        int commentLength = inp.readLeUnsignedShort();
-        if (commentLength == 0)
-          return null;
-        return inp.readString(commentLength, false);
-      }
-    catch (IOException _)
-      {
-        return null;
-      }
-  }
-
-  private static class ZipEntryEnumeration implements Enumeration<ZipEntry>
-  {
-    private final Iterator<ZipEntry> elements;
-
-    public ZipEntryEnumeration(Iterator<ZipEntry> elements)
-    {
-      this.elements = elements;
-    }
-
-    public boolean hasMoreElements()
-    {
-      return elements.hasNext();
-    }
-
-    public ZipEntry nextElement()
-    {
-      /* We return a clone, just to be safe that the user doesn't
-       * change the entry.  
-       */
-      return (ZipEntry) (elements.next().clone());
-    }
-  }
-
-  private class PartialInputStream extends InputStream
-  {
-    private final byte[] buffer;
-    private long bufferOffset;
-    private int pos;
-    private long end;
-    private boolean lazy;
-    // We may need to supply an extra dummy byte to our reader.
-    // See Inflater.  We use a count here to simplify the logic
-    // elsewhere in this class.  Note that we ignore the dummy
-    // byte in methods where we know it is not needed.
-    private int dummyByteCount;
-
-    public PartialInputStream(int bufferSize)
-      throws IOException
-    {
-      buffer = new byte[bufferSize];
-      bufferOffset = -buffer.length;
-      pos = buffer.length;
-      end = raf.length();
-      lazy = true;
-    }
-
-    // Seek to the "end of central directory record" and position
-    // the stream after the ENDSIG and return the file offset
-    // where the record starts.
-    long seekEndOfCentralDirectory() throws IOException
-    {
-      /* Search for the End Of Central Directory.  When a zip comment is 
-       * present the directory may start earlier.
-       * Note that a comment has a maximum length of 64K, so that is the
-       * maximum we search backwards.
-       */
-      long length = raf.length();
-      if (length == 0)
-        throw new ZipException("zip file is empty");
-      long pos = length - ENDHDR;
-      long top = Math.max(0, pos - 65536);
-      do
-        {
-          if (pos < top)
-            throw new ZipException("error in opening zip file");
-          seek(pos--);
-        }
-      while (readLeInt() != ENDSIG);
-      return pos + 1;
-    }
-
-    void lazyInitialSeek() throws IOException
-    {
-    }
-
-    void setLength(long length)
-    {
-      end = bufferOffset + pos + length;
-    }
-
-    private void fillBuffer() throws IOException
-    {
-      if (closed)
-        throw new ZipException("ZipFile closed");
-
-      synchronized (raf)
-        {
-          long len = end - bufferOffset;
-          if (len == 0 && dummyByteCount > 0)
-            {
-              buffer[0] = 0;
-              dummyByteCount = 0;
-            }
-          else
-            {
-              raf.seek(bufferOffset);
-              raf.readFully(buffer, 0, (int) Math.min(buffer.length, len));
-            }
-        }
-    }
-    
-    public int available() throws IOException
-    {
-      if (lazy)
-        {
-          lazy = false;
-          lazyInitialSeek();
-        }
-      long amount = end - (bufferOffset + pos);
-      if (amount > Integer.MAX_VALUE)
-        return Integer.MAX_VALUE;
-      return (int) amount;
-    }
-    
-    public int read() throws IOException
-    {
-      if (bufferOffset + pos >= end + dummyByteCount)
-        return -1;
-      if (pos == buffer.length)
-        {
-          if (lazy)
-            {
-              lazy = false;
-              lazyInitialSeek();
-              return read();
-            }
-          bufferOffset += buffer.length;
-          pos = 0;
-          fillBuffer();
-        }
-      
-      return buffer[pos++] & 0xFF;
-    }
-
-    public int read(byte[] b, int off, int len) throws IOException
-    {
-      if (lazy)
-        {
-          lazy = false;
-          lazyInitialSeek();
-        }
-
-      if (len > end + dummyByteCount - (bufferOffset + pos))
-        {
-          len = (int) (end + dummyByteCount - (bufferOffset + pos));
-          if (len == 0)
-            return -1;
-        }
-
-      int totalBytesRead = Math.min(buffer.length - pos, len);
-      System.arraycopy(buffer, pos, b, off, totalBytesRead);
-      pos += totalBytesRead;
-      off += totalBytesRead;
-      len -= totalBytesRead;
-
-      while (len > 0)
-        {
-          bufferOffset += buffer.length;
-          pos = 0;
-          fillBuffer();
-          int remain = Math.min(buffer.length, len);
-          System.arraycopy(buffer, pos, b, off, remain);
-          pos += remain;
-          off += remain;
-          len -= remain;
-          totalBytesRead += remain;
-        }
-      
-      return totalBytesRead;
-    }
-
-    public long skip(long amount) throws IOException
-    {
-      if (lazy)
-        {
-          lazy = false;
-          lazyInitialSeek();
-        }
-      if (amount < 0)
-        return 0;
-      if (amount > end - (bufferOffset + pos))
-        amount = end - (bufferOffset + pos);
-      seek(bufferOffset + pos + amount);
-      return amount;
-    }
-
-    void seek(long newpos) throws IOException
-    {
-      long offset = newpos - bufferOffset;
-      if (offset >= 0 && offset <= buffer.length)
-        {
-          pos = (int) offset;
-        }
-      else
-        {
-          bufferOffset = newpos;
-          pos = 0;
-          fillBuffer();
-        }
-    }
-
-    long position()
-    {
-      return bufferOffset + pos;
-    }
-
-    void readFully(byte[] buf) throws IOException
-    {
-      if (read(buf, 0, buf.length) != buf.length)
-        throw new EOFException();
-    }
-
-    void readFully(byte[] buf, int off, int len) throws IOException
-    {
-      if (read(buf, off, len) != len)
-        throw new EOFException();
-    }
-
-    int readLeUnsignedShort() throws IOException
-    {
-      int result;
-      if(pos + 1 < buffer.length)
-        {
-          result = ((buffer[pos + 0] & 0xff) | (buffer[pos + 1] & 0xff) << 8);
-          pos += 2;
-        }
-      else
-        {
-          int b0 = read();
-          int b1 = read();
-          if (b1 == -1)
-            throw new EOFException();
-          result = (b0 & 0xff) | (b1 & 0xff) << 8;
-        }
-      return result;
-    }
-
-    int readLeInt() throws IOException
-    {
-      int result;
-      if(pos + 3 < buffer.length)
-        {
-          result = (((buffer[pos + 0] & 0xff) | (buffer[pos + 1] & 0xff) << 8)
-                   | ((buffer[pos + 2] & 0xff)
-                       | (buffer[pos + 3] & 0xff) << 8) << 16);
-          pos += 4;
-        }
-      else
-        {
-          int b0 = read();
-          int b1 = read();
-          int b2 = read();
-          int b3 = read();
-          if (b3 == -1)
-            throw new EOFException();
-          result =  (((b0 & 0xff) | (b1 & 0xff) << 8) | ((b2 & 0xff)
-                    | (b3 & 0xff) << 8) << 16);
-        }
-      return result;
-    }
-
-    final long readLeUnsignedInt() throws IOException
-    {
-      return readLeInt() & 0xffffffffL;
-    }
-    
-    final long readLeLong() throws IOException
-    {
-      return readLeUnsignedInt() | (readLeUnsignedInt() << 32);
-    }
-
-    /**
-     * Decode chars from byte buffer using charset encoding.  This
-     * operation is performance-critical since a jar file contains a
-     * large number of strings for the name of each file in the
-     * archive.  This routine therefore avoids using the expensive
-     * utf8Decoder when decoding is straightforward.
-     *
-     * @param buffer the buffer that contains the encoded character
-     *        data
-     * @param pos the index in buffer of the first byte of the encoded
-     *        data
-     * @param length the length of the encoded data in number of
-     *        bytes.
-     *
-     * @return a String that contains the decoded characters.
-     */
-    private String decodeChars(byte[] buffer, int pos, int length, boolean utf8)
-      throws IOException
-    {
-      if (!utf8 && charset != StandardCharsets.UTF_8)
-        return new String(buffer, pos, length, charset);
-
-      for (int i = pos; i < pos + length; i++)
-        {
-          if (buffer[i] <= 0)
-            return new String(buffer, pos, length, "UTF-8");
-        }
-      return new String(buffer, 0, pos, length);
-    }
-
-    String readString(int length, boolean utf8) throws IOException
-    {
-      if (length > end - (bufferOffset + pos))
-        throw new EOFException();
-
-      String result = null;
-      try
-        {
-          if (buffer.length - pos >= length)
-            {
-              result = decodeChars(buffer, pos, length, utf8);
-              pos += length;
-            }
-          else
-            {
-              byte[] b = new byte[length];
-              readFully(b);
-              result = decodeChars(b, 0, length, utf8);
-            }
-        }
-      catch (UnsupportedEncodingException uee)
-        {
-          throw new AssertionError(uee);
-        }
-      return result;
-    }
-
-    public void addDummyByte()
-    {
-      dummyByteCount = 1;
-    }
-  }
-}
diff --git a/openjdk/map.xml b/openjdk/map.xml
deleted file mode 100644
index 61cf80c4..00000000
--- a/openjdk/map.xml
+++ /dev/null
@@ -1,3068 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
-  Copyright (C) 2002-2014 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
--->
-<root>
-    <assembly>
-        <class name="java.lang.Object" shadows="System.Object" modifiers="public">
-            <attribute type="System.SerializableAttribute" sig="()V" />
-            <constructor sig="()V" modifiers="public" />
-            <method name="notifyAll" sig="()V" modifiers="public final">
-                <body>
-                    <ldarg_0 />
-                    <call type="System.Threading.Monitor" name="PulseAll" sig="(Ljava.lang.Object;)V" />
-                    <ret />
-                </body>
-            </method>
-            <method name="notify" sig="()V" modifiers="public final">
-                <body>
-                    <ldarg_0 />
-                    <call type="System.Threading.Monitor" name="Pulse" sig="(Ljava.lang.Object;)V" />
-                    <ret />
-                </body>
-            </method>
-            <method name="wait" sig="()V" modifiers="public final">
-                <throws class="java.lang.InterruptedException" />
-                <body>
-                    <ldarg_0 />
-                    <ldc_i4_0 />
-                    <conv_i8 />
-                    <call class="java.lang.Thread" name="objectWait" sig="(Ljava.lang.Object;J)V" />
-                    <ret />
-                </body>
-            </method>
-            <method name="wait" sig="(J)V" modifiers="public final">
-                <parameter name="timeout" />
-                <throws class="java.lang.InterruptedException" />
-                <body>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <call class="java.lang.Thread" name="objectWait" sig="(Ljava.lang.Object;J)V" />
-                    <ret />
-                </body>
-            </method>
-            <method name="wait" sig="(JI)V" modifiers="public final">
-                <parameter name="timeout" />
-                <parameter name="nanos" />
-                <throws class="java.lang.InterruptedException" />
-                <body>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <ldarg_2 />
-                    <call class="java.lang.Thread" name="objectWait" sig="(Ljava.lang.Object;JI)V" />
-                    <ret />
-                </body>
-            </method>
-            <method name="getClass" sig="()Ljava.lang.Class;" modifiers="public final">
-                <attribute type="IKVM.Attributes.SignatureAttribute" sig="(Ljava.lang.String;)V">
-                    <parameter>()Ljava/lang/Class&lt;+Ljava/lang/Object;&gt;;</parameter>
-                </attribute>
-                <body>
-                    <ldarg_0 />
-                    <call class="ikvm.runtime.Util" name="getClassFromObject" sig="(Ljava.lang.Object;)Ljava.lang.Class;" />
-                    <ret />
-                </body>
-            </method>
-            <method name="clone" sig="()Ljava.lang.Object;" modifiers="protected">
-                <throws class="java.lang.CloneNotSupportedException" />
-                <body>
-                    <ldarg_0 />
-                    <isinst class="java.lang.Cloneable" />
-                    <brtrue name="ok" />
-                    <newobj class="java.lang.CloneNotSupportedException" name="&lt;init&gt;" sig="()V" />
-                    <throw />
-                    <label name="ok" />
-                    <ldarg_0 />
-                    <call type="System.Object" name="MemberwiseClone" sig="()Ljava.lang.Object;" />
-                    <ret />
-                </body>
-                <alternateBody>
-                    <ldarg_0 />
-                    <isinst type="System.Array" />
-                    <dup />
-                    <brfalse name="not_array" />
-                    <call type="System.Array" name="Clone" sig="()Ljava.lang.Object;" />
-                    <ret />
-                    <label name="not_array" />
-                    <pop />
-                    <ldarg_0 />
-                    <isinst class="java.lang.Cloneable" />
-                    <brfalse name="not_cloneable" />
-                    <!--
-		     This means we're Cloneable, but not derived from java.lang.Object or java.lang.Throwable.
-		     It also means that we must have been invoked thru reflection (or by code in the java.lang package),
-		     so it is OK to use reflection to call Object.MemberwiseClone().
-		     -->
-                    <ldtoken type="System.Object" />
-                    <call type="System.Type" name="GetTypeFromHandle" sig="(Lcli.System.RuntimeTypeHandle;)Lcli.System.Type;" />
-                    <ldstr value="MemberwiseClone" />
-                    <ldc_i4 value="36" />
-                    <ldnull />
-                    <ldsfld type="System.Type" name="EmptyTypes" sig="[Lcli.SystemType;" />
-                    <ldnull />
-                    <callvirt type="System.Type" name="GetMethod" sig="(Ljava.lang.String;Lcli.System.Reflection.BindingFlags;Lcli.System.Reflection.Binder;[Lcli.System.Type;[Lcli.System.Reflection.ParameterModifier;)Lcli.System.Reflection.MethodInfo;" />
-                    <ldarg_0 />
-                    <ldnull />
-                    <callvirt type="System.Reflection.MethodInfo" name="Invoke" sig="(Ljava.lang.Object;[Ljava.lang.Object;)Ljava.lang.Object;" />
-                    <ret />
-                    <label name="not_cloneable" />
-                    <newobj class="java.lang.CloneNotSupportedException" name="&lt;init&gt;" sig="()V" />
-                    <throw />
-                </alternateBody>
-            </method>
-            <method name="toStringImpl" sig="(Ljava.lang.Object;)Ljava.lang.String;" modifiers="private static">
-                <body>
-                    <ldarg_0 />
-                    <callvirt class="java.lang.Object" name="getClass" sig="()Ljava.lang.Class;" />
-                    <call class="java.lang.Class" name="getName" sig="()Ljava.lang.String;" />
-                    <ldstr value="@" />
-                    <ldarg_0 />
-                    <callvirt class="java.lang.Object" name="hashCode" sig="()I" />
-                    <call class="java.lang.Integer" name="toHexString" sig="(I)Ljava.lang.String;" />
-                    <call type="System.String" name="Concat" sig="(Ljava.lang.String;Ljava.lang.String;Ljava.lang.String;)Ljava.lang.String;" />
-                    <ret />
-                </body>
-            </method>
-            <method name="toString" sig="()Ljava.lang.String;" modifiers="public">
-                <override name="ToString" />
-                <body>
-                    <ldarg_0 />
-                    <call class="java.lang.Object" name="toStringImpl" sig="(Ljava.lang.Object;)Ljava.lang.String;" />
-                    <ret />
-                </body>
-                <alternateBody>
-                    <ldarg_0 />
-                    <isinst type="System.Array" />
-                    <brfalse name="skip" />
-                    <ldarg_0 />
-                    <call class="java.lang.Object" name="toStringImpl" sig="(Ljava.lang.Object;)Ljava.lang.String;" />
-                    <br name="end" />
-                    <label name="skip" />
-                    <ldarg_0 />
-                    <callvirt type="System.Object" name="ToString" sig="()Ljava.lang.String;" />
-                    <label name="end" />
-                    <ret />
-                </alternateBody>
-                <nonvirtualAlternateBody>
-                    <ldarg_0 />
-                    <call class="java.lang.Object" name="toStringImpl" sig="(Ljava.lang.Object;)Ljava.lang.String;" />
-                    <ret />
-                </nonvirtualAlternateBody>
-            </method>
-            <method name="hashCode" sig="()I" modifiers="public">
-                <override name="GetHashCode" />
-                <nonvirtualAlternateBody>
-                    <ldarg_0 />
-                    <call type="System.Runtime.CompilerServices.RuntimeHelpers" name="GetHashCode" sig="(Ljava.lang.Object;)I" />
-                    <ret />
-                </nonvirtualAlternateBody>
-            </method>
-            <method name="equals" sig="(Ljava.lang.Object;)Z" modifiers="public">
-                <parameter name="obj" />
-                <override name="Equals" />
-                <body>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <ceq />
-                    <ret />
-                </body>
-                <alternateBody>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <callvirt type="System.Object" name="Equals" sig="(Ljava.lang.Object;)Z" />
-                    <ret />
-                </alternateBody>
-                <nonvirtualAlternateBody>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <ceq />
-                    <ret />
-                </nonvirtualAlternateBody>
-            </method>
-            <method name="finalize" sig="()V" modifiers="protected">
-                <throws class="java.lang.Throwable" />
-                <!-- NOTE we don't override Finalize, because that would be bad for performance,
-		     instead, the compiler contains a hack to lazily override Finalize when a class
-		     overrides our finalize
-		     TODO consider adding code to constructor (in debug builds) to detect that someone
-		     has overriden our finalize from another .NET language (if no intermediate Java base class
-		     has overriden finalize, the lazy override of Object.Finalize hasn't kicked in and finalize
-		     will never be called)
-		-->
-                <body>
-                    <ldarg_0 />
-                    <call type="System.Object" name="Finalize" sig="()V" />
-                    <ret />
-                </body>
-                <alternateBody>
-                    <!-- if code in the java.lang package explicitly invokes finalize on a non java.lang.Object
-			 derived object	we just ignore it -->
-                    <ret />
-                </alternateBody>
-            </method>
-        </class>
-        <class name="java.lang.String" shadows="System.String" modifiers="public final">
-            <implements class="java.io.Serializable" />
-            <implements class="java.lang.Comparable" />
-            <implements class="java.lang.CharSequence" />
-            <attribute type="IKVM.Attributes.SignatureAttribute" sig="(Ljava.lang.String;)V">
-                <parameter>Ljava/lang/Object;Ljava/io/Serializable;Ljava/lang/Comparable&lt;Ljava/lang/String;&gt;;Ljava/lang/CharSequence;</parameter>
-            </attribute>
-            <attribute type="IKVM.Attributes.NonNestedInnerClassAttribute" sig="(Ljava.lang.String;)V">
-                <parameter>java.lang.String$CaseInsensitiveComparator</parameter>
-            </attribute>
-            <field name="serialVersionUID" sig="J" modifiers="private static final" constant="-6849794470754667710" />
-            <constructor sig="()V" modifiers="public">
-                <alternateBody>
-                    <ldstr value="" />
-                    <call type="System.String" name="Copy" sig="(Ljava.lang.String;)Ljava.lang.String;" />
-                    <ret />
-                </alternateBody>
-            </constructor>
-            <constructor sig="([C)V" modifiers="public">
-                <parameter name="value" />
-                <alternateBody>
-                    <!-- force a NullPointerException if the array is null -->
-                    <ldarg_0 />
-                    <ldlen />
-                    <pop />
-                    <ldarg_0 />
-                    <newobj type="System.String" name=".ctor" sig="([C)V" />
-                    <ret />
-                </alternateBody>
-            </constructor>
-            <constructor sig="([CII)V" modifiers="public">
-                <parameter name="value" />
-                <parameter name="offset" />
-                <parameter name="count" />
-            </constructor>
-            <!-- Package private constructor (that OpenJDK uses to avoid copying the array) -->
-            <constructor sig="([CZ)V" modifiers="">
-                <alternateBody>
-                    <ldarg_0 />
-                    <newobj type="System.String" name=".ctor" sig="([C)V" />
-                    <ret />
-                </alternateBody>
-            </constructor>
-            <constructor sig="(Ljava.lang.String;)V" modifiers="public">
-                <parameter name="original" />
-                <redirect class="System.String, mscorlib" name="Copy" type="static" sig="(Ljava.lang.String;)Ljava.lang.String;" />
-            </constructor>
-            <constructor sig="(Ljava.lang.StringBuffer;)V" modifiers="public">
-                <parameter name="buffer" />
-                <redirect class="java.lang.StringHelper" name="NewString" type="static" sig="(Ljava.lang.StringBuffer;)Ljava.lang.String;" />
-            </constructor>
-            <constructor sig="(Ljava.lang.StringBuilder;)V" modifiers="public">
-                <parameter name="builder" />
-                <alternateBody>
-                    <ldarg_0 />
-                    <ldfld class="java.lang.StringBuilder" name="value" sig="[C" />
-                    <ldc_i4_0 />
-                    <ldarg_0 />
-                    <ldfld class="java.lang.StringBuilder" name="count" sig="I" />
-                    <newobj type="System.String" name=".ctor" sig="([CII)V" />
-                    <ret />
-                </alternateBody>
-            </constructor>
-            <constructor sig="([B)V" modifiers="public">
-                <parameter name="bytes" />
-                <redirect class="java.lang.StringHelper" name="NewString" type="static" sig="([B)Ljava.lang.String;" />
-            </constructor>
-            <constructor sig="([BI)V" modifiers="public">
-                <parameter name="ascii" />
-                <parameter name="hibyte" />
-                <attribute type="System.ObsoleteAttribute" sig="()V" />
-                <redirect class="java.lang.StringHelper" name="NewString" type="static" sig="([BI)Ljava.lang.String;" />
-            </constructor>
-            <constructor sig="([BII)V" modifiers="public">
-                <parameter name="bytes" />
-                <parameter name="offset" />
-                <parameter name="length" />
-                <redirect class="java.lang.StringHelper" name="NewString" type="static" sig="([BII)Ljava.lang.String;" />
-            </constructor>
-            <constructor sig="([BIII)V" modifiers="public">
-                <parameter name="ascii" />
-                <parameter name="hibyte" />
-                <parameter name="offset" />
-                <parameter name="count" />
-                <attribute type="System.ObsoleteAttribute" sig="()V" />
-                <redirect class="java.lang.StringHelper" name="NewString" type="static" sig="([BIII)Ljava.lang.String;" />
-            </constructor>
-            <constructor sig="([BLjava.lang.String;)V" modifiers="public">
-                <parameter name="bytes" />
-                <parameter name="charsetName" />
-                <throws class="java.io.UnsupportedEncodingException" />
-                <redirect class="java.lang.StringHelper" name="NewString" type="static" sig="([BLjava.lang.String;)Ljava.lang.String;" />
-            </constructor>
-            <constructor sig="([BIILjava.lang.String;)V" modifiers="public">
-                <parameter name="bytes" />
-                <parameter name="offset" />
-                <parameter name="length" />
-                <parameter name="charsetName" />
-                <throws class="java.io.UnsupportedEncodingException" />
-                <redirect class="java.lang.StringHelper" name="NewString" type="static" sig="([BIILjava.lang.String;)Ljava.lang.String;" />
-            </constructor>
-            <constructor sig="([III)V" modifiers="public">
-                <parameter name="codePoints" />
-                <parameter name="offset" />
-                <parameter name="count" />
-                <redirect class="java.lang.StringHelper" name="NewString" type="static" sig="([III)Ljava.lang.String;" />
-            </constructor>
-            <constructor sig="([BIILjava.nio.charset.Charset;)V" modifiers="public">
-                <parameter name="bytes" />
-                <parameter name="offset" />
-                <parameter name="length" />
-                <parameter name="charset" />
-                <redirect class="java.lang.StringHelper" name="NewString" type="static" sig="([BIILjava.nio.charset.Charset;)Ljava.lang.String;" />
-            </constructor>
-            <constructor sig="([BLjava.nio.charset.Charset;)V" modifiers="public">
-                <parameter name="bytes" />
-                <parameter name="charset" />
-                <redirect class="java.lang.StringHelper" name="NewString" type="static" sig="([BLjava.nio.charset.Charset;)Ljava.lang.String;" />
-            </constructor>
-            <method name="hashCode" sig="()I" modifiers="public">
-                <redirect class="java.lang.StringHelper" name="hashCode" type="static" sig="(Lcli.System.String;)I" />
-            </method>
-            <!-- we have a toString here to make sure that it shows up as a declared method in reflection -->
-            <method name="toString" sig="()Ljava.lang.String;" modifiers="public" />
-            <!-- we have an equals here to make sure that it shows up as a declared method in reflection -->
-            <method name="equals" sig="(Ljava.lang.Object;)Z" modifiers="public">
-                <parameter name="anObject" />
-            </method>
-            <method name="valueOf" sig="(Z)Ljava.lang.String;" modifiers="public static">
-                <parameter name="b" />
-                <redirect class="java.lang.StringHelper" />
-            </method>
-            <method name="valueOf" sig="(I)Ljava.lang.String;" modifiers="public static">
-                <parameter name="i" />
-                <redirect class="java.lang.StringHelper" />
-            </method>
-            <method name="valueOf" sig="(J)Ljava.lang.String;" modifiers="public static">
-                <parameter name="l" />
-                <redirect class="java.lang.StringHelper" />
-            </method>
-            <method name="valueOf" sig="(C)Ljava.lang.String;" modifiers="public static">
-                <parameter name="c" />
-                <body>
-                    <ldarg_0 />
-                    <ldc_i4_1 />
-                    <newobj type="System.String" name=".ctor" sig="(CI)V" />
-                    <ret />
-                </body>
-            </method>
-            <method name="valueOf" sig="(F)Ljava.lang.String;" modifiers="public static">
-                <parameter name="f" />
-                <redirect class="java.lang.StringHelper" />
-            </method>
-            <method name="valueOf" sig="(D)Ljava.lang.String;" modifiers="public static">
-                <parameter name="d" />
-                <redirect class="java.lang.StringHelper" />
-            </method>
-            <method name="valueOf" sig="([C)Ljava.lang.String;" modifiers="public static">
-                <parameter name="data" />
-                <redirect class="java.lang.StringHelper" />
-            </method>
-            <method name="valueOf" sig="([CII)Ljava.lang.String;" modifiers="public static">
-                <parameter name="data" />
-                <parameter name="offset" />
-                <parameter name="count" />
-                <redirect class="java.lang.StringHelper" />
-            </method>
-            <method name="valueOf" sig="(Ljava.lang.Object;)Ljava.lang.String;" modifiers="public static">
-                <parameter name="obj" />
-                <redirect class="java.lang.StringHelper" />
-            </method>
-            <method name="substring" sig="(I)Ljava.lang.String;" modifiers="public">
-                <parameter name="beginIndex" />
-                <redirect name="Substring" />
-            </method>
-            <method name="length" sig="()I" modifiers="public">
-                <redirect name="get_Length" />
-            </method>
-            <method name="charAt" sig="(I)C" modifiers="public" nonullcheck="true">
-                <parameter name="index" />
-                <body>
-                    <ldarg_1 />
-                    <ldarg_0 />
-                    <callvirt type="System.String" name="get_Length" sig="()I" />
-                    <bge_un name="throw" />
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <callvirt type="System.String" name="get_Chars" sig="(I)C" />
-                    <ret />
-                    <label name="throw" />
-                    <newobj class="java.lang.StringIndexOutOfBoundsException" name="&lt;init&gt;" sig="()V" />
-                    <throw />
-                </body>
-            </method>
-            <method name="substring" sig="(II)Ljava.lang.String;" modifiers="public">
-                <parameter name="beginIndex" />
-                <parameter name="endIndex" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Lcli.System.String;II)Ljava.lang.String;" />
-            </method>
-            <method name="indexOf" sig="(I)I" modifiers="public">
-                <parameter name="ch" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Lcli.System.String;I)I" />
-            </method>
-            <method name="indexOf" sig="(II)I" modifiers="public" nonullcheck="true">
-                <parameter name="ch" />
-                <parameter name="fromIndex" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Lcli.System.String;II)I" />
-            </method>
-            <method name="indexOf" sig="(Ljava.lang.String;)I" modifiers="public">
-                <parameter name="str" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;Ljava.lang.String;)I" />
-            </method>
-            <method name="indexOf" sig="(Ljava.lang.String;I)I" modifiers="public">
-                <parameter name="str" />
-                <parameter name="fromIndex" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;Ljava.lang.String;I)I" />
-            </method>
-            <!-- These methods are package private and used by (Abstract)StringBuilder/Buffer -->
-            <method name="getChars" sig="([CI)V" modifiers="">
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;[CI)V" />
-            </method>
-            <method name="indexOf" sig="([CII[CIII)I" modifiers="static">
-                <redirect class="java.lang.StringHelper" />
-            </method>
-            <method name="indexOf" sig="([CIILjava.lang.String;I)I" modifiers="static">
-                <redirect class="java.lang.StringHelper" />
-            </method>
-            <method name="lastIndexOf" sig="([CII[CIII)I" modifiers="static">
-                <redirect class="java.lang.StringHelper" />
-            </method>
-            <method name="lastIndexOf" sig="([CIILjava.lang.String;I)I" modifiers="static">
-                <redirect class="java.lang.StringHelper" />
-            </method>
-            <!-- end of package private methods used by (Abstract)StringBuilder/Buffer -->
-            <method name="lastIndexOf" sig="(I)I" modifiers="public">
-                <parameter name="ch" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Lcli.System.String;I)I" />
-            </method>
-            <method name="lastIndexOf" sig="(II)I" modifiers="public">
-                <parameter name="ch" />
-                <parameter name="fromIndex" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Lcli.System.String;II)I" />
-            </method>
-            <method name="lastIndexOf" sig="(Ljava.lang.String;)I" modifiers="public">
-                <parameter name="str" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;Ljava.lang.String;)I" />
-            </method>
-            <method name="lastIndexOf" sig="(Ljava.lang.String;I)I" modifiers="public">
-                <parameter name="str" />
-                <parameter name="fromIndex" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;Ljava.lang.String;I)I" />
-            </method>
-            <method name="toCharArray" sig="()[C" modifiers="public">
-                <redirect name="ToCharArray" />
-            </method>
-            <method name="getChars" sig="(II[CI)V" modifiers="public">
-                <parameter name="srcBegin" />
-                <parameter name="srcEnd" />
-                <parameter name="dst" />
-                <parameter name="dstBegin" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Lcli.System.String;II[CI)V" />
-            </method>
-            <method name="startsWith" sig="(Ljava.lang.String;)Z" modifiers="public" nonullcheck="true">
-                <parameter name="prefix" />
-                <body>
-                    <!--
-		    if (this.Length >= prefix.Length)
-		    {
-		        for (int i = 0; i < prefix.Length; i++)
-		        {
-		            if (this[i] != prefix[i])
-		            {
-			            return false;
-		            }
-		        }
-		        return true;
-		    }
-		    return false;
-                    -->
-                    <ldarg_0 />
-                    <callvirt type="System.String" name="get_Length" sig="()I" />
-                    <ldarg_1 />
-                    <callvirt type="System.String" name="get_Length" sig="()I" />
-                    <blt name="ret_false" />
-                    <ldc_i4_0 />
-                    <stloc name="i" type="System.Int32" />
-                    <br name="start_loop" />
-                    <label name="next" />
-                    <ldarg_0 />
-                    <ldloc name="i" />
-                    <callvirt type="System.String" name="get_Chars" sig="(I)C" />
-                    <ldarg_1 />
-                    <ldloc name="i" />
-                    <callvirt type="System.String" name="get_Chars" sig="(I)C" />
-                    <bne_un name="ret_false" />
-                    <ldloc name="i" />
-                    <ldc_i4_1 />
-                    <add />
-                    <stloc name="i" type="System.Int32" />
-                    <label name="start_loop" />
-                    <ldloc name="i" />
-                    <ldarg_1 />
-                    <callvirt type="System.String" name="get_Length" sig="()I" />
-                    <blt name="next" />
-                    <ldc_i4_1 />
-                    <ret />
-                    <label name="ret_false" />
-                    <ldc_i4_0 />
-                    <ret />
-                </body>
-            </method>
-            <method name="startsWith" sig="(Ljava.lang.String;I)Z" modifiers="public" nonullcheck="true">
-                <parameter name="prefix" />
-                <parameter name="toffset" />
-                <body>
-                    <!--
-		        if (toffset >= 0
-                            && toffset <= this.Length
-                            && this.Length - toffset >= prefix.Length)
-		        {
-		            for (int i = 0; i < prefix.Length; i++)
-		            {
-	                        if (this[i + toffset] != prefix[i])
-	                        {
-		                        return false;
-	                        }
-		            }
-		            return true;
-		        }
-		        return false;
-                    -->
-                    <ldarg_0 />
-                    <callvirt type="System.String" name="get_Length" sig="()I" />
-                    <ldarg_2 />
-                    <blt_un name="ret_false" />
-                    <ldarg_0 />
-                    <callvirt type="System.String" name="get_Length" sig="()I" />
-                    <ldarg_2 />
-                    <sub />
-                    <ldarg_1 />
-                    <callvirt type="System.String" name="get_Length" sig="()I" />
-                    <blt name="ret_false" />
-                    <ldc_i4_0 />
-                    <stloc name="i" type="System.Int32" />
-                    <br name="start_loop" />
-                    <label name="next" />
-                    <ldarg_0 />
-                    <ldloc name="i" />
-                    <ldarg_2 />
-                    <add />
-                    <callvirt type="System.String" name="get_Chars" sig="(I)C" />
-                    <ldarg_1 />
-                    <ldloc name="i" />
-                    <callvirt type="System.String" name="get_Chars" sig="(I)C" />
-                    <bne_un name="ret_false" />
-                    <ldloc name="i" />
-                    <ldc_i4_1 />
-                    <add />
-                    <stloc name="i" type="System.Int32" />
-                    <label name="start_loop" />
-                    <ldloc name="i" />
-                    <ldarg_1 />
-                    <callvirt type="System.String" name="get_Length" sig="()I" />
-                    <blt name="next" />
-                    <ldc_i4_1 />
-                    <ret />
-                    <label name="ret_false" />
-                    <ldc_i4_0 />
-                    <ret />
-                </body>
-            </method>
-            <method name="endsWith" sig="(Ljava.lang.String;)Z" modifiers="public" nonullcheck="true">
-                <parameter name="suffix" />
-                <body>
-                    <!--
-                    int j = this.Length - suffix.Length;
-                    if (j >= 0)
-                    {
-                        for (int i = 0; i < suffix.Length; i++)
-                        {
-                            if (this[j++] != suffix[i])
-                            {
-                                return false;
-                            }
-                        }
-                        return true;
-                    }
-                    return false;
-                    -->
-                    <ldarg_0 />
-                    <callvirt type="System.String" name="get_Length" sig="()I" />
-                    <ldarg_1 />
-                    <callvirt type="System.String" name="get_Length" sig="()I" />
-                    <sub />
-                    <stloc name="j" type="System.Int32" />
-                    <ldloc name="j" />
-                    <ldc_i4_0 />
-                    <blt name="ret_false" />
-                    <ldc_i4_0 />
-                    <stloc name="i" type="System.Int32" />
-                    <br name="start_loop" />
-                    <label name="next" />
-                    <ldarg_0 />
-                    <ldloc name="j" />
-                    <dup />
-                    <ldc_i4_1 />
-                    <add />
-                    <stloc name="j" type="System.Int32" />
-                    <callvirt type="System.String" name="get_Chars" sig="(I)C" />
-                    <ldarg_1 />
-                    <ldloc name="i" />
-                    <callvirt type="System.String" name="get_Chars" sig="(I)C" />
-                    <bne_un name="ret_false" />
-                    <ldloc name="i" />
-                    <ldc_i4_1 />
-                    <add />
-                    <stloc name="i" type="System.Int32" />
-                    <label name="start_loop" />
-                    <ldloc name="i" />
-                    <ldarg_1 />
-                    <callvirt type="System.String" name="get_Length" sig="()I" />
-                    <blt name="next" />
-                    <ldc_i4_1 />
-                    <ret />
-                    <label name="ret_false" />
-                    <ldc_i4_0 />
-                    <ret />
-                </body>
-            </method>
-            <method name="toUpperCase" sig="()Ljava.lang.String;" modifiers="public">
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;)Ljava.lang.String;" />
-            </method>
-            <method name="toUpperCase" sig="(Ljava.util.Locale;)Ljava.lang.String;" modifiers="public">
-                <parameter name="locale" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;Ljava.util.Locale;)Ljava.lang.String;" />
-            </method>
-            <method name="toLowerCase" sig="()Ljava.lang.String;" modifiers="public">
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;)Ljava.lang.String;" />
-            </method>
-            <method name="toLowerCase" sig="(Ljava.util.Locale;)Ljava.lang.String;" modifiers="public">
-                <parameter name="locale" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;Ljava.util.Locale;)Ljava.lang.String;" />
-            </method>
-            <method name="compareToIgnoreCase" sig="(Ljava.lang.String;)I" modifiers="public">
-                <parameter name="str" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;Ljava.lang.String;)I" />
-            </method>
-            <method name="equalsIgnoreCase" sig="(Ljava.lang.String;)Z" modifiers="public">
-                <parameter name="anotherString" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;Ljava.lang.String;)Z" />
-            </method>
-            <method name="intern" sig="()Ljava.lang.String;" modifiers="public">
-                <redirect type="static" name="Intern" sig="(Ljava.lang.String;)Ljava.lang.String;" />
-            </method>
-            <method name="compareTo" sig="(Ljava.lang.String;)I" modifiers="public">
-                <parameter name="anotherString" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;Ljava.lang.String;)I" />
-            </method>
-            <method name="compareTo" sig="(Ljava.lang.Object;)I" modifiers="public ACC_BRIDGE ACC_SYNTHETIC">
-                <parameter name="o" />
-                <body>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <castclass type="System.String" />
-                    <call class="java.lang.StringHelper" name="compareTo" sig="(Ljava.lang.String;Ljava.lang.String;)I" />
-                    <ret />
-                </body>
-            </method>
-            <method name="replace" sig="(CC)Ljava.lang.String;" modifiers="public">
-                <parameter name="oldChar" />
-                <parameter name="newChar" />
-                <redirect name="Replace" />
-            </method>
-            <method name="getBytes" sig="()[B" modifiers="public">
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;)[B" />
-            </method>
-            <method name="getBytes" sig="(Ljava.lang.String;)[B" modifiers="public">
-                <parameter name="charsetName" />
-                <throws class="java.io.UnsupportedEncodingException" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;Ljava.lang.String;)[B" />
-            </method>
-            <method name="subSequence" sig="(II)Ljava.lang.CharSequence;" modifiers="public">
-                <parameter name="beginIndex" />
-                <parameter name="endIndex" />
-                <redirect class="java.lang.StringHelper" type="static" name="substring" sig="(Lcli.System.String;II)Ljava.lang.String;" />
-            </method>
-            <method name="trim" sig="()Ljava.lang.String;" modifiers="public">
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;)Ljava.lang.String;" />
-            </method>
-            <method name="regionMatches" sig="(ZILjava.lang.String;II)Z" modifiers="public">
-                <parameter name="ignoreCase" />
-                <parameter name="toffset" />
-                <parameter name="other" />
-                <parameter name="ooffset" />
-                <parameter name="len" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;ZILjava.lang.String;II)Z" />
-            </method>
-            <method name="regionMatches" sig="(ILjava.lang.String;II)Z" modifiers="public">
-                <parameter name="toffset" />
-                <parameter name="other" />
-                <parameter name="ooffset" />
-                <parameter name="len" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;ILjava.lang.String;II)Z" />
-            </method>
-            <method name="getBytes" sig="(II[BI)V" modifiers="public">
-                <parameter name="srcBegin" />
-                <parameter name="srcEnd" />
-                <parameter name="dst" />
-                <parameter name="dstBegin" />
-                <attribute type="System.ObsoleteAttribute" sig="()V" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;II[BI)V" />
-            </method>
-            <method name="concat" sig="(Ljava.lang.String;)Ljava.lang.String;" modifiers="public">
-                <parameter name="str" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;Ljava.lang.String;)Ljava.lang.String;" />
-            </method>
-            <method name="contains" sig="(Ljava.lang.CharSequence;)Z" modifiers="public">
-                <parameter name="s" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;Ljava.lang.CharSequence;)Z" />
-            </method>
-            <method name="codePointAt" sig="(I)I" modifiers="public">
-                <parameter name="index" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;I)I" />
-            </method>
-            <method name="codePointBefore" sig="(I)I" modifiers="public">
-                <parameter name="index" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;I)I" />
-            </method>
-            <method name="codePointCount" sig="(II)I" modifiers="public">
-                <parameter name="beginIndex" />
-                <parameter name="endIndex" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;II)I" />
-            </method>
-            <method name="offsetByCodePoints" sig="(II)I" modifiers="public">
-                <parameter name="index" />
-                <parameter name="codePointOffset" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;II)I" />
-            </method>
-            <method name="contentEquals" sig="(Ljava.lang.CharSequence;)Z" modifiers="public">
-                <parameter name="cs" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;Ljava.lang.CharSequence;)Z" />
-            </method>
-            <method name="contentEquals" sig="(Ljava.lang.StringBuffer;)Z" modifiers="public">
-                <parameter name="sb" />
-                <body>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <callvirt class="java.lang.StringBuffer" name="toString" sig="()Ljava.lang.String;" />
-                    <callvirt type="System.String" name="Equals" sig="(Ljava.lang.String;)Z" />
-                    <ret />
-                </body>
-            </method>
-            <method name="replace" sig="(Ljava.lang.CharSequence;Ljava.lang.CharSequence;)Ljava.lang.String;" modifiers="public">
-                <parameter name="target" />
-                <parameter name="replacement" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;Ljava.lang.CharSequence;Ljava.lang.CharSequence;)Ljava.lang.String;" />
-            </method>
-            <method name="matches" sig="(Ljava.lang.String;)Z" modifiers="public">
-                <parameter name="regex" />
-                <body>
-                    <ldarg_1 />
-                    <ldarg_0 />
-                    <call class="java.util.regex.Pattern" name="matches" sig="(Ljava.lang.String;Ljava.lang.CharSequence;)Z" />
-                    <ret />
-                </body>
-            </method>
-            <method name="replaceAll" sig="(Ljava.lang.String;Ljava.lang.String;)Ljava.lang.String;" modifiers="public">
-                <parameter name="regex" />
-                <parameter name="replacement" />
-                <body>
-                    <ldarg_1 />
-                    <call class="java.util.regex.Pattern" name="compile" sig="(Ljava.lang.String;)Ljava.util.regex.Pattern;" />
-                    <ldarg_0 />
-                    <callvirt class="java.util.regex.Pattern" name="matcher" sig="(Ljava.lang.CharSequence;)Ljava.util.regex.Matcher;" />
-                    <ldarg_2 />
-                    <callvirt class="java.util.regex.Matcher" name="replaceAll" sig="(Ljava.lang.String;)Ljava.lang.String;" />
-                    <ret />
-                </body>
-            </method>
-            <method name="replaceFirst" sig="(Ljava.lang.String;Ljava.lang.String;)Ljava.lang.String;" modifiers="public">
-                <parameter name="regex" />
-                <parameter name="replacement" />
-                <body>
-                    <ldarg_1 />
-                    <call class="java.util.regex.Pattern" name="compile" sig="(Ljava.lang.String;)Ljava.util.regex.Pattern;" />
-                    <ldarg_0 />
-                    <callvirt class="java.util.regex.Pattern" name="matcher" sig="(Ljava.lang.CharSequence;)Ljava.util.regex.Matcher;" />
-                    <ldarg_2 />
-                    <callvirt class="java.util.regex.Matcher" name="replaceFirst" sig="(Ljava.lang.String;)Ljava.lang.String;" />
-                    <ret />
-                </body>
-            </method>
-            <method name="split" sig="(Ljava.lang.String;)[Ljava.lang.String;" modifiers="public">
-                <parameter name="regex" />
-                <body>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <ldc_i4_0 />
-                    <callvirt class="java.lang.String" name="split" sig="(Ljava.lang.String;I)[Ljava.lang.String;" />
-                    <ret />
-                </body>
-            </method>
-            <method name="split" sig="(Ljava.lang.String;I)[Ljava.lang.String;" modifiers="public">
-                <parameter name="regex" />
-                <parameter name="limit" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;Ljava.lang.String;I)[Ljava.lang.String;" />
-            </method>
-            <method name="copyValueOf" sig="([C)Ljava.lang.String;" modifiers="public static">
-                <parameter name="data" />
-                <body>
-                    <!-- force a NullPointerException if the array is null -->
-                    <ldarg_0 />
-                    <ldlen />
-                    <pop />
-                    <ldarg_0 />
-                    <newobj type="System.String" name=".ctor" sig="([C)V" />
-                    <ret />
-                </body>
-            </method>
-            <method name="copyValueOf" sig="([CII)Ljava.lang.String;" modifiers="public static">
-                <parameter name="data" />
-                <parameter name="offset" />
-                <parameter name="count" />
-                <body>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <ldarg_2 />
-                    <newobj type="System.String" name=".ctor" sig="([CII)V" />
-                    <ret />
-                </body>
-            </method>
-            <method name="format" sig="(Ljava.lang.String;[Ljava.lang.Object;)Ljava.lang.String;" modifiers="public static">
-                <parameter name="format" />
-                <parameter name="args">
-                    <attribute type="System.ParamArrayAttribute" sig="()V" />
-                </parameter>
-                <redirect class="java.lang.StringHelper" />
-            </method>
-            <method name="format" sig="(Ljava.util.Locale;Ljava.lang.String;[Ljava.lang.Object;)Ljava.lang.String;" modifiers="public static">
-                <parameter name="l" />
-                <parameter name="format" />
-                <parameter name="args">
-                    <attribute type="System.ParamArrayAttribute" sig="()V" />
-                </parameter>
-                <redirect class="java.lang.StringHelper" />
-            </method>
-            <method name="isEmpty" sig="()Z" modifiers="public">
-                <body>
-                    <ldarg_0 />
-                    <callvirt type="System.String" name="get_Length" sig="()I" />
-                    <ldc_i4_0 />
-                    <ceq />
-                    <ret />
-                </body>
-            </method>
-            <method name="getBytes" sig="(Ljava.nio.charset.Charset;)[B" modifiers="public">
-                <parameter name="charset" />
-                <redirect class="java.lang.StringHelper" type="static" sig="(Ljava.lang.String;Ljava.nio.charset.Charset;)[B" />
-            </method>
-            <method name="join" sig="(Ljava.lang.CharSequence;[Ljava.lang.CharSequence;)Ljava.lang.String;" modifiers="public static">
-                <parameter name="delimiter" />
-                <parameter name="elements">
-                    <attribute type="System.ParamArrayAttribute" sig="()V" />
-                </parameter>
-                <redirect class="java.lang.StringHelper" />
-            </method>
-            <method name="join" sig="(Ljava.lang.CharSequence;Ljava.lang.Iterable;)Ljava.lang.String;" modifiers="public static">
-                <parameter name="delimiter" />
-                <parameter name="elements" />
-                <attribute type="IKVM.Attributes.SignatureAttribute" sig="(Ljava.lang.String;)V">
-                    <parameter>(Ljava/lang/CharSequence;Ljava/lang/Iterable&lt;+Ljava/lang/CharSequence;&gt;;)Ljava/lang/String;</parameter>
-                </attribute>
-                <redirect class="java.lang.StringHelper" />
-            </method>
-            <field name="CASE_INSENSITIVE_ORDER" sig="Ljava.util.Comparator;" modifiers="public static final">
-                <attribute type="IKVM.Attributes.SignatureAttribute" sig="(Ljava.lang.String;)V">
-                    <parameter>Ljava/util/Comparator&lt;Ljava/lang/String;&gt;;</parameter>
-                </attribute>
-            </field>
-            <!-- TODO mark this method as BeforeFieldInit (and benchmark to see if that is faster) -->
-            <clinit>
-                <body>
-                    <ldnull />
-                    <newobj class="java.lang.String$CaseInsensitiveComparator" name="&lt;init&gt;" sig="(Ljava.lang.String$1;)V" />
-                    <stsfld class="java.lang.String" name="CASE_INSENSITIVE_ORDER" sig="Ljava.util.Comparator;" />
-                    <ret />
-                </body>
-            </clinit>
-        </class>
-        <class name="java.lang.Throwable" shadows="System.Exception" modifiers="public">
-            <implements class="java.io.Serializable" />
-            <attribute type="System.SerializableAttribute" sig="()V" />
-            <field name="serialVersionUID" sig="J" modifiers="private static final" constant="-3042686055658047285" />
-            <field name="serialPersistentFields" sig="[Ljava.io.ObjectStreamField;" modifiers="private static final" />
-            <field name="suppressFillInStackTrace" sig="Z" modifiers="static">
-                <attribute type="System.ThreadStaticAttribute" sig="()V" />
-            </field>
-            <field name="UNASSIGNED_STACK" sig="[Ljava.lang.StackTraceElement;" modifiers="static final" />
-            <field name="SUPPRESSED_SENTINEL" sig="Ljava.util.List;" modifiers="static final" />
-            <field name="detailMessage" sig="Ljava.lang.String;" />
-            <field name="cause" sig="Ljava.lang.Throwable;" />
-            <field name="original" sig="Ljava.lang.Throwable;" />
-            <field name="stackTrace" sig="[Ljava.lang.StackTraceElement;" />
-            <field name="tracePart1" sig="Lcli.System.Diagnostics.StackTrace;" />
-            <field name="tracePart2" sig="Lcli.System.Diagnostics.StackTrace;" />
-            <field name="suppressedExceptions" sig="Ljava.util.List;" />
-            <clinit>
-                <body>
-                    <call type="IKVM.Internal.ExceptionHelper" name="getPersistentFields" sig="()[Ljava.io.ObjectStreamField;" />
-                    <stsfld class="java.lang.Throwable" name="serialPersistentFields" sig="[Ljava.io.ObjectStreamField;" />
-                    <ldc_i4_0 />
-                    <newarr sig="Ljava.lang.StackTraceElement;" />
-                    <stsfld class="java.lang.Throwable" name="UNASSIGNED_STACK" sig="[Ljava.lang.StackTraceElement;" />
-                    <ldc_i4_0 />
-                    <newobj class="java.util.ArrayList" name="&lt;init&gt;" sig="(I)V" />
-                    <call class="java.util.Collections" name="unmodifiableList" sig="(Ljava.util.List;)Ljava.util.List;" />
-                    <stsfld class="java.lang.Throwable" name="SUPPRESSED_SENTINEL" sig="Ljava.util.List;" />
-                    <ret />
-                </body>
-            </clinit>
-            <method name="__&lt;suppressFillInStackTrace&gt;" sig="()V" modifiers="public static">
-                <attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" />
-                <attribute type="System.ComponentModel.EditorBrowsableAttribute" sig="(Lcli.System.ComponentModel.EditorBrowsableState;)V">
-                    <parameter>Never</parameter>
-                </attribute>
-                <body>
-                    <ldc_i4_1 />
-                    <stsfld class="java.lang.Throwable" name="suppressFillInStackTrace" sig="Z" />
-                    <ret />
-                </body>
-            </method>
-            <method name="__mapImpl" sig="(Ljava.lang.Throwable;)Ljava.lang.Throwable;" modifiers="static">
-                <body>
-                    <!-- this emits the conversion code based on the <exceptionMappings /> defined below -->
-                    <exceptionMapping />
-                </body>
-            </method>
-            <method name="__&lt;unmap&gt;" sig="(Ljava.lang.Throwable;)Ljava.lang.Throwable;" modifiers="public static">
-                <attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" />
-                <attribute type="System.ComponentModel.EditorBrowsableAttribute" sig="(Lcli.System.ComponentModel.EditorBrowsableState;)V">
-                    <parameter>Never</parameter>
-                </attribute>
-                <body>
-                    <ldarg_0 />
-                    <call type="IKVM.Internal.ExceptionHelper" name="UnmapException" sig="(Ljava.lang.Throwable;)Ljava.lang.Throwable;" />
-                    <ret />
-                </body>
-            </method>
-            <method name="__&lt;fixate&gt;" sig="(Ljava.lang.Throwable;)Ljava.lang.Throwable;" modifiers="public static">
-                <attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" />
-                <attribute type="System.ComponentModel.EditorBrowsableAttribute" sig="(Lcli.System.ComponentModel.EditorBrowsableState;)V">
-                    <parameter>Never</parameter>
-                </attribute>
-                <body>
-                    <ldarg_0 />
-                    <call type="IKVM.Internal.ExceptionHelper" name="FixateException" sig="(Ljava.lang.Throwable;)V" />
-                    <ldarg_0 />
-                    <ret />
-                </body>
-            </method>
-            <method name="readObject" sig="(Ljava.io.ObjectInputStream;)V" modifiers="private">
-                <throws class="java.io.IOException" />
-                <throws class="java.lang.ClassNotFoundException" />
-                <body>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <call type="IKVM.Internal.ExceptionHelper" name="readObject" sig="(Ljava.lang.Throwable;Ljava.io.ObjectInputStream;)V" />
-                    <ret />
-                </body>
-            </method>
-            <method name="writeObject" sig="(Ljava.io.ObjectOutputStream;)V" modifiers="private">
-                <throws class="java.io.IOException" />
-                <body>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <call type="IKVM.Internal.ExceptionHelper" name="writeObject" sig="(Ljava.lang.Throwable;Ljava.io.ObjectOutputStream;)V" />
-                    <ret />
-                </body>
-            </method>
-            <constructor sig="()V" modifiers="public">
-                <body>
-                    <!-- Start field initialization -->
-                    <ldarg_0 />
-                    <ldsfld class="java.lang.Throwable" name="UNASSIGNED_STACK" sig="[Ljava.lang.StackTraceElement;" />
-                    <stfld class="java.lang.Throwable" name="stackTrace" sig="[Ljava.lang.StackTraceElement;" />
-                    <ldarg_0 />
-                    <ldsfld class="java.lang.Throwable" name="SUPPRESSED_SENTINEL" sig="Ljava.util.List;" />
-                    <stfld class="java.lang.Throwable" name="suppressedExceptions" sig="Ljava.util.List;" />
-                    <!-- End field initialization -->
-                    <ldarg_0 />
-                    <ldstr value="" />
-                    <call type="System.Exception" name=".ctor" sig="(Ljava.lang.String;)V" />
-                    <ldarg_0 />
-                    <ldarg_0 />
-                    <stfld class="java.lang.Throwable" name="cause" sig="Ljava.lang.Throwable;" />
-                    <!-- Start fillInStackTrace call -->
-                    <ldsfld class="java.lang.Throwable" name="suppressFillInStackTrace" sig="Z" />
-                    <ldc_i4_0 />
-                    <stsfld class="java.lang.Throwable" name="suppressFillInStackTrace" sig="Z" />
-                    <brtrue name="skipFillInStackTrace" />
-                    <ldarg_0 />
-                    <callvirt class="java.lang.Throwable" name="fillInStackTrace" sig="()Ljava.lang.Throwable;" />
-                    <pop />
-                    <label name="skipFillInStackTrace" />
-                    <!-- End fillInStackTrace call -->
-                    <ret />
-                </body>
-            </constructor>
-            <constructor sig="(Ljava.lang.String;)V" modifiers="public">
-                <parameter name="message" />
-                <body>
-                    <!-- Start field initialization -->
-                    <ldarg_0 />
-                    <ldsfld class="java.lang.Throwable" name="UNASSIGNED_STACK" sig="[Ljava.lang.StackTraceElement;" />
-                    <stfld class="java.lang.Throwable" name="stackTrace" sig="[Ljava.lang.StackTraceElement;" />
-                    <ldarg_0 />
-                    <ldsfld class="java.lang.Throwable" name="SUPPRESSED_SENTINEL" sig="Ljava.util.List;" />
-                    <stfld class="java.lang.Throwable" name="suppressedExceptions" sig="Ljava.util.List;" />
-                    <!-- End field initialization -->
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <call type="IKVM.Internal.ExceptionHelper" name="FilterMessage" sig="(Ljava.lang.String;)Ljava.lang.String;" />
-                    <call type="System.Exception" name=".ctor" sig="(Ljava.lang.String;)V" />
-                    <ldarg_0 />
-                    <ldarg_0 />
-                    <stfld class="java.lang.Throwable" name="cause" sig="Ljava.lang.Throwable;" />
-                    <!-- Start fillInStackTrace call -->
-                    <ldsfld class="java.lang.Throwable" name="suppressFillInStackTrace" sig="Z" />
-                    <ldc_i4_0 />
-                    <stsfld class="java.lang.Throwable" name="suppressFillInStackTrace" sig="Z" />
-                    <brtrue name="skipFillInStackTrace" />
-                    <ldarg_0 />
-                    <callvirt class="java.lang.Throwable" name="fillInStackTrace" sig="()Ljava.lang.Throwable;" />
-                    <pop />
-                    <label name="skipFillInStackTrace" />
-                    <!-- End fillInStackTrace call -->
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <stfld class="java.lang.Throwable" name="detailMessage" sig="Ljava.lang.String;" />
-                    <ret />
-                </body>
-            </constructor>
-            <constructor sig="(Ljava.lang.String;Ljava.lang.Throwable;)V" modifiers="public">
-                <parameter name="message" />
-                <parameter name="cause" />
-                <body>
-                    <!-- Start field initialization -->
-                    <ldarg_0 />
-                    <ldsfld class="java.lang.Throwable" name="UNASSIGNED_STACK" sig="[Ljava.lang.StackTraceElement;" />
-                    <stfld class="java.lang.Throwable" name="stackTrace" sig="[Ljava.lang.StackTraceElement;" />
-                    <ldarg_0 />
-                    <ldsfld class="java.lang.Throwable" name="SUPPRESSED_SENTINEL" sig="Ljava.util.List;" />
-                    <stfld class="java.lang.Throwable" name="suppressedExceptions" sig="Ljava.util.List;" />
-                    <!-- End field initialization -->
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <call type="IKVM.Internal.ExceptionHelper" name="FilterMessage" sig="(Ljava.lang.String;)Ljava.lang.String;" />
-                    <ldarg_2 />
-                    <call type="System.Exception" name=".ctor" sig="(Ljava.lang.String;Ljava.lang.Throwable;)V" />
-                    <ldarg_0 />
-                    <ldarg_0 />
-                    <stfld class="java.lang.Throwable" name="cause" sig="Ljava.lang.Throwable;" />
-                    <!-- Start fillInStackTrace call -->
-                    <ldsfld class="java.lang.Throwable" name="suppressFillInStackTrace" sig="Z" />
-                    <ldc_i4_0 />
-                    <stsfld class="java.lang.Throwable" name="suppressFillInStackTrace" sig="Z" />
-                    <brtrue name="skipFillInStackTrace" />
-                    <ldarg_0 />
-                    <callvirt class="java.lang.Throwable" name="fillInStackTrace" sig="()Ljava.lang.Throwable;" />
-                    <pop />
-                    <label name="skipFillInStackTrace" />
-                    <!-- End fillInStackTrace call -->
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <stfld class="java.lang.Throwable" name="detailMessage" sig="Ljava.lang.String;" />
-                    <ldarg_0 />
-                    <ldarg_2 />
-                    <stfld class="java.lang.Throwable" name="cause" sig="Ljava.lang.Throwable;" />
-                    <ret />
-                </body>
-            </constructor>
-            <constructor sig="(Ljava.lang.Throwable;)V" modifiers="public">
-                <parameter name="cause" />
-                <body>
-                    <!-- Start field initialization -->
-                    <ldarg_0 />
-                    <ldsfld class="java.lang.Throwable" name="UNASSIGNED_STACK" sig="[Ljava.lang.StackTraceElement;" />
-                    <stfld class="java.lang.Throwable" name="stackTrace" sig="[Ljava.lang.StackTraceElement;" />
-                    <ldarg_0 />
-                    <ldsfld class="java.lang.Throwable" name="SUPPRESSED_SENTINEL" sig="Ljava.util.List;" />
-                    <stfld class="java.lang.Throwable" name="suppressedExceptions" sig="Ljava.util.List;" />
-                    <!-- End field initialization -->
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <call type="IKVM.Internal.ExceptionHelper" name="GetMessageFromCause" sig="(Ljava.lang.Throwable;)Ljava.lang.String;" />
-                    <ldarg_1 />
-                    <call type="System.Exception" name=".ctor" sig="(Ljava.lang.String;Ljava.lang.Throwable;)V" />
-                    <ldarg_0 />
-                    <ldarg_0 />
-                    <stfld class="java.lang.Throwable" name="cause" sig="Ljava.lang.Throwable;" />
-                    <!-- Start fillInStackTrace call -->
-                    <ldsfld class="java.lang.Throwable" name="suppressFillInStackTrace" sig="Z" />
-                    <ldc_i4_0 />
-                    <stsfld class="java.lang.Throwable" name="suppressFillInStackTrace" sig="Z" />
-                    <brtrue name="skipFillInStackTrace" />
-                    <ldarg_0 />
-                    <callvirt class="java.lang.Throwable" name="fillInStackTrace" sig="()Ljava.lang.Throwable;" />
-                    <pop />
-                    <label name="skipFillInStackTrace" />
-                    <!-- End fillInStackTrace call -->
-                    <ldarg_1 />
-                    <brfalse name="no_cause" />
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <callvirt class="java.lang.Throwable" name="toString" sig="()Ljava.lang.String;" />
-                    <stfld class="java.lang.Throwable" name="detailMessage" sig="Ljava.lang.String;" />
-                    <label name="no_cause" />
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <stfld class="java.lang.Throwable" name="cause" sig="Ljava.lang.Throwable;" />
-                    <ret />
-                </body>
-            </constructor>
-            <constructor sig="(Ljava.lang.String;Ljava.lang.Throwable;ZZ)V" modifiers="protected">
-                <parameter name="message" />
-                <parameter name="cause" />
-                <parameter name="enableSuppression" />
-                <parameter name="writableStackTrace" />
-                <body>
-                    <!-- Start field initialization -->
-                    <ldarg_0 />
-                    <ldsfld class="java.lang.Throwable" name="UNASSIGNED_STACK" sig="[Ljava.lang.StackTraceElement;" />
-                    <stfld class="java.lang.Throwable" name="stackTrace" sig="[Ljava.lang.StackTraceElement;" />
-                    <ldarg_0 />
-                    <ldsfld class="java.lang.Throwable" name="SUPPRESSED_SENTINEL" sig="Ljava.util.List;" />
-                    <stfld class="java.lang.Throwable" name="suppressedExceptions" sig="Ljava.util.List;" />
-                    <!-- End field initialization -->
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <call type="IKVM.Internal.ExceptionHelper" name="FilterMessage" sig="(Ljava.lang.String;)Ljava.lang.String;" />
-                    <ldarg_2 />
-                    <call type="System.Exception" name=".ctor" sig="(Ljava.lang.String;Ljava.lang.Throwable;)V" />
-                    <ldarg_s argNum="4" />
-                    <brfalse name="else" />
-                    <!-- Start fillInStackTrace call -->
-                    <ldsfld class="java.lang.Throwable" name="suppressFillInStackTrace" sig="Z" />
-                    <ldc_i4_0 />
-                    <stsfld class="java.lang.Throwable" name="suppressFillInStackTrace" sig="Z" />
-                    <brtrue name="skipFillInStackTrace" />
-                    <ldarg_0 />
-                    <callvirt class="java.lang.Throwable" name="fillInStackTrace" sig="()Ljava.lang.Throwable;" />
-                    <pop />
-                    <label name="skipFillInStackTrace" />
-                    <!-- End fillInStackTrace call -->
-                    <br name="endif" />
-                    <label name="else" />
-                    <ldarg_0 />
-                    <ldnull />
-                    <stfld class="java.lang.Throwable" name="stackTrace" sig="[Ljava.lang.StackTraceElement;" />
-                    <label name="endif" />
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <stfld class="java.lang.Throwable" name="detailMessage" sig="Ljava.lang.String;" />
-                    <ldarg_0 />
-                    <ldarg_2 />
-                    <stfld class="java.lang.Throwable" name="cause" sig="Ljava.lang.Throwable;" />
-                    <ldarg_3 />
-                    <brtrue name="end" />
-                    <ldarg_0 />
-                    <ldnull />
-                    <stfld class="java.lang.Throwable" name="suppressedExceptions" sig="Ljava.util.List;" />
-                    <label name="end" />
-                    <ret />
-                </body>
-            </constructor>
-            <method name="printStackTrace" sig="()V" modifiers="public">
-                <redirect class="java.lang.ThrowableHelper" sig="(Ljava.lang.Throwable;)V" type="static" />
-            </method>
-            <method name="printStackTrace" sig="(Ljava.io.PrintStream;)V" modifiers="public">
-                <parameter name="s" />
-                <redirect class="java.lang.ThrowableHelper" sig="(Ljava.lang.Throwable;Ljava.io.PrintStream;)V" type="static" />
-            </method>
-            <method name="printStackTrace" sig="(Ljava.io.PrintWriter;)V" modifiers="public">
-                <parameter name="s" />
-                <redirect class="java.lang.ThrowableHelper" sig="(Ljava.lang.Throwable;Ljava.io.PrintWriter;)V" type="static" />
-            </method>
-            <method name="getMessage" sig="()Ljava.lang.String;" modifiers="public">
-                <body>
-                    <ldarg_0 />
-                    <ldfld class="java.lang.Throwable" name="detailMessage" sig="Ljava.lang.String;" />
-                    <ret />
-                </body>
-                <alternateBody>
-                    <ldarg_0 />
-                    <callvirt class="cli.System.Exception" name="get_Message" sig="()Ljava.lang.String;" />
-                    <ret />
-                </alternateBody>
-            </method>
-            <method name="getLocalizedMessage" sig="()Ljava.lang.String;" modifiers="public">
-                <redirect class="cli.IKVM.Internal.ExceptionHelper" sig="(Ljava.lang.Throwable;)Ljava.lang.String;" type="static" />
-            </method>
-            <method name="fillInStackTrace" sig="()Ljava.lang.Throwable;" modifiers="public">
-                <body>
-                    <ldarg_0 />
-                    <call type="System.Threading.Monitor" name="Enter" sig="(Ljava.lang.Object;)V" />
-                    <exceptionBlock>
-                        <try>
-                            <ldarg_0 />
-                            <ldfld class="java.lang.Throwable" name="stackTrace" sig="[Ljava.lang.StackTraceElement;" />
-                            <brfalse name="leave" />
-                            <!--
-	                    stackTrace = UNASSIGNED_STACK;
-                            tracePart1 = null;
-                            tracePart2 = new cli.System.Diagnostics.StackTrace(true);
-                            -->
-                            <ldarg_0 />
-                            <ldsfld class="java.lang.Throwable" name="UNASSIGNED_STACK" sig="[Ljava.lang.StackTraceElement;" />
-                            <stfld class="java.lang.Throwable" name="stackTrace" sig="[Ljava.lang.StackTraceElement;" />
-                            <ldarg_0 />
-                            <ldnull />
-                            <stfld class="java.lang.Throwable" name="tracePart1" sig="Lcli.System.Diagnostics.StackTrace;" />
-                            <ldarg_0 />
-                            <ldc_i4_1 />
-                            <newobj type="System.Diagnostics.StackTrace" name=".ctor" sig="(Z)V" />
-                            <stfld class="java.lang.Throwable" name="tracePart2" sig="Lcli.System.Diagnostics.StackTrace;" />
-                            <label name="leave" />
-                            <leave name="end" />
-                        </try>
-                        <finally>
-                            <ldarg_0 />
-                            <call type="System.Threading.Monitor" name="Exit" sig="(Ljava.lang.Object;)V" />
-                            <endfinally />
-                        </finally>
-                    </exceptionBlock>
-                    <label name="end" />
-                    <ldarg_0 />
-                    <ret />
-                </body>
-                <alternateBody>
-                    <ldarg_0 />
-                    <call type="IKVM.Internal.ExceptionHelper" name="fillInStackTrace" sig="(Ljava.lang.Throwable;)V" />
-                    <ldarg_0 />
-                    <ret />
-                </alternateBody>
-            </method>
-            <method name="initCause" sig="(Ljava.lang.Throwable;)Ljava.lang.Throwable;" modifiers="public">
-                <parameter name="cause" />
-                <body>
-                    <ldarg_0 />
-                    <call type="System.Threading.Monitor" name="Enter" sig="(Ljava.lang.Object;)V" />
-                    <exceptionBlock>
-                        <try>
-                            <ldarg_0 />
-                            <ldarg_0 />
-                            <ldfld class="java.lang.Throwable" name="cause" sig="Ljava.lang.Throwable;" />
-                            <ldarg_1 />
-                            <call type="IKVM.Internal.ExceptionHelper" name="checkInitCause" sig="(Ljava.lang.Throwable;Ljava.lang.Throwable;Ljava.lang.Throwable;)V" />
-                            <ldarg_0 />
-                            <ldarg_1 />
-                            <stfld class="java.lang.Throwable" name="cause" sig="Ljava.lang.Throwable;" />
-                            <leave name="end" />
-                        </try>
-                        <finally>
-                            <ldarg_0 />
-                            <call type="System.Threading.Monitor" name="Exit" sig="(Ljava.lang.Object;)V" />
-                            <endfinally />
-                        </finally>
-                    </exceptionBlock>
-                    <label name="end" />
-                    <ldarg_0 />
-                    <ret />
-                </body>
-                <alternateBody>
-                    <!-- non-Java exception cannot have its cause changed, so we call checkInitCause in a way that will always throw -->
-                    <ldarg_0 />
-                    <ldnull />
-                    <ldnull />
-                    <call type="IKVM.Internal.ExceptionHelper" name="checkInitCause" sig="(Ljava.lang.Throwable;Ljava.lang.Throwable;Ljava.lang.Throwable;)V" />
-                    <ldarg_0 />
-                    <ret />
-                </alternateBody>
-            </method>
-            <method name="getCause" sig="()Ljava.lang.Throwable;" modifiers="public">
-                <body>
-                    <ldarg_0 />
-                    <call type="IKVM.Internal.ExceptionHelper" name="getCause" sig="(Ljava.lang.Throwable;)Ljava.lang.Throwable;" />
-                    <ret />
-                </body>
-                <alternateBody>
-                    <ldarg_0 />
-                    <call class="cli.System.Exception" name="get_InnerException" sig="()Ljava.lang.Throwable;" />
-                    <ret />
-                </alternateBody>
-            </method>
-            <method name="getStackTrace" sig="()[Ljava.lang.StackTraceElement;" modifiers="public">
-                <body>
-                    <ldarg_0 />
-                    <call type="IKVM.Internal.ExceptionHelper" name="getOurStackTrace" sig="(Ljava.lang.Throwable;)[Ljava.lang.StackTraceElement;" />
-                    <callvirt type="System.Array" name="Clone" sig="()Ljava.lang.Object;" />
-                    <castclass class="[Ljava.lang.StackTraceElement;" />
-                    <ret />
-                </body>
-            </method>
-            <method name="getOurStackTrace" sig="()[Ljava.lang.StackTraceElement;" modifiers="private">
-                <redirect class="cli.IKVM.Internal.ExceptionHelper" name="getOurStackTrace" sig="(Ljava.lang.Throwable;)[Ljava.lang.StackTraceElement;" />
-            </method>
-            <method name="setStackTrace" sig="([Ljava.lang.StackTraceElement;)V" modifiers="public">
-                <parameter name="stackTrace" />
-                <redirect class="cli.IKVM.Internal.ExceptionHelper" name="setStackTrace" sig="(Ljava.lang.Throwable;[Ljava.lang.StackTraceElement;)V" />
-            </method>
-            <method name="toString" sig="()Ljava.lang.String;" modifiers="public">
-                <redirect class="cli.IKVM.Internal.ExceptionHelper" sig="(Ljava.lang.Throwable;)Ljava.lang.String;" type="static" />
-            </method>
-            <method name="GetObjectData" sig="(Lcli.System.Runtime.Serialization.SerializationInfo;Lcli.System.Runtime.Serialization.StreamingContext;)V" modifiers="public">
-                <attribute type="System.Security.Permissions.SecurityPermissionAttribute" sig="(Lcli.System.Security.Permissions.SecurityAction;)V">
-                    <parameter>Demand</parameter>
-                    <property name="SerializationFormatter" sig="Z">true</property>
-                </attribute>
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" />
-                <attribute type="System.ComponentModel.EditorBrowsableAttribute" sig="(Lcli.System.ComponentModel.EditorBrowsableState;)V">
-                    <parameter>Never</parameter>
-                </attribute>
-                <body>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <ldarg_2 />
-                    <call type="System.Exception" name="GetObjectData" sig="(Lcli.System.Runtime.Serialization.SerializationInfo;Lcli.System.Runtime.Serialization.StreamingContext;)V" />
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <call class="ikvm.internal.Serialization" name="writeObject" sig="(Ljava.lang.Object;Lcli.System.Runtime.Serialization.SerializationInfo;)V" />
-                    <ret />
-                </body>
-            </method>
-            <constructor sig="(Lcli.System.Runtime.Serialization.SerializationInfo;Lcli.System.Runtime.Serialization.StreamingContext;)V" modifiers="protected">
-                <attribute type="System.Security.Permissions.SecurityPermissionAttribute" sig="(Lcli.System.Security.Permissions.SecurityAction;)V">
-                    <parameter>Demand</parameter>
-                    <property name="SerializationFormatter" sig="Z">true</property>
-                </attribute>
-                <attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" />
-                <body>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <ldarg_2 />
-                    <call type="System.Exception" name=".ctor" sig="(Lcli.System.Runtime.Serialization.SerializationInfo;Lcli.System.Runtime.Serialization.StreamingContext;)V" />
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <call class="ikvm.internal.Serialization" name="readObject" sig="(Ljava.lang.Object;Lcli.System.Runtime.Serialization.SerializationInfo;)V" />
-                    <ret />
-                </body>
-            </constructor>
-            <method name="addSuppressed" sig="(Ljava.lang.Throwable;)V" modifiers="public final">
-                <parameter name="exception" />
-                <redirect class="cli.IKVM.Internal.ExceptionHelper" name="addSuppressed" sig="(Ljava.lang.Throwable;Ljava.lang.Throwable;)V" />
-            </method>
-            <method name="getSuppressed" sig="()[Ljava.lang.Throwable;" modifiers="public final">
-                <redirect class="cli.IKVM.Internal.ExceptionHelper" name="getSuppressed" sig="(Ljava.lang.Throwable;)[Ljava.lang.Throwable;" />
-            </method>
-            <method name="getStackTraceDepth" sig="()I" modifiers="">
-                <redirect class="cli.IKVM.Internal.ExceptionHelper" name="getStackTraceDepth" sig="(Ljava.lang.Throwable;)I" />
-            </method>
-            <method name="getStackTraceElement" sig="(I)Ljava.lang.StackTraceElement;" modifiers="">
-                <redirect class="cli.IKVM.Internal.ExceptionHelper" name="getStackTraceElement" sig="(Ljava.lang.Throwable;I)Ljava.lang.StackTraceElement;" />
-            </method>
-        </class>
-        <class name="java.lang.ThrowableHelper">
-            <method name="getOurStackTrace" sig="(Ljava.lang.Throwable;)[Ljava.lang.StackTraceElement;">
-                <body>
-                    <ldarg_0 />
-                    <call type="IKVM.Internal.ExceptionHelper" name="getOurStackTrace" sig="(Ljava.lang.Throwable;)[Ljava.lang.StackTraceElement;" />
-                    <ret />
-                </body>
-            </method>
-        </class>
-        <class name="java.lang.Comparable" shadows="System.IComparable" modifiers="public abstract interface">
-            <attribute type="IKVM.Attributes.SignatureAttribute" sig="(Ljava.lang.String;)V">
-                <parameter>&lt;T:Ljava/lang/Object;&gt;Ljava/lang/Object;</parameter>
-            </attribute>
-            <method name="compareTo" sig="(Ljava.lang.Object;)I" modifiers="public abstract">
-                <attribute type="IKVM.Attributes.SignatureAttribute" sig="(Ljava.lang.String;)V">
-                    <parameter>(TT;)I</parameter>
-                </attribute>
-                <parameter name="o" />
-                <override name="CompareTo" />
-            </method>
-        </class>
-        <class name="java.lang.AutoCloseable" shadows="System.IDisposable" modifiers="public abstract interface">
-            <method name="close" sig="()V" modifiers="public abstract">
-                <throws class="java.lang.Exception" />
-                <override name="Dispose" />
-            </method>
-        </class>
-        <!-- Here we are adding/replacing methods to existing classes -->
-        <class name="java.lang.Class">
-            <implements class="cli.System.Runtime.Serialization.ISerializable" />
-            <field name="typeWrapper" sig="Lcli.IKVM.Internal.TypeWrapper;" modifiers="">
-                <attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" />
-            </field>
-        </class>
-        <class name="java.lang.ClassLoader">
-            <field name="wrapper" sig="Lcli.IKVM.Internal.ClassLoaderWrapper;" modifiers="">
-                <attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" />
-            </field>
-            <constructor sig="(Z)V">
-                <body>
-                    <ldarg_0 />
-                    <call class="java.lang.Object" name="&lt;init&gt;" sig="()V" />
-                    <ret />
-                </body>
-            </constructor>
-        </class>
-        <class name="java.lang.Enum">
-            <implements class="cli.System.Runtime.Serialization.ISerializable" />
-        </class>
-        <class name="java.lang.Thread">
-            <field name="parkLock" sig="Ljava.lang.Object;" modifiers="" />
-            <field name="parkState" sig="I" modifiers="" />
-            <constructor sig="(Ljava.lang.Void;)V">
-                <body>
-                    <ldarg_0 />
-                    <call class="java.lang.Object" name="&lt;init&gt;" sig="()V" />
-                    <ret />
-                </body>
-            </constructor>
-            <method name="isCCLOverridden" sig="(Ljava.lang.Thread;)Z">
-                <body>
-                    <ldftn class="java.lang.Thread" name="getContextClassLoader" sig="()Ljava.lang.ClassLoader;" />
-                    <ldarg_0 />
-                    <ldvirtftn class="java.lang.Thread" name="getContextClassLoader" sig="()Ljava.lang.ClassLoader;" />
-                    <ceq />
-                    <ldftn class="java.lang.Thread" name="setContextClassLoader" sig="(Ljava.lang.ClassLoader;)V" />
-                    <ldarg_0 />
-                    <ldvirtftn class="java.lang.Thread" name="setContextClassLoader" sig="(Ljava.lang.ClassLoader;)V" />
-                    <ceq />
-                    <and />
-                    <ldc_i4_0 />
-                    <ceq />
-                    <ret />
-                </body>
-            </method>
-        </class>
-        <class name="java.lang.ThreadGroup">
-            <method name="createRootGroup" sig="()Ljava.lang.ThreadGroup;" modifiers="static">
-                <body>
-                    <newobj class="java.lang.ThreadGroup" name="&lt;init&gt;" sig="()V" />
-                    <ret />
-                </body>
-            </method>
-        </class>
-        <class name="java.lang.reflect.Constructor">
-            <method name="_slot" sig="()I">
-                <body>
-                    <ldarg_0 />
-                    <ldfld class="java.lang.reflect.Constructor" name="slot" sig="I" />
-                    <ret />
-                </body>
-            </method>
-        </class>
-        <class name="java.lang.reflect.Executable">
-            <method name="_slot" sig="()I" modifiers="abstract" attributes="NewSlot Virtual" />
-        </class>
-        <class name="java.lang.reflect.Field">
-            <method name="_slot" sig="()I">
-                <body>
-                    <ldarg_0 />
-                    <ldfld class="java.lang.reflect.Field" name="slot" sig="I" />
-                    <ret />
-                </body>
-            </method>
-        </class>
-        <class name="java.lang.reflect.Method">
-            <method name="_slot" sig="()I">
-                <body>
-                    <ldarg_0 />
-                    <ldfld class="java.lang.reflect.Method" name="slot" sig="I" />
-                    <ret />
-                </body>
-            </method>
-        </class>
-        <class name="java.net.Inet6Address">
-            <method name="_holder" sig="()Ljava.net.Inet6Address$Inet6AddressHolder;" modifiers="">
-                <body>
-                    <ldarg_0 />
-                    <ldfld class="java.net.Inet6Address" name="holder6" sig="Ljava.net.Inet6Address$Inet6AddressHolder;" />
-                    <ret />
-                </body>
-            </method>
-        </class>
-        <class name="java.net.InterfaceAddress">
-            <method name="_set" sig="(Ljava.net.InetAddress;Ljava.net.Inet4Address;S)V" modifiers="">
-                <body>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <stfld class="java.net.InterfaceAddress" name="address" sig="Ljava.net.InetAddress;" />
-                    <ldarg_0 />
-                    <ldarg_2 />
-                    <stfld class="java.net.InterfaceAddress" name="broadcast" sig="Ljava.net.Inet4Address;" />
-                    <ldarg_0 />
-                    <ldarg_3 />
-                    <stfld class="java.net.InterfaceAddress" name="maskLength" sig="S" />
-                    <ret />
-                </body>
-            </method>
-        </class>
-        <class name="java.net.NetworkInterface">
-            <method name="_set1" sig="(Ljava.lang.String;Ljava.lang.String;I)V" modifiers="">
-                <body>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <stfld class="java.net.NetworkInterface" name="name" sig="Ljava.lang.String;" />
-                    <ldarg_0 />
-                    <ldarg_2 />
-                    <stfld class="java.net.NetworkInterface" name="displayName" sig="Ljava.lang.String;" />
-                    <ldarg_0 />
-                    <ldarg_3 />
-                    <stfld class="java.net.NetworkInterface" name="index" sig="I" />
-                    <ret />
-                </body>
-            </method>
-            <method name="_set2" sig="([Ljava.net.InetAddress;[Ljava.net.InterfaceAddress;[Ljava.net.NetworkInterface;)V" modifiers="">
-                <body>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <stfld class="java.net.NetworkInterface" name="addrs" sig="[Ljava.net.InetAddress;" />
-                    <ldarg_0 />
-                    <ldarg_2 />
-                    <stfld class="java.net.NetworkInterface" name="bindings" sig="[Ljava.net.InterfaceAddress;" />
-                    <ldarg_0 />
-                    <ldarg_3 />
-                    <stfld class="java.net.NetworkInterface" name="childs" sig="[Ljava.net.NetworkInterface;" />
-                    <ret />
-                </body>
-            </method>
-        </class>
-        <class name="java.security.AccessControlContext">
-            <method name="_privilegedContext" sig="(Ljava.security.AccessControlContext;)V" modifiers="">
-                <body>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <stfld class="java.security.AccessControlContext" name="privilegedContext" sig="Ljava.security.AccessControlContext;" />
-                    <ret />
-                </body>
-            </method>
-        </class>
-        <class name="java.util.AbstractCollection">
-            <!-- We're adding an Add(object) method to allow collection initializers and Xml (soap) serialization to magically work -->
-            <!-- NOTE Modifiers.Final and MethodAttributes.NewSlot is recognized by AotTypeWrapper.MapModifiers() as a magic combination that generates a non-virtual method -->
-            <method name="Add" sig="(Ljava.lang.Object;)V" modifiers="public final" attributes="NewSlot">
-                <attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" />
-                <attribute type="System.ComponentModel.EditorBrowsableAttribute" sig="(Lcli.System.ComponentModel.EditorBrowsableState;)V">
-                    <parameter>Never</parameter>
-                </attribute>
-                <body>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <callvirt class="java.util.AbstractCollection" name="add" sig="(Ljava.lang.Object;)Z" />
-                    <pop />
-                    <ret />
-                </body>
-            </method>
-        </class>
-        <class name="java.util.AbstractMap">
-            <!-- NOTE the compiler will not magically make all Maps enumerable, so we manually implement IEnumerable here -->
-            <implements class="cli.System.Collections.IEnumerable" />
-            <method name="System.Collections.IEnumerable.GetEnumerator" sig="()Lcli.System.Collections.IEnumerator;" modifiers="private" attributes="NewSlot Virtual Final">
-                <override class="cli.System.Collections.IEnumerable" name="GetEnumerator" />
-                <attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" />
-                <body>
-                    <ldarg_0 />
-                    <newobj class="ikvm.lang.MapEnumerator" name="&lt;init&gt;" sig="(Ljava.util.Map;)V" />
-                    <ret />
-                </body>
-            </method>
-            <!-- We're adding an Add(object,object) method to allow collection initializers to magically work -->
-            <!-- NOTE Modifiers.Final and MethodAttributes.NewSlot is recognized by AotTypeWrapper.MapModifiers() as a magic combination that generates a non-virtual method -->
-            <method name="Add" sig="(Ljava.lang.Object;Ljava.lang.Object;)V" modifiers="public final" attributes="NewSlot">
-                <attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" />
-                <attribute type="System.ComponentModel.EditorBrowsableAttribute" sig="(Lcli.System.ComponentModel.EditorBrowsableState;)V">
-                    <parameter>Never</parameter>
-                </attribute>
-                <body>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <ldarg_2 />
-                    <callvirt class="java.util.AbstractMap" name="put" sig="(Ljava.lang.Object;Ljava.lang.Object;)Ljava.lang.Object;" />
-                    <pop />
-                    <ret />
-                </body>
-            </method>
-        </class>
-        <class name="java.util.concurrent.locks.AbstractQueuedSynchronizer">
-            <method name="compareAndSetState" sig="(II)Z">
-                <body>
-                    <ldarg_0 />
-                    <ldflda class="java.util.concurrent.locks.AbstractQueuedSynchronizer" name="state" sig="I" />
-                    <ldarg_2 />
-                    <ldarg_1 />
-                    <call type="System.Threading.Interlocked" name="CompareExchange" sig="System.Int32&amp;;System.Int32;System.Int32" />
-                    <ldarg_1 />
-                    <ceq />
-                    <ret />
-                </body>
-            </method>
-            <method name="compareAndSetWaitStatus" sig="(Ljava.util.concurrent.locks.AbstractQueuedSynchronizer$Node;II)Z">
-                <body>
-                    <ldarg_0 />
-                    <ldflda class="java.util.concurrent.locks.AbstractQueuedSynchronizer$Node" name="waitStatus" sig="I" />
-                    <ldarg_2 />
-                    <ldarg_1 />
-                    <call type="System.Threading.Interlocked" name="CompareExchange" sig="System.Int32&amp;;System.Int32;System.Int32" />
-                    <ldarg_1 />
-                    <ceq />
-                    <ret />
-                </body>
-            </method>
-        </class>
-        <class name="java.util.concurrent.locks.LockSupport">
-            <method name="cmpxchgParkState" sig="(Ljava.lang.Thread;II)I">
-                <body>
-                    <ldarg_0 />
-                    <ldflda class="java.lang.Thread" name="parkState" sig="I" />
-                    <ldarg_1 />
-                    <ldarg_2 />
-                    <call type="System.Threading.Interlocked" name="CompareExchange" sig="System.Int32&amp;;System.Int32;System.Int32" />
-                    <ret />
-                </body>
-            </method>
-            <method name="getParkLock" sig="(Ljava.lang.Thread;)Ljava.lang.Object;">
-                <body>
-                    <ldarg_0 />
-                    <volatile />
-                    <ldfld class="java.lang.Thread" name="parkLock" sig="Ljava.lang.Object;" />
-                    <ret />
-                </body>
-            </method>
-            <method name="setParkLock" sig="(Ljava.lang.Thread;Ljava.lang.Object;)V">
-                <body>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <volatile />
-                    <stfld class="java.lang.Thread" name="parkLock" sig="Ljava.lang.Object;" />
-                    <call type="System.Threading.Thread" name="MemoryBarrier" sig="" />
-                    <ret />
-                </body>
-            </method>
-        </class>
-        <!-- This is where the "native" helper methods start -->
-        <class name="ikvm.lang.CIL">
-            <method name="unbox_byte" sig="(Ljava.lang.Object;)B">
-                <body>
-                    <ldarg_0 />
-                    <unbox type="System.Byte" />
-                    <ldind_i1 />
-                    <ret />
-                </body>
-            </method>
-            <method name="unbox_boolean" sig="(Ljava.lang.Object;)Z">
-                <body>
-                    <ldarg_0 />
-                    <unbox type="System.Boolean" />
-                    <ldind_i1 />
-                    <ret />
-                </body>
-            </method>
-            <method name="unbox_short" sig="(Ljava.lang.Object;)S">
-                <body>
-                    <ldarg_0 />
-                    <unbox type="System.Int16" />
-                    <ldind_i2 />
-                    <ret />
-                </body>
-            </method>
-            <method name="unbox_char" sig="(Ljava.lang.Object;)C">
-                <body>
-                    <ldarg_0 />
-                    <unbox type="System.Char" />
-                    <ldind_i2 />
-                    <ret />
-                </body>
-            </method>
-            <method name="unbox_int" sig="(Ljava.lang.Object;)I">
-                <body>
-                    <ldarg_0 />
-                    <unbox type="System.Int32" />
-                    <ldind_i4 />
-                    <ret />
-                </body>
-            </method>
-            <method name="unbox_float" sig="(Ljava.lang.Object;)F">
-                <body>
-                    <ldarg_0 />
-                    <unbox type="System.Single" />
-                    <ldind_r4 />
-                    <ret />
-                </body>
-            </method>
-            <method name="unbox_long" sig="(Ljava.lang.Object;)J">
-                <body>
-                    <ldarg_0 />
-                    <unbox type="System.Int64" />
-                    <ldind_i8 />
-                    <ret />
-                </body>
-            </method>
-            <method name="unbox_double" sig="(Ljava.lang.Object;)D">
-                <body>
-                    <ldarg_0 />
-                    <unbox type="System.Double" />
-                    <ldind_r8 />
-                    <ret />
-                </body>
-            </method>
-            <method name="box_byte" sig="(B)Lcli.System.Byte;">
-                <body>
-                    <ldarg_0 />
-                    <ret />
-                </body>
-            </method>
-            <method name="box_boolean" sig="(Z)Lcli.System.Boolean;">
-                <body>
-                    <ldarg_0 />
-                    <ret />
-                </body>
-            </method>
-            <method name="box_short" sig="(S)Lcli.System.Int16;">
-                <body>
-                    <ldarg_0 />
-                    <ret />
-                </body>
-            </method>
-            <method name="box_char" sig="(C)Lcli.System.Char;">
-                <body>
-                    <ldarg_0 />
-                    <ret />
-                </body>
-            </method>
-            <method name="box_int" sig="(I)Lcli.System.Int32;">
-                <body>
-                    <ldarg_0 />
-                    <ret />
-                </body>
-            </method>
-            <method name="box_float" sig="(F)Lcli.System.Single;">
-                <body>
-                    <ldarg_0 />
-                    <ret />
-                </body>
-            </method>
-            <method name="box_long" sig="(J)Lcli.System.Int64;">
-                <body>
-                    <ldarg_0 />
-                    <ret />
-                </body>
-            </method>
-            <method name="box_double" sig="(D)Lcli.System.Double;">
-                <body>
-                    <ldarg_0 />
-                    <ret />
-                </body>
-            </method>
-            <method name="box_sbyte" sig="(B)Lcli.System.SByte;">
-                <body>
-                    <ldarg_0 />
-                    <ret />
-                </body>
-            </method>
-            <method name="box_ushort" sig="(S)Lcli.System.UInt16;">
-                <body>
-                    <ldarg_0 />
-                    <ret />
-                </body>
-            </method>
-            <method name="box_uint" sig="(I)Lcli.System.UInt32;">
-                <body>
-                    <ldarg_0 />
-                    <ret />
-                </body>
-            </method>
-            <method name="box_ulong" sig="(J)Lcli.System.UInt64;">
-                <body>
-                    <ldarg_0 />
-                    <ret />
-                </body>
-            </method>
-            <method name="unbox_sbyte" sig="(Lcli.System.SByte;)B">
-                <body>
-                    <ldarg_0 />
-                    <ret />
-                </body>
-            </method>
-            <method name="unbox_ushort" sig="(Lcli.System.UInt16;)S">
-                <body>
-                    <ldarg_0 />
-                    <ret />
-                </body>
-            </method>
-            <method name="unbox_uint" sig="(Lcli.System.UInt32;)I">
-                <body>
-                    <ldarg_0 />
-                    <ret />
-                </body>
-            </method>
-            <method name="unbox_ulong" sig="(Lcli.System.UInt64;)J">
-                <body>
-                    <ldarg_0 />
-                    <ret />
-                </body>
-            </method>
-        </class>
-        <class name="sun.misc.Launcher">
-            <method name="&lt;init&gt;" sig="()V">
-                <replace-method-call class="sun.misc.Launcher$ExtClassLoader" name="getExtClassLoader" sig="()Lsun.misc.Launcher$ExtClassLoader;">
-                    <code>
-                        <call class="sun.misc.MiscHelper" name="getExtClassLoader" sig="()Lsun.misc.Launcher$ExtClassLoader;" />
-                    </code>
-                </replace-method-call>
-                <replace-method-call class="sun.misc.Launcher$AppClassLoader" name="getAppClassLoader" sig="(Ljava.lang.ClassLoader;)Ljava.lang.ClassLoader;">
-                    <code>
-                        <call class="sun.misc.MiscHelper" name="getAppClassLoader" sig="(Ljava.lang.ClassLoader;)Ljava.lang.ClassLoader;" />
-                    </code>
-                </replace-method-call>
-                <replace-method-call class="java.lang.Thread" name="setContextClassLoader" sig="(Ljava.lang.ClassLoader;)V">
-                    <code>
-                        <!--
-                        The JDK uses setContextClassLoader() here, but we don't want to overwrite the context class loader if it has already been set.
-                        -->
-                        <callvirt class="java.lang.Thread" name="initContextClassLoader" sig="(Ljava.lang.ClassLoader;)V" />
-                    </code>
-                </replace-method-call>
-            </method>
-        </class>
-        <class name="java.util.concurrent.atomic.AtomicReference">
-            <method name="compareAndSet" sig="(Ljava.lang.Object;Ljava.lang.Object;)Z">
-                <body>
-                    <ldarg_0 />
-                    <ldflda class="java.util.concurrent.atomic.AtomicReference" name="value" sig="Ljava.lang.Object;" />
-                    <ldarg_2 />
-                    <ldarg_1 />
-                    <call type="System.Threading.Interlocked" name="CompareExchange" sig="System.Object&amp;;System.Object;System.Object" />
-                    <ldarg_1 />
-                    <ceq />
-                    <ret />
-                </body>
-            </method>
-            <method name="getAndSet" sig="(Ljava.lang.Object;)Ljava.lang.Object;">
-                <body>
-                    <ldarg_0 />
-                    <ldflda class="java.util.concurrent.atomic.AtomicReference" name="value" sig="Ljava.lang.Object;" />
-                    <ldarg_1 />
-                    <call type="System.Threading.Interlocked" name="Exchange" sig="System.Object&amp;;System.Object" />
-                    <ret />
-                </body>
-            </method>
-        </class>
-        <class name="java.util.concurrent.atomic.AtomicReferenceArray">
-            <method name="get" sig="(I)Ljava.lang.Object;">
-                <body>
-                    <ldarg_0 />
-                    <ldfld class="java.util.concurrent.atomic.AtomicReferenceArray" name="array" sig="[Ljava.lang.Object;" />
-                    <ldarg_1 />
-                    <ldelema sig="Ljava.lang.Object;" />
-                    <volatile />
-                    <ldind_ref />
-                    <ret />
-                </body>
-            </method>
-            <method name="set" sig="(ILjava.lang.Object;)V">
-                <body>
-                    <ldarg_0 />
-                    <ldfld class="java.util.concurrent.atomic.AtomicReferenceArray" name="array" sig="[Ljava.lang.Object;" />
-                    <ldarg_1 />
-                    <ldelema sig="Ljava.lang.Object;" />
-                    <ldarg_2 />
-                    <volatile />
-                    <stind_ref />
-                    <call type="System.Threading.Thread" name="MemoryBarrier" sig="" />
-                    <ret />
-                </body>
-            </method>
-            <method name="getAndSet" sig="(ILjava.lang.Object;)Ljava.lang.Object;">
-                <body>
-                    <ldarg_0 />
-                    <ldfld class="java.util.concurrent.atomic.AtomicReferenceArray" name="array" sig="[Ljava.lang.Object;" />
-                    <ldarg_1 />
-                    <ldelema sig="Ljava.lang.Object;" />
-                    <ldarg_2 />
-                    <call type="System.Threading.Interlocked" name="Exchange" sig="System.Object&amp;;System.Object" />
-                    <ret />
-                </body>
-            </method>
-            <method name="compareAndSet" sig="(ILjava.lang.Object;Ljava.lang.Object;)Z">
-                <body>
-                    <ldarg_0 />
-                    <ldfld class="java.util.concurrent.atomic.AtomicReferenceArray" name="array" sig="[Ljava.lang.Object;" />
-                    <ldarg_1 />
-                    <ldelema sig="Ljava.lang.Object;" />
-                    <ldarg_3 />
-                    <ldarg_2 />
-                    <call type="System.Threading.Interlocked" name="CompareExchange" sig="System.Object&amp;;System.Object;System.Object" />
-                    <ldarg_2 />
-                    <ceq />
-                    <ret />
-                </body>
-            </method>
-        </class>
-        <class name="java.util.concurrent.atomic.AtomicBoolean">
-            <method name="compareAndSwapInt" sig="(II)Z">
-                <body>
-                    <ldarg_0 />
-                    <ldflda class="java.util.concurrent.atomic.AtomicBoolean" name="value" sig="I" />
-                    <ldarg_2 />
-                    <ldarg_1 />
-                    <call type="System.Threading.Interlocked" name="CompareExchange" sig="System.Int32&amp;;System.Int32;System.Int32" />
-                    <ldarg_1 />
-                    <ceq />
-                    <ret />
-                </body>
-            </method>
-        </class>
-        <class name="java.util.concurrent.atomic.AtomicInteger">
-            <method name="getAndSet" sig="(I)I">
-                <body>
-                    <ldarg_0 />
-                    <ldflda class="java.util.concurrent.atomic.AtomicInteger" name="value" sig="I" />
-                    <ldarg_1 />
-                    <call type="System.Threading.Interlocked" name="Exchange" sig="System.Int32&amp;;System.Int32" />
-                    <ret />
-                </body>
-            </method>
-            <method name="compareAndSet" sig="(II)Z">
-                <body>
-                    <ldarg_0 />
-                    <ldflda class="java.util.concurrent.atomic.AtomicInteger" name="value" sig="I" />
-                    <ldarg_2 />
-                    <ldarg_1 />
-                    <call type="System.Threading.Interlocked" name="CompareExchange" sig="System.Int32&amp;;System.Int32;System.Int32" />
-                    <ldarg_1 />
-                    <ceq />
-                    <ret />
-                </body>
-            </method>
-            <method name="incrementAndGet" sig="()I">
-                <body>
-                    <ldarg_0 />
-                    <ldflda class="java.util.concurrent.atomic.AtomicInteger" name="value" sig="I" />
-                    <call type="System.Threading.Interlocked" name="Increment" sig="System.Int32&amp;" />
-                    <ret />
-                </body>
-            </method>
-            <method name="decrementAndGet" sig="()I">
-                <body>
-                    <ldarg_0 />
-                    <ldflda class="java.util.concurrent.atomic.AtomicInteger" name="value" sig="I" />
-                    <call type="System.Threading.Interlocked" name="Decrement" sig="System.Int32&amp;" />
-                    <ret />
-                </body>
-            </method>
-            <method name="addAndGet" sig="(I)I">
-                <body>
-                    <ldarg_0 />
-                    <ldflda class="java.util.concurrent.atomic.AtomicInteger" name="value" sig="I" />
-                    <ldarg_1 />
-                    <call type="System.Threading.Interlocked" name="Add" sig="System.Int32&amp;;System.Int32" />
-                    <ret />
-                </body>
-            </method>
-        </class>
-        <class name="java.util.concurrent.atomic.AtomicIntegerArray">
-            <method name="get" sig="(I)I">
-                <body>
-                    <ldarg_0 />
-                    <ldfld class="java.util.concurrent.atomic.AtomicIntegerArray" name="array" sig="[I" />
-                    <ldarg_1 />
-                    <ldelema sig="I" />
-                    <volatile />
-                    <ldind_i4 />
-                    <ret />
-                </body>
-            </method>
-            <method name="set" sig="(II)V">
-                <body>
-                    <ldarg_0 />
-                    <ldfld class="java.util.concurrent.atomic.AtomicIntegerArray" name="array" sig="[I" />
-                    <ldarg_1 />
-                    <ldelema sig="I" />
-                    <ldarg_2 />
-                    <volatile />
-                    <stind_i4 />
-                    <call type="System.Threading.Thread" name="MemoryBarrier" sig="" />
-                    <ret />
-                </body>
-            </method>
-            <method name="getAndSet" sig="(II)I">
-                <body>
-                    <ldarg_0 />
-                    <ldfld class="java.util.concurrent.atomic.AtomicIntegerArray" name="array" sig="[I" />
-                    <ldarg_1 />
-                    <ldelema sig="I" />
-                    <ldarg_2 />
-                    <call type="System.Threading.Interlocked" name="Exchange" sig="System.Int32&amp;;System.Int32" />
-                    <ret />
-                </body>
-            </method>
-            <method name="compareAndSet" sig="(III)Z">
-                <body>
-                    <ldarg_0 />
-                    <ldfld class="java.util.concurrent.atomic.AtomicIntegerArray" name="array" sig="[I" />
-                    <ldarg_1 />
-                    <ldelema sig="I" />
-                    <ldarg_3 />
-                    <ldarg_2 />
-                    <call type="System.Threading.Interlocked" name="CompareExchange" sig="System.Int32&amp;;System.Int32;System.Int32" />
-                    <ldarg_2 />
-                    <ceq />
-                    <ret />
-                </body>
-            </method>
-            <method name="incrementAndGet" sig="(I)I">
-                <body>
-                    <ldarg_0 />
-                    <ldfld class="java.util.concurrent.atomic.AtomicIntegerArray" name="array" sig="[I" />
-                    <ldarg_1 />
-                    <ldelema sig="I" />
-                    <call type="System.Threading.Interlocked" name="Increment" sig="System.Int32&amp;" />
-                    <ret />
-                </body>
-            </method>
-            <method name="decrementAndGet" sig="(I)I">
-                <body>
-                    <ldarg_0 />
-                    <ldfld class="java.util.concurrent.atomic.AtomicIntegerArray" name="array" sig="[I" />
-                    <ldarg_1 />
-                    <ldelema sig="I" />
-                    <call type="System.Threading.Interlocked" name="Decrement" sig="System.Int32&amp;" />
-                    <ret />
-                </body>
-            </method>
-            <method name="addAndGet" sig="(II)I">
-                <body>
-                    <ldarg_0 />
-                    <ldfld class="java.util.concurrent.atomic.AtomicIntegerArray" name="array" sig="[I" />
-                    <ldarg_1 />
-                    <ldelema sig="I" />
-                    <ldarg_2 />
-                    <call type="System.Threading.Interlocked" name="Add" sig="System.Int32&amp;;System.Int32" />
-                    <ret />
-                </body>
-            </method>
-        </class>
-        <class name="java.util.concurrent.atomic.AtomicLong">
-            <method name="getAndSet" sig="(J)J">
-                <body>
-                    <ldarg_0 />
-                    <ldflda class="java.util.concurrent.atomic.AtomicLong" name="value" sig="J" />
-                    <ldarg_1 />
-                    <call type="System.Threading.Interlocked" name="Exchange" sig="System.Int64&amp;;System.Int64" />
-                    <ret />
-                </body>
-            </method>
-            <method name="compareAndSet" sig="(JJ)Z">
-                <body>
-                    <ldarg_0 />
-                    <ldflda class="java.util.concurrent.atomic.AtomicLong" name="value" sig="J" />
-                    <ldarg_2 />
-                    <ldarg_1 />
-                    <call type="System.Threading.Interlocked" name="CompareExchange" sig="System.Int64&amp;;System.Int64;System.Int64" />
-                    <ldarg_1 />
-                    <ceq />
-                    <ret />
-                </body>
-            </method>
-            <method name="incrementAndGet" sig="()J">
-                <body>
-                    <ldarg_0 />
-                    <ldflda class="java.util.concurrent.atomic.AtomicLong" name="value" sig="J" />
-                    <call type="System.Threading.Interlocked" name="Increment" sig="System.Int64&amp;" />
-                    <ret />
-                </body>
-            </method>
-            <method name="decrementAndGet" sig="()J">
-                <body>
-                    <ldarg_0 />
-                    <ldflda class="java.util.concurrent.atomic.AtomicLong" name="value" sig="J" />
-                    <call type="System.Threading.Interlocked" name="Decrement" sig="System.Int64&amp;" />
-                    <ret />
-                </body>
-            </method>
-            <method name="addAndGet" sig="(J)J">
-                <body>
-                    <ldarg_0 />
-                    <ldflda class="java.util.concurrent.atomic.AtomicLong" name="value" sig="J" />
-                    <ldarg_1 />
-                    <call type="System.Threading.Interlocked" name="Add" sig="System.Int64&amp;;System.Int64" />
-                    <ret />
-                </body>
-            </method>
-        </class>
-        <class name="java.util.concurrent.atomic.AtomicLongArray">
-            <method name="get" sig="(I)J">
-                <body>
-                    <ldarg_0 />
-                    <ldfld class="java.util.concurrent.atomic.AtomicLongArray" name="array" sig="[J" />
-                    <ldarg_1 />
-                    <ldelema sig="J" />
-                    <volatile />
-                    <ldind_i8 />
-                    <ret />
-                </body>
-            </method>
-            <method name="set" sig="(IJ)V">
-                <body>
-                    <ldarg_0 />
-                    <ldfld class="java.util.concurrent.atomic.AtomicLongArray" name="array" sig="[J" />
-                    <ldarg_1 />
-                    <ldelema sig="J" />
-                    <ldarg_2 />
-                    <volatile />
-                    <stind_i8 />
-                    <call type="System.Threading.Thread" name="MemoryBarrier" sig="" />
-                    <ret />
-                </body>
-            </method>
-            <method name="getAndSet" sig="(IJ)J">
-                <body>
-                    <ldarg_0 />
-                    <ldfld class="java.util.concurrent.atomic.AtomicLongArray" name="array" sig="[J" />
-                    <ldarg_1 />
-                    <ldelema sig="J" />
-                    <ldarg_2 />
-                    <call type="System.Threading.Interlocked" name="Exchange" sig="System.Int64&amp;;System.Int64" />
-                    <ret />
-                </body>
-            </method>
-            <method name="compareAndSet" sig="(IJJ)Z">
-                <body>
-                    <ldarg_0 />
-                    <ldfld class="java.util.concurrent.atomic.AtomicLongArray" name="array" sig="[J" />
-                    <ldarg_1 />
-                    <ldelema sig="J" />
-                    <ldarg_3 />
-                    <ldarg_2 />
-                    <call type="System.Threading.Interlocked" name="CompareExchange" sig="System.Int64&amp;;System.Int64;System.Int64" />
-                    <ldarg_2 />
-                    <ceq />
-                    <ret />
-                </body>
-            </method>
-            <method name="incrementAndGet" sig="(I)J">
-                <body>
-                    <ldarg_0 />
-                    <ldfld class="java.util.concurrent.atomic.AtomicLongArray" name="array" sig="[J" />
-                    <ldarg_1 />
-                    <ldelema sig="J" />
-                    <call type="System.Threading.Interlocked" name="Increment" sig="System.Int64&amp;" />
-                    <ret />
-                </body>
-            </method>
-            <method name="decrementAndGet" sig="(I)J">
-                <body>
-                    <ldarg_0 />
-                    <ldfld class="java.util.concurrent.atomic.AtomicLongArray" name="array" sig="[J" />
-                    <ldarg_1 />
-                    <ldelema sig="J" />
-                    <call type="System.Threading.Interlocked" name="Decrement" sig="System.Int64&amp;" />
-                    <ret />
-                </body>
-            </method>
-            <method name="addAndGet" sig="(IJ)J">
-                <body>
-                    <ldarg_0 />
-                    <ldfld class="java.util.concurrent.atomic.AtomicLongArray" name="array" sig="[J" />
-                    <ldarg_1 />
-                    <ldelema sig="J" />
-                    <ldarg_2 />
-                    <call type="System.Threading.Interlocked" name="Add" sig="System.Int64&amp;;System.Int64" />
-                    <ret />
-                </body>
-            </method>
-        </class>
-        <class name="java.lang.Byte">
-            <implements class="cli.System.IFormattable">
-                <method name="ToString" sig="(Ljava.lang.String;Lcli.System.IFormatProvider;)Ljava.lang.String;">
-                    <redirect class="ikvm.internal.Formatter" type="static" name="ToString" sig="(Ljava.lang.Byte;Ljava.lang.String;Lcli.System.IFormatProvider;)Ljava.lang.String;" />
-                </method>
-            </implements>
-        </class>
-        <class name="java.lang.Short">
-            <implements class="cli.System.IFormattable">
-                <method name="ToString" sig="(Ljava.lang.String;Lcli.System.IFormatProvider;)Ljava.lang.String;">
-                    <redirect class="ikvm.internal.Formatter" type="static" name="ToString" sig="(Ljava.lang.Short;Ljava.lang.String;Lcli.System.IFormatProvider;)Ljava.lang.String;" />
-                </method>
-            </implements>
-        </class>
-        <class name="java.lang.Integer">
-            <implements class="cli.System.IFormattable">
-                <method name="ToString" sig="(Ljava.lang.String;Lcli.System.IFormatProvider;)Ljava.lang.String;">
-                    <redirect class="ikvm.internal.Formatter" type="static" name="ToString" sig="(Ljava.lang.Integer;Ljava.lang.String;Lcli.System.IFormatProvider;)Ljava.lang.String;" />
-                </method>
-            </implements>
-            <method name="compareUnsigned" sig="(II)I">
-                <body>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <bge_un name="ge" />
-                    <ldc_i4_m1 />
-                    <ret />
-                    <label name="ge" />
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <bne_un name="ne" />
-                    <ldc_i4_0 />
-                    <ret />
-                    <label name="ne" />
-                    <ldc_i4_1 />
-                    <ret />
-                </body>
-            </method>
-            <method name="divideUnsigned" sig="(II)I">
-                <body>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <div_un />
-                    <ret />
-                </body>
-            </method>
-            <method name="remainderUnsigned" sig="(II)I">
-                <body>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <rem_un />
-                    <ret />
-                </body>
-            </method>
-        </class>
-        <class name="java.lang.Long">
-            <implements class="cli.System.IFormattable">
-                <method name="ToString" sig="(Ljava.lang.String;Lcli.System.IFormatProvider;)Ljava.lang.String;">
-                    <redirect class="ikvm.internal.Formatter" type="static" name="ToString" sig="(Ljava.lang.Long;Ljava.lang.String;Lcli.System.IFormatProvider;)Ljava.lang.String;" />
-                </method>
-            </implements>
-            <method name="compareUnsigned" sig="(JJ)I">
-                <body>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <bge_un name="ge" />
-                    <ldc_i4_m1 />
-                    <ret />
-                    <label name="ge" />
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <bne_un name="ne" />
-                    <ldc_i4_0 />
-                    <ret />
-                    <label name="ne" />
-                    <ldc_i4_1 />
-                    <ret />
-                </body>
-            </method>
-            <method name="divideUnsigned" sig="(JJ)J">
-                <body>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <div_un />
-                    <ret />
-                </body>
-            </method>
-            <method name="remainderUnsigned" sig="(JJ)J">
-                <body>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <rem_un />
-                    <ret />
-                </body>
-            </method>
-        </class>
-        <class name="java.lang.Float">
-            <implements class="cli.System.IFormattable">
-                <method name="ToString" sig="(Ljava.lang.String;Lcli.System.IFormatProvider;)Ljava.lang.String;">
-                    <redirect class="ikvm.internal.Formatter" type="static" name="ToString" sig="(Ljava.lang.Float;Ljava.lang.String;Lcli.System.IFormatProvider;)Ljava.lang.String;" />
-                </method>
-            </implements>
-        </class>
-        <class name="java.lang.Double">
-            <implements class="cli.System.IFormattable">
-                <method name="ToString" sig="(Ljava.lang.String;Lcli.System.IFormatProvider;)Ljava.lang.String;">
-                    <redirect class="ikvm.internal.Formatter" type="static" name="ToString" sig="(Ljava.lang.Double;Ljava.lang.String;Lcli.System.IFormatProvider;)Ljava.lang.String;" />
-                </method>
-            </implements>
-        </class>
-        <class name="java.nio.ByteBufferAsCharBufferB">
-            <method name="getUnchecked" sig="(I)C">
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-            </method>
-        </class>
-        <class name="java.nio.ByteBufferAsCharBufferL">
-            <method name="getUnchecked" sig="(I)C">
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-            </method>
-        </class>
-        <class name="java.nio.CharBuffer">
-            <method name="getUnchecked" sig="(I)C">
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-            </method>
-        </class>
-        <class name="java.nio.CharBufferSpliterator">
-            <method name="forEachRemaining" sig="(Ljava.util.function.IntConsumer;)V">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="tryAdvance" sig="(Ljava.util.function.IntConsumer;)Z">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-        </class>
-        <class name="java.nio.DirectByteBuffer">
-            <!-- add a constructor accessor for JNI -->
-            <method name="__new" sig="(JI)Ljava.nio.DirectByteBuffer;" modifiers="static">
-                <body>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <newobj class="java.nio.DirectByteBuffer" name="&lt;init&gt;" sig="(JI)V" />
-                    <ret />
-                </body>
-            </method>
-            <constructor sig="(I)V">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </constructor>
-            <method name="_get" sig="(I)B">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="_put" sig="(IB)V">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="get" sig="()B">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="get" sig="(I)B">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="get" sig="([BII)Ljava.nio.ByteBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="getChar" sig="(J)C">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="putChar" sig="(JC)Ljava.nio.ByteBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="getShort" sig="(J)S">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="putShort" sig="(JS)Ljava.nio.ByteBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="getInt" sig="(J)I">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="putInt" sig="(JI)Ljava.nio.ByteBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="getLong" sig="(J)J">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="putLong" sig="(JJ)Ljava.nio.ByteBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="getFloat" sig="(J)F">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="putFloat" sig="(JF)Ljava.nio.ByteBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="getDouble" sig="(J)D">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="putDouble" sig="(JD)Ljava.nio.ByteBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(Ljava.nio.ByteBuffer;)Ljava.nio.ByteBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(B)Ljava.nio.ByteBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(IB)Ljava.nio.ByteBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="([BII)Ljava.nio.ByteBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="compact" sig="()Ljava.nio.ByteBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-        </class>
-        <class name="java.nio.DirectByteBuffer$Deallocator">
-            <method name="run" sig="()V">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-        </class>
-        <class name="java.nio.DirectByteBufferR">
-            <method name="_get" sig="(I)B">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-        </class>
-        <class name="java.nio.DirectCharBufferS">
-            <method name="get" sig="()C">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="get" sig="(I)C">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="get" sig="([CII)Ljava.nio.CharBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="getUnchecked" sig="(I)C">
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(Ljava.nio.CharBuffer;)Ljava.nio.CharBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(C)Ljava.nio.CharBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(IC)Ljava.nio.CharBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="([CII)Ljava.nio.CharBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="compact" sig="()Ljava.nio.CharBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-        </class>
-        <class name="java.nio.DirectCharBufferU">
-            <method name="get" sig="()C">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="get" sig="(I)C">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="get" sig="([CII)Ljava.nio.CharBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="getUnchecked" sig="(I)C">
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(Ljava.nio.CharBuffer;)Ljava.nio.CharBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(C)Ljava.nio.CharBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(IC)Ljava.nio.CharBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="([CII)Ljava.nio.CharBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="compact" sig="()Ljava.nio.CharBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-        </class>
-        <class name="java.nio.DirectDoubleBufferS">
-            <method name="get" sig="()D">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="get" sig="(I)D">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="get" sig="([DII)Ljava.nio.DoubleBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(Ljava.nio.DoubleBuffer;)Ljava.nio.DoubleBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(D)Ljava.nio.DoubleBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(ID)Ljava.nio.DoubleBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="([DII)Ljava.nio.DoubleBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="compact" sig="()Ljava.nio.DoubleBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-        </class>
-        <class name="java.nio.DirectDoubleBufferU">
-            <method name="get" sig="()D">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="get" sig="(I)D">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="get" sig="([DII)Ljava.nio.DoubleBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(Ljava.nio.DoubleBuffer;)Ljava.nio.DoubleBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(D)Ljava.nio.DoubleBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(ID)Ljava.nio.DoubleBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="([DII)Ljava.nio.DoubleBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="compact" sig="()Ljava.nio.DoubleBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-        </class>
-        <class name="java.nio.DirectFloatBufferS">
-            <method name="get" sig="()F">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="get" sig="(I)F">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="get" sig="([FII)Ljava.nio.FloatBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(Ljava.nio.FloatBuffer;)Ljava.nio.FloatBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(F)Ljava.nio.FloatBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(IF)Ljava.nio.FloatBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="([FII)Ljava.nio.FloatBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="compact" sig="()Ljava.nio.FloatBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-        </class>
-        <class name="java.nio.DirectFloatBufferU">
-            <method name="get" sig="()F">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="get" sig="(I)F">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="get" sig="([FII)Ljava.nio.FloatBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(Ljava.nio.FloatBuffer;)Ljava.nio.FloatBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(F)Ljava.nio.FloatBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(IF)Ljava.nio.FloatBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="([FII)Ljava.nio.FloatBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="compact" sig="()Ljava.nio.FloatBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-        </class>
-        <class name="java.nio.DirectIntBufferS">
-            <method name="get" sig="()I">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="get" sig="(I)I">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="get" sig="([III)Ljava.nio.IntBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(Ljava.nio.IntBuffer;)Ljava.nio.IntBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(I)Ljava.nio.IntBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(II)Ljava.nio.IntBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="([III)Ljava.nio.IntBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="compact" sig="()Ljava.nio.IntBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-        </class>
-        <class name="java.nio.DirectIntBufferU">
-            <method name="get" sig="()I">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="get" sig="(I)I">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="get" sig="([III)Ljava.nio.IntBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(Ljava.nio.IntBuffer;)Ljava.nio.IntBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(I)Ljava.nio.IntBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(II)Ljava.nio.IntBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="([III)Ljava.nio.IntBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="compact" sig="()Ljava.nio.IntBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-        </class>
-        <class name="java.nio.DirectLongBufferS">
-            <method name="get" sig="()J">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="get" sig="(I)J">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="get" sig="([JII)Ljava.nio.LongBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(Ljava.nio.LongBuffer;)Ljava.nio.LongBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(J)Ljava.nio.LongBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(IJ)Ljava.nio.LongBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="([JII)Ljava.nio.LongBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="compact" sig="()Ljava.nio.LongBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-        </class>
-        <class name="java.nio.DirectLongBufferU">
-            <method name="get" sig="()J">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="get" sig="(I)J">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="get" sig="([JII)Ljava.nio.LongBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(Ljava.nio.LongBuffer;)Ljava.nio.LongBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(J)Ljava.nio.LongBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(IJ)Ljava.nio.LongBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="([JII)Ljava.nio.LongBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="compact" sig="()Ljava.nio.LongBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-        </class>
-        <class name="java.nio.DirectShortBufferS">
-            <method name="get" sig="()S">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="get" sig="(I)S">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="get" sig="([SII)Ljava.nio.ShortBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(Ljava.nio.ShortBuffer;)Ljava.nio.ShortBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(S)Ljava.nio.ShortBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(IS)Ljava.nio.ShortBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="([SII)Ljava.nio.ShortBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="compact" sig="()Ljava.nio.ShortBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-        </class>
-        <class name="java.nio.DirectShortBufferU">
-            <method name="get" sig="()S">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="get" sig="(I)S">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="get" sig="([SII)Ljava.nio.ShortBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(Ljava.nio.ShortBuffer;)Ljava.nio.ShortBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(S)Ljava.nio.ShortBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="(IS)Ljava.nio.ShortBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-            <method name="put" sig="([SII)Ljava.nio.ShortBuffer;">
-                <!-- we use TreasAsSafe + Critical instead of SafeCritical to workaround PEVerify bug on .NET 2.0/3.5 -->
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-                <attribute type="System.Security.SecurityTreatAsSafeAttribute" sig="()V" />
-            </method>
-            <method name="compact" sig="()Ljava.nio.ShortBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-        </class>
-        <class name="java.nio.HeapCharBuffer">
-            <method name="getUnchecked" sig="(I)C">
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-            </method>
-        </class>
-        <class name="java.nio.MappedByteBuffer">
-            <method name="load" sig="()Ljava.nio.MappedByteBuffer;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-        </class>
-        <class name="java.nio.StringCharBuffer">
-            <method name="getUnchecked" sig="(I)C">
-                <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
-            </method>
-        </class>
-        <class name="sun.reflect.Reflection">
-            <!-- we manually hook up this native method, to prevent inlining and tail-call optimizations -->
-            <method name="getCallerClass" sig="(I)Ljava.lang.Class;">
-                <attribute type="System.Runtime.CompilerServices.MethodImplAttribute" sig="(Lcli.System.Runtime.CompilerServices.MethodImplOptions;)V">
-                    <parameter>NoInlining</parameter>
-                </attribute>
-                <body>
-                    <ldarg_0 />
-                    <call type="Java_sun_reflect_Reflection" name="getCallerClass" sig="(I)Ljava.lang.Class;" />
-                    <stloc name="class" class="java.lang.Class" />
-                    <!-- "leave" is to thwart tail-call optimization -->
-                    <leave name="x" />
-                    <label name="x" />
-                    <ldloc name="class" />
-                    <ret />
-                </body>
-            </method>
-        </class>
-        <class name="java.lang.StackTraceElement">
-            <attribute type="System.SerializableAttribute" sig="()V" />
-        </class>
-        <class name="java.lang.invoke.CallSite">
-            <field name="ics" sig="Lcli.IKVM.Runtime.IIndyCallSite;" modifiers="">
-                <attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" />
-            </field>
-        </class>
-        <class name="java.lang.invoke.MemberName">
-            <field name="vmtarget" sig="Ljava.lang.Object;" modifiers="">
-                <attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" />
-            </field>
-            <constructor sig="(Ljava.lang.reflect.Method;Z)V">
-                <replace-method-call class="java.lang.invoke.MethodHandleNatives" name="init" sig="(Ljava.lang.invoke.MemberName;Ljava.lang.Object;)V">
-                    <code>
-                        <ldarg_2 />
-                        <call type="Java_java_lang_invoke_MethodHandleNatives" name="init" sig="(Ljava.lang.invoke.MemberName;Ljava.lang.Object;Z)V" />
-                    </code>
-                </replace-method-call>
-            </constructor>
-            <method name="_clazz" sig="(Ljava.lang.Class;)V" modifiers="final">
-                <attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" />
-                <body>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <stfld class="java.lang.invoke.MemberName" name="clazz" sig="Ljava.lang.Class;" />
-                    <ret />
-                </body>
-            </method>
-            <method name="_flags" sig="()I" modifiers="final">
-                <attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" />
-                <body>
-                    <ldarg_0 />
-                    <ldfld class="java.lang.invoke.MemberName" name="flags" sig="I" />
-                    <ret />
-                </body>
-            </method>
-            <method name="_flags" sig="(I)V" modifiers="final">
-                <attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" />
-                <body>
-                    <ldarg_0 />
-                    <ldarg_1 />
-                    <stfld class="java.lang.invoke.MemberName" name="flags" sig="I" />
-                    <ret />
-                </body>
-            </method>
-        </class>
-        <class name="java.lang.invoke.MethodHandle">
-            <field name="_invokeExactDelegate" sig="Ljava.lang.Object;" modifiers="">
-                <attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" />
-            </field>
-            <method name="invoke" sig="([Ljava.lang.Object;)Ljava.lang.Object;">
-                <attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" />
-            </method>
-            <method name="invokeExact" sig="([Ljava.lang.Object;)Ljava.lang.Object;">
-                <attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" />
-            </method>
-            <!-- NOTE Modifiers.Final and MethodAttributes.NewSlot is recognized by AotTypeWrapper.MapModifiers() as a magic combination that generates a non-virtual method -->
-            <method name="reflectionInvoke" sig="([Ljava.lang.Object;)Ljava.lang.Object;" modifiers="final" attributes="NewSlot">
-                <throws class="java.lang.Throwable" />
-                <attribute type="System.Runtime.CompilerServices.MethodImplAttribute" sig="(Lcli.System.Runtime.CompilerServices.MethodImplOptions;)V">
-                    <parameter>NoInlining</parameter>
-                </attribute>
-                <attribute type="IKVM.Attributes.NameSigAttribute" sig="(Ljava.lang.String;Ljava.lang.String;)V">
-                    <parameter>invoke</parameter>
-                    <parameter>([Ljava.lang.Object;)Ljava.lang.Object;</parameter>
-                </attribute>
-                <attribute type="IKVM.Attributes.ModifiersAttribute" sig="(Lcli.IKVM.Attributes.Modifiers;)V">
-                    <parameter>Public,Final,Native,VarArgs</parameter>
-                </attribute>
-                <body>
-                    <ldstr value="MethodHandle.invoke cannot be invoked reflectively" />
-                    <newobj class="java.lang.UnsupportedOperationException" name="&lt;init&gt;" sig="(Ljava.lang.String;)V" />
-                    <throw />
-                </body>
-            </method>
-            <!-- NOTE Modifiers.Final and MethodAttributes.NewSlot is recognized by AotTypeWrapper.MapModifiers() as a magic combination that generates a non-virtual method -->
-            <method name="reflectionInvokeExact" sig="([Ljava.lang.Object;)Ljava.lang.Object;" modifiers="final" attributes="NewSlot">
-                <throws class="java.lang.Throwable" />
-                <attribute type="System.Runtime.CompilerServices.MethodImplAttribute" sig="(Lcli.System.Runtime.CompilerServices.MethodImplOptions;)V">
-                    <parameter>NoInlining</parameter>
-                </attribute>
-                <attribute type="IKVM.Attributes.NameSigAttribute" sig="(Ljava.lang.String;Ljava.lang.String;)V">
-                    <parameter>invokeExact</parameter>
-                    <parameter>([Ljava.lang.Object;)Ljava.lang.Object;</parameter>
-                </attribute>
-                <attribute type="IKVM.Attributes.ModifiersAttribute" sig="(Lcli.IKVM.Attributes.Modifiers;)V">
-                    <parameter>Public,Final,Native,VarArgs</parameter>
-                </attribute>
-                <body>
-                    <ldstr value="MethodHandle.invokeExact cannot be invoked reflectively" />
-                    <newobj class="java.lang.UnsupportedOperationException" name="&lt;init&gt;" sig="(Ljava.lang.String;)V" />
-                    <throw />
-                </body>
-            </method>
-        </class>
-        <class name="java.lang.invoke.MethodHandles$Lookup">
-            <!-- We have to disable this check, because we rely on Lookup.lookup() in our lambda bootstrap method -->
-            <method name="checkUnprivilegedlookupClass" sig="(Ljava.lang.Class;I)V">
-                <body>
-                    <ret />
-                </body>
-            </method>
-            <!-- We hook this to undo the fiddling we do to support string constructors -->
-            <method name="revealDirect" sig="(Ljava.lang.invoke.MethodHandle;)Ljava.lang.invoke.MethodHandleInfo;">
-                <replace-method-call class="java.lang.invoke.MethodHandle" name="internalMemberName" sig="()Ljava.lang.invoke.MemberName;">
-                    <code>
-                        <call type="Java_java_lang_invoke_MethodHandleNatives" name="internalMemberName" sig="(Ljava.lang.invoke.MethodHandle;)Ljava.lang.invoke.MemberName;" />
-                    </code>
-                </replace-method-call>
-            </method>
-        </class>
-        <class name="java.lang.invoke.DirectMethodHandle">
-            <method name="allocateInstance" sig="(Ljava.lang.Object;)Ljava.lang.Object;">
-                <attribute type="System.Security.SecuritySafeCriticalAttribute" sig="()V" />
-            </method>
-        </class>
-        <class name="java.lang.invoke.MethodType">
-            <field name="voidAdapter" sig="Ljava.lang.Object;" modifiers="">
-                <attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" />
-            </field>
-            <field name="_invokeExactDynamicMethod" sig="Lcli.System.Reflection.Emit.DynamicMethod;" modifiers="">
-                <attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" />
-            </field>
-            <field name="_invokeExactDelegateType" sig="Lcli.System.Type;" modifiers="">
-                <attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" />
-            </field>
-        </class>
-        <class name="sun.util.locale.provider.JRELocaleProviderAdapter">
-            <!-- We replace this method, because it looks for %JAVA_HOME%/lib/ext/localedata.jar and we don't have that -->
-            <method name="isNonENLangSupported" sig="()Z">
-                <body>
-                    <call type="JRELocaleProviderAdapter" name="isNonENLangSupported" sig="()Z" />
-                    <ret />
-                </body>
-            </method>
-        </class>
-        <class name="com.sun.xml.internal.ws.developer.ServerSideException">
-            <!-- HACK we replace getMessage to remove the additional text that OpenJDK 8 appends -->
-            <method name="getMessage" sig="()Ljava.lang.String;">
-                <body>
-                    <ldarg_0 />
-                    <call class="java.lang.Throwable" name="getMessage" sig="()Ljava.lang.String;" />
-                    <ret />
-                </body>
-            </method>
-        </class>
-    </assembly>
-    <exceptionMappings>
-        <exception src="System.NullReferenceException" dst="java.lang.NullPointerException" />
-        <!-- many of the String and Object methods throw ArgumentNullException where Java throws an NPE -->
-        <exception src="System.ArgumentNullException" dst="java.lang.NullPointerException" />
-        <exception src="System.IndexOutOfRangeException" dst="java.lang.ArrayIndexOutOfBoundsException" />
-        <!-- HACK for String methods, we remap ArgumentOutOfRangeException to StringIndexOutOfBoundsException -->
-        <exception src="System.ArgumentOutOfRangeException" dst="java.lang.StringIndexOutOfBoundsException" />
-        <exception src="System.InvalidCastException" dst="java.lang.ClassCastException">
-            <code>
-                <callvirt type="System.Exception" name="get_Message" sig="()Ljava.lang.String;" />
-                <newobj class="java.lang.ClassCastException" name="&lt;init&gt;" sig="(Ljava.lang.String;)V" />
-            </code>
-        </exception>
-        <!-- NOTE we "map" to java.lang.Error, because that is the base class of all possible mappings.
-             The * in front of the class name means that all subclasses can be thrown as well.
-        -->
-        <exception src="System.TypeInitializationException" dst="*java.lang.Error">
-            <code>
-                <!-- this code is unreachable, TypeInitializationException is handled explicitly in ExceptionHelper.java -->
-            </code>
-        </exception>
-        <exception src="System.Threading.SynchronizationLockException" dst="java.lang.IllegalMonitorStateException" />
-        <exception src="System.OutOfMemoryException" dst="java.lang.OutOfMemoryError" />
-        <exception src="System.DivideByZeroException" dst="java.lang.ArithmeticException">
-            <code>
-                <pop />
-                <ldstr value="/ by zero" />
-                <newobj class="java.lang.ArithmeticException" name="&lt;init&gt;" sig="(Ljava.lang.String;)V" />
-            </code>
-        </exception>
-        <exception src="System.ArrayTypeMismatchException" dst="java.lang.ArrayStoreException" />
-        <exception src="System.StackOverflowException" dst="java.lang.StackOverflowError" />
-        <exception src="System.Threading.ThreadAbortException" dst="java.lang.ThreadDeath">
-            <code>
-                <castclass type="System.Threading.ThreadAbortException" />
-                <call type="System.Threading.ThreadAbortException" name="get_ExceptionState" sig="()Ljava.lang.Object;" />
-                <isinst class="java.lang.ThreadDeath" />
-                <dup />
-                <brtrue name="end" />
-                <pop />
-                <newobj class="java.lang.ThreadDeath" name="&lt;init&gt;" sig="()V" />
-                <label name="end" />
-                <!-- NOTE we do this last because ResetAbort clears the ExceptionState of the ThreadAbortException (why?) -->
-                <!-- TODO we should put an exception handler around the ResetAbort call, because it will throw a ThreadStateException
-		     if no Abort is pending (someone could have thrown the exception manually, or we could have called on a 
-		     previous handler that turned out not to be match for this exception type) -->
-                <stloc name="x" class="java.lang.ThreadDeath" />
-                <exceptionBlock>
-                    <try>
-                        <!-- TODO instead of catching the ThreadStateException, we should check the ThreadState
-			     before calling ResetAbort -->
-                        <call type="System.Threading.Thread" name="ResetAbort" sig="()V" />
-                        <leave name="next" />
-                    </try>
-                    <catch type="System.Threading.ThreadStateException">
-                        <!-- ignore the exception -->
-                        <leave name="next" />
-                    </catch>
-                </exceptionBlock>
-                <label name="next" />
-                <ldloc name="x" />
-            </code>
-        </exception>
-        <!-- TODO make sure the originating method was from an IKVM.NET generated assembly, because if it was
-	     generated by non-Java code, this remapping is obviously bogus. -->
-        <exception src="System.OverflowException" dst="java.lang.NegativeArraySizeException" />
-    </exceptionMappings>
-</root>
diff --git a/openjdk/openjdk.build b/openjdk/openjdk.build
deleted file mode 100644
index 6b790202..00000000
--- a/openjdk/openjdk.build
+++ /dev/null
@@ -1,458 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Copyright (C) 2002-2014 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
--->
-<project name="ClassLibrary" default="all">
-    <include buildfile="../ikvm.include" />
-    <property name="pathsep" value=":" />
-    <property overwrite="false" name="signoption" value="" />
-    <property overwrite="false" name="SkipSystemCoreDependency" value="false" />
-    <property name="OPENJDK_VERSION" value="OpenJDK 8 b132" />
-    <property name="IMPLEMENTATION_VERSION" value="1.8.0" />
-    <property name="SPECIFICATION_VERSION" value="1.8" />
-    <property name="FULL_VERSION" value="1.8.0-b132" />
-    <property name="OpenJDK.dir" value="${project::get-base-directory()}/../../openjdk-8-b132" />
-    <if test="${platform::is-win32()}">
-        <property name="pathsep" value=";" />
-    </if>
-
-    <target name="all" depends="classes rmi run-nasgen vfs resources core">
-    </target>
-
-    <target name="version">
-        <property name="VERSION" value="${assemblyname::get-version(assemblyname::get-assembly-name(path::combine(project::get-base-directory(), '../bin/IKVM.Runtime.dll')))}" />
-    </target>
-
-    <target name="copyright" depends="allsources.gen.lst">
-        <exec program="${project::get-base-directory()}/../tools/SourceLicenseAnalyzer.exe" output="copyright.txt" useruntimeengine="true" />
-        <loadfile file="copyright.txt" property="COPYRIGHT" />
-    </target>
-
-    <target name="allsources.gen.lst">
-        <copy file="allsources.lst" tofile="allsources.gen.lst" outputencoding="ascii" overwrite="true">
-            <filterchain>
-                <replacetokens>
-                    <token key="OPENJDK" value="${OpenJDK.dir}" />
-                </replacetokens>
-            </filterchain>
-        </copy>
-    </target>
-
-    <target name="System.Core" unless="${SkipSystemCoreDependency}">
-        <delete file="System.Core.dll" />
-        <if test="${version::get-major(framework::get-version(framework::get-target-framework() )) &lt; 4}">
-            <copy file="../bin/IKVM.Reflection.dll" todir="." overwrite="true" />
-            <csc target="exe" output="GenerateSystemCore.exe">
-                <sources>
-                    <include name="GenerateSystemCore.cs" />
-                </sources>
-                <references>
-                    <include name="IKVM.Reflection.dll" asis="true" />
-                </references>
-            </csc>
-            <exec program="GenerateSystemCore.exe" useruntimeengine="true" />
-            <delete>
-                <fileset basedir=".">
-                    <include name="IKVM.Reflection.dll"/>
-                    <include name="GenerateSystemCore.exe"/>
-                </fileset>
-            </delete>
-        </if>
-    </target>
-
-    <target name="DummySystemCoreJar">
-        <exec program="javac" commandline="-implicit:none ExtensionAttribute.java" useruntimeengine="false" />
-        <zip zipfile="System.Core.jar">
-            <fileset prefix="cli/System/Runtime/CompilerServices">
-                <include name="ExtensionAttribute.class" />
-                <include name="ExtensionAttribute$Annotation.class" />
-            </fileset>
-        </zip>
-        <delete>
-            <fileset basedir=".">
-                <include name="ExtensionAttribute.class" />
-                <include name="ExtensionAttribute$Annotation.class" />
-            </fileset>
-        </delete>
-    </target>
-
-    <target name="clean-classes">
-        <delete>
-            <fileset basedir="../classpath">
-                <include name="**.class"/>
-            </fileset>
-        </delete>
-        <delete>
-            <fileset basedir="${OpenJDK.dir}">
-                <include name="**.class"/>
-            </fileset>
-        </delete>
-        <delete>
-            <fileset basedir=".">
-                <include name="**.class"/>
-            </fileset>
-        </delete>
-    </target>
-
-    <target name="clean-stubjars">
-        <delete>
-            <fileset basedir=".">
-                <include name="mscorlib.jar" />
-                <include name="System.jar" />
-                <include name="System.Core.jar" />
-                <include name="System.Data.jar" />
-                <include name="System.Drawing.jar" />
-                <include name="System.XML.jar" />
-            </fileset>
-        </delete>
-    </target>
-
-    <target name="stubjars" depends="clean-stubjars System.Core">
-        <exec program="${project::get-base-directory()}/../bin/ikvmstub.exe" commandline="-bootstrap mscorlib" useruntimeengine="true" />
-        <exec program="${project::get-base-directory()}/../bin/ikvmstub.exe" commandline="-bootstrap System" useruntimeengine="true" />
-        <exec program="${project::get-base-directory()}/../bin/ikvmstub.exe" commandline="-bootstrap System.Core" useruntimeengine="true" unless="${SkipSystemCoreDependency}" />
-        <if test="${SkipSystemCoreDependency}">
-            <call target="DummySystemCoreJar" />
-        </if>
-        <exec program="${project::get-base-directory()}/../bin/ikvmstub.exe" commandline="-bootstrap System.Data" useruntimeengine="true" />
-        <exec program="${project::get-base-directory()}/../bin/ikvmstub.exe" commandline="-bootstrap System.Drawing" useruntimeengine="true" />
-        <exec program="${project::get-base-directory()}/../bin/ikvmstub.exe" commandline="-bootstrap System.XML" useruntimeengine="true" />
-    </target>
-
-    <target name="runtime-identity">
-        <property name="IKVM.Runtime" value="IKVM.Runtime" />
-        <property name="IKVM.AWT.WinForms" value="IKVM.AWT.WinForms" />
-        <if test="${signoption != ''}">
-            <loadfile file="../tools/pubkey.txt" property="publickey" />
-            <property name="IKVM.Runtime" value="IKVM.Runtime, PublicKey=${publickey}" />
-            <property name="IKVM.AWT.WinForms" value="IKVM.AWT.WinForms, PublicKey=${publickey}" />
-        </if>
-    </target>
-
-    <target name="AssemblyInfo.java" depends="runtime-identity version copyright">
-        <copy file="AssemblyInfo.java.in" tofile="AssemblyInfo.java" outputencoding="ascii" overwrite="true">
-            <filterchain>
-                <replacetokens>
-                    <token key="RUNTIME" value="${IKVM.Runtime}" />
-                    <token key="AWTWINFORMS" value="${IKVM.AWT.WinForms}" />
-                    <token key="VERSION" value="${VERSION}" />
-                    <token key="COPYRIGHT" value="${COPYRIGHT}" />
-                </replacetokens>
-            </filterchain>
-        </copy>
-    </target>
-
-    <target name="PropertyConstants.java" depends="version">
-        <copy file="java/lang/PropertyConstants.java.in" tofile="java/lang/PropertyConstants.java" outputencoding="ascii" overwrite="true">
-            <filterchain>
-                <replacetokens>
-                    <token key="AWTASSEMBLY" value="${string::replace(assemblyname::get-full-name(assemblyname::get-assembly-name(path::combine(project::get-base-directory(), '../bin/IKVM.Runtime.dll'))), 'IKVM.Runtime', 'IKVM.AWT.WinForms')}" />
-                    <token key="VERSION" value="${VERSION}" />
-                    <token key="OPENJDK_VERSION" value="${OPENJDK_VERSION}" />
-                </replacetokens>
-            </filterchain>
-        </copy>
-    </target>
-
-    <target name="classes" depends="clean-classes stubjars allsources.gen.lst AssemblyInfo.java PropertyConstants.java">
-        <exec program="javac" useruntimeengine="false">
-            <arg value="-J-Xmx1536M" />
-            <arg value="-g" />
-            <arg value="-nowarn" />
-            <arg value="-implicit:none" />
-            <arg value="-parameters" />
-            <arg line="-cp dummy" />
-            <arg value="-bootclasspath" />
-            <arg path="mscorlib.jar;System.jar;System.Core.jar;System.Data.jar;System.Drawing.jar;System.XML.jar;../runtime/IKVM.Runtime.jar" />
-            <arg value="@allsources.gen.lst" />
-        </exec>
-    </target>
-
-    <target name="classpath">
-        <property name="CLASSPATH" value="mscorlib.jar${pathsep}System.Xml.jar${pathsep}${OpenJDK.dir}/jdk/src/share/classes/${pathsep}${OpenJDK.dir}/corba/src/share/classes" />
-    </target>
-
-    <target name="rmi" depends="classpath">
-        <mkdir dir="rmistubs" />
-        <property name="VMARGS" value="-J-client -J-Xmx896m -J-Xms128m" />
-        <property name="OUTPUT" value="rmistubs" />
-        <property name="ARGS" value="${VMARGS} -nowarn -bootclasspath ${CLASSPATH} -d ${OUTPUT}" />
-        <exec program="rmic" commandline="${ARGS} -v1.1 sun.rmi.registry.RegistryImpl" />
-        <exec program="rmic" commandline="${ARGS} -v1.1 sun.rmi.transport.DGCImpl" />
-        <exec program="rmic" commandline="${ARGS} -v1.2 sun.rmi.server.Activation$ActivationSystemImpl" />
-        <exec program="rmic" commandline="${ARGS} -v1.2 java.rmi.activation.ActivationGroup" />
-        <exec program="rmic" commandline="${ARGS} -v1.2 com.sun.jndi.rmi.registry.ReferenceWrapper" />
-        <exec program="rmic" commandline="${ARGS} -v1.2 javax.management.remote.rmi.RMIConnectionImpl" />
-        <exec program="rmic" commandline="${ARGS} -v1.2 -iiop javax.management.remote.rmi.RMIConnectionImpl" />
-        <exec program="rmic" commandline="${ARGS} -v1.2 -iiop -standardPackage javax.management.remote.rmi.RMIConnectionImpl" />
-        <exec program="rmic" commandline="${ARGS} -v1.2 javax.management.remote.rmi.RMIServerImpl" />
-        <exec program="rmic" commandline="${ARGS} -v1.2 -iiop javax.management.remote.rmi.RMIServerImpl" />
-        <exec program="rmic" commandline="${ARGS} -v1.2 -iiop -standardPackage javax.management.remote.rmi.RMIServerImpl" />
-        <exec program="rmic" commandline="${ARGS} -iiop javax.management.remote.rmi.RMIConnection" />
-        <exec program="rmic" commandline="${ARGS} -iiop -standardPackage javax.management.remote.rmi.RMIConnection" />
-        <exec program="rmic" commandline="${ARGS} -iiop javax.management.remote.rmi.RMIServer" />
-        <exec program="rmic" commandline="${ARGS} -iiop -standardPackage javax.management.remote.rmi.RMIServer" />
-    </target>
-
-    <target name="run-nasgen" depends="classpath">
-        <!-- nasgen doesn't understand the MethodParameters attribute, so we have to recompile the classes it processes without parameters -->
-        <exec program="javac" useruntimeengine="false">
-            <arg value="-XDignore.symbol.file" />
-            <arg value="-g" />
-            <arg value="-nowarn" />
-            <arg value="-implicit:none" />
-            <arg value="-bootclasspath" />
-            <arg path="${CLASSPATH};${OpenJDK.dir}/nashorn/src;../runtime/IKVM.Runtime.jar" />
-            <arg value="${OpenJDK.dir}/nashorn/src/jdk/nashorn/internal/objects/*.java" />
-        </exec>
-        <exec program="java" useruntimeengine="false">
-            <arg line="-cp ${OpenJDK.dir}/nashorn/buildtools/nasgen/src" />
-            <arg value="jdk.nashorn.internal.tools.nasgen.Main" />
-            <arg value="${OpenJDK.dir}/nashorn/src" />
-            <arg value="jdk.nashorn.internal.objects" />
-            <arg value="${OpenJDK.dir}/nashorn/src" />
-        </exec>
-    </target>
-    
-    <target name="vfs">
-        <!-- This file is generated here, but it is added as a resource to IKVM.Runtime.dll, because Ref.Emit on .NET 1.1 doesn't support adding a raw resource. -->
-        <zip zipfile="vfs.zip">
-            <fileset basedir="${OpenJDK.dir}/build/linux-x86_64-normal-server-release/jdk">
-                <include name="lib/calendars.properties" />
-                <include name="lib/logging.properties" />
-                <include name="lib/management/management.properties" />
-                <include name="lib/net.properties" />
-                <include name="lib/psfontj2d.properties" />
-                <include name="lib/sound.properties" />
-                <include name="lib/cmm/*" />
-                <include name="lib/tzdb.dat" />
-                <include name="lib/currency.data" />
-                <include name="lib/security/java.policy" />
-                <include name="lib/security/java.security" />
-                <!--
-                we don't add lib/security/local_policy.jar, because it is the restricted version,
-                instead we'll add a link in vfs from local_policy.jar to US_export_policy.jar
-                (because US_export_policy.jar is unrestricted)
-                -->
-                <include name="lib/security/US_export_policy.jar" />
-            </fileset>
-            <fileset basedir="${OpenJDK.dir}/jdk/src/windows">
-                <include name="lib/flavormap.properties" />
-                <include name="lib/content-types.properties" />
-            </fileset>
-            </zip>
-        </target>
-
-    <target name="resources">
-        <!-- collect the resources in a zip to make it easier to include them in the right assemblies -->
-        <zip zipfile="resources.zip">
-            <fileset basedir="${OpenJDK.dir}/build/linux-x86_64-normal-server-release/jdk/classes">
-                <include name="com/sun/corba/se/impl/orbutil/resources/*.properties" />
-                <include name="com/sun/rowset/*.properties" />
-                <include name="javax/swing/text/html/parser/html32.bdtd" />
-                <include name="sun/rmi/registry/resources/*.properties" />
-                <include name="sun/rmi/server/resources/*.properties" />
-                <include name="sun/text/resources/*IteratorData" />
-                <include name="sun/text/resources/th/*IteratorData_th" />
-                <include name="sun/text/resources/th/thai_dict" />
-            </fileset>
-            <fileset basedir="${OpenJDK.dir}/corba/src/share/classes">
-                <include name="**/*.properties" />
-            </fileset>
-            <fileset basedir="${OpenJDK.dir}/jdk/src/share/classes">
-                <include name="**/*.properties" />
-                <include name="**/*.gif" />
-                <include name="**/*.png" />
-                <include name="**/*.wav" />
-                <include name="com/sun/org/apache/xml/internal/security/resource/config.*" />
-                <include name="com/sun/swing/internal/plaf/**/*" />
-                <include name="javax/swing/text/html/default.css" />
-                <include name="javax/swing/text/rtf/charsets/*.txt" />
-                <include name="sun/text/resources/**/*.icu" />
-            </fileset>
-            <fileset basedir="${OpenJDK.dir}/jaxp/src">
-                <include name="**/*.properties" />
-                <include name="**/*.res" />
-            </fileset>
-            <fileset basedir="${OpenJDK.dir}/jaxws/src/share/jaf_classes">
-                <include name="**/*.properties" />
-            </fileset>
-            <fileset basedir="${OpenJDK.dir}/jaxws/src/share/jaxws_classes">
-                <include name="**/*.properties" />
-                <include name="**/*.xml" />
-            </fileset>
-        </zip>
-    </target>
-
-    <target name="response.gen.txt">
-        <copy file="response.txt" tofile="response.gen.txt" outputencoding="ascii" overwrite="true">
-            <filterchain>
-                <replacetokens>
-                    <token key="OPENJDK" value="${OpenJDK.dir}" />
-                </replacetokens>
-            </filterchain>
-        </copy>
-    </target>
-
-    <target name="MANIFEST.MF">
-        <copy file="MANIFEST.MF.in" tofile="MANIFEST.MF" outputencoding="ascii" overwrite="true">
-            <filterchain>
-                <replacetokens>
-                    <token key="IMPLEMENTATION_VERSION" value="${IMPLEMENTATION_VERSION}" />
-                    <token key="SPECIFICATION_VERSION" value="${SPECIFICATION_VERSION}" />
-                </replacetokens>
-            </filterchain>
-        </copy>
-    </target>
-
-    <target name="nashorn-version">
-        <copy file="resources/nashorn/version.properties.in" tofile="resources/nashorn/version.properties" outputencoding="ascii" overwrite="true">
-            <filterchain>
-                <replacetokens>
-                    <token key="FULL_VERSION" value="${FULL_VERSION}" />
-                    <token key="IMPLEMENTATION_VERSION" value="${IMPLEMENTATION_VERSION}" />
-                </replacetokens>
-            </filterchain>
-        </copy>
-    </target>
-    
-    <target name="core" depends="version response.gen.txt MANIFEST.MF nashorn-version">
-        <copy file="../bin/IKVM.Runtime.dll" todir="." />
-        <copy file="../bin/IKVM.AWT.WinForms.dll" todir="." />
-        <exec program="${project::get-base-directory()}/../bin/ikvmc.exe" useruntimeengine="true">
-            <arg value="-version:${VERSION}" />
-            <arg value="${signoption}" />
-            <arg value="-compressresources" />
-            <arg value="-opt:fields" />
-            <arg value="-strictfinalfieldsemantics" />
-            <arg value="-removeassertions" />
-            <arg value="-target:library" />
-            <arg value="-sharedclassloader" />
-            <arg value="-r:mscorlib.dll" />
-            <arg value="-r:System.dll" />
-            <arg value="-r:System.Core.dll" unless="${SkipSystemCoreDependency}" />
-            <arg value="-r:System.Xml.dll" />
-            <arg value="-r:IKVM.Runtime.dll" />
-            <!-- we already know that the JNI assembly is not available, so suppress the warning -->
-            <arg value="-nowarn:110" />
-            <arg value="-w4" />
-            <arg value="-noparameterreflection" />
-            <arg value="-warnaserror" />
-            <arg value="@response.gen.txt" />
-        </exec>
-        <if test="${property::exists('peverify')}">
-            <exec program="${peverify}" commandline="-nologo IKVM.OpenJDK.Beans.dll" />
-            <exec program="${peverify}" commandline="-nologo IKVM.OpenJDK.Charsets.dll" />
-            <exec program="${peverify}" commandline="-nologo IKVM.OpenJDK.Corba.dll" />
-            <exec program="${peverify}" commandline="-nologo IKVM.OpenJDK.Core.dll" />
-            <exec program="${peverify}" commandline="-nologo IKVM.OpenJDK.Cldrdata.dll" />
-            <exec program="${peverify}" commandline="-nologo IKVM.OpenJDK.Jdbc.dll" />
-            <exec program="${peverify}" commandline="-nologo IKVM.OpenJDK.Localedata.dll" />
-            <exec program="${peverify}" commandline="-nologo IKVM.OpenJDK.Management.dll" />
-            <exec program="${peverify}" commandline="-nologo IKVM.OpenJDK.Media.dll" />
-            <exec program="${peverify}" commandline="-nologo IKVM.OpenJDK.Misc.dll" />
-            <exec program="${peverify}" commandline="-nologo IKVM.OpenJDK.Naming.dll" />
-            <exec program="${peverify}" commandline="-nologo IKVM.OpenJDK.Nashorn.dll" />
-            <exec program="${peverify}" commandline="-nologo IKVM.OpenJDK.Remoting.dll" />
-            <exec program="${peverify}" commandline="-nologo IKVM.OpenJDK.Security.dll" />
-            <exec program="${peverify}" commandline="-nologo IKVM.OpenJDK.SwingAWT.dll" />
-            <exec program="${peverify}" commandline="-nologo IKVM.OpenJDK.Text.dll" />
-            <exec program="${peverify}" commandline="-nologo IKVM.OpenJDK.Util.dll" />
-            <exec program="${peverify}" commandline="-nologo IKVM.OpenJDK.XML.API.dll" />
-            <exec program="${peverify}" commandline="-nologo IKVM.OpenJDK.XML.Bind.dll" />
-            <exec program="${peverify}" commandline="-nologo IKVM.OpenJDK.XML.Crypto.dll" />
-            <exec program="${peverify}" commandline="-nologo IKVM.OpenJDK.XML.Parse.dll" />
-            <exec program="${peverify}" commandline="-nologo IKVM.OpenJDK.XML.Transform.dll" />
-            <exec program="${peverify}" commandline="-nologo IKVM.OpenJDK.XML.WebServices.dll" />
-            <exec program="${peverify}" commandline="-nologo IKVM.OpenJDK.XML.XPath.dll" />
-        </if>
-	<!-- make sure that we haven't accidentally introduced new dependencies -->
-        <exec program="${project::get-base-directory()}/../tools/depcheck.exe" commandline="response.txt dependencies.txt" useruntimeengine="true" />
-        <copy todir="../bin">
-            <fileset basedir=".">
-                <include name="IKVM.OpenJDK.*.dll" />
-            </fileset>
-        </copy>
-        <!-- update base addresses in response.txt for next build -->
-        <exec program="${project::get-base-directory()}/../tools/updbaseaddresses.exe" commandline="response.txt" useruntimeengine="true" />
-
-        <!-- generate stubs for the public Java APIs we expose -->
-        <mkdir dir="../lib" />
-        <exec program="${project::get-base-directory()}/../bin/ikvmstub.exe" useruntimeengine="true">
-            <arg value="-out:../lib/ikvm-api.jar" />
-            <arg value="../bin/IKVM.OpenJDK.Core.dll" />
-            <arg value="-namespace:ikvm.io" />
-            <arg value="-namespace:ikvm.lang" />
-            <arg value="-namespace:ikvm.runtime" />
-        </exec>
-    </target>
-
-    <target name="tools.gen.rsp">
-        <copy file="tools.rsp" tofile="tools.gen.rsp" outputencoding="ascii" overwrite="true">
-            <filterchain>
-                <replacetokens>
-                    <token key="OPENJDK" value="${OpenJDK.dir}" />
-                </replacetokens>
-            </filterchain>
-        </copy>
-    </target>
-
-    <target name="tools" depends="version tools.gen.rsp">
-        <exec program="${project::get-base-directory()}/../bin/ikvmc.exe" useruntimeengine="true">
-            <arg value="-r:mscorlib.dll" />
-            <arg value="-version:${VERSION}" />
-            <arg value="${signoption}" />
-            <arg value="-warnaserror" />
-            <arg value="-w4" />
-            <arg value="-noparameterreflection" />
-            <arg value="@tools.gen.rsp" />
-        </exec>
-    </target>
-
-    <target name="jdk-tools" depends="version">
-        <exec program="${project::get-base-directory()}/../bin/ikvmc.exe" useruntimeengine="true">
-            <arg value="-version:${VERSION}" />
-            <arg value="-out:../bin/javac.exe" />
-            <arg value="-main:com.sun.tools.javac.Main" />
-            <arg value="-r:../bin/IKVM.OpenJDK.Tools.dll" />
-        </exec>
-        <exec program="${project::get-base-directory()}/../bin/ikvmc.exe" useruntimeengine="true">
-            <arg value="-version:${VERSION}" />
-            <arg value="-out:../bin/javah.exe" />
-            <arg value="-main:com.sun.tools.javah.Main" />
-            <arg value="-r:../bin/IKVM.OpenJDK.Tools.dll" />
-        </exec>
-        <exec program="${project::get-base-directory()}/../bin/ikvmc.exe" useruntimeengine="true">
-            <arg value="-version:${VERSION}" />
-            <arg value="-out:../bin/javap.exe" />
-            <arg value="-main:com.sun.tools.javap.Main" />
-            <arg value="-r:../bin/IKVM.OpenJDK.Tools.dll" />
-        </exec>
-        <exec program="${project::get-base-directory()}/../bin/ikvmc.exe" useruntimeengine="true">
-            <arg value="-version:${VERSION}" />
-            <arg value="-out:../bin/jjs.exe" />
-            <arg value="-main:jdk.nashorn.tools.Shell" />
-        </exec>
-    </target>
-
-</project>
diff --git a/openjdk/resources/META-INF/services/java.sql.Driver b/openjdk/resources/META-INF/services/java.sql.Driver
deleted file mode 100644
index 73d549a1..00000000
--- a/openjdk/resources/META-INF/services/java.sql.Driver
+++ /dev/null
@@ -1 +0,0 @@
-sun.jdbc.odbc.JdbcOdbcDriver
diff --git a/openjdk/resources/META-INF/services/sun.java2d.pipe.RenderingEngine b/openjdk/resources/META-INF/services/sun.java2d.pipe.RenderingEngine
deleted file mode 100644
index 607ff590..00000000
--- a/openjdk/resources/META-INF/services/sun.java2d.pipe.RenderingEngine
+++ /dev/null
@@ -1,2 +0,0 @@
-#  Pisces Rendering Engine module
-sun.java2d.pisces.PiscesRenderingEngine
diff --git a/openjdk/response.txt b/openjdk/response.txt
deleted file mode 100644
index 409d55c9..00000000
--- a/openjdk/response.txt
+++ /dev/null
@@ -1,1617 +0,0 @@
-#
-#  Copyright (C) 2002-2014 Jeroen Frijters
-#
-#  This software is provided 'as-is', without any express or implied
-#  warranty.  In no event will the authors be held liable for any damages
-#  arising from the use of this software.
-#
-#  Permission is granted to anyone to use this software for any purpose,
-#  including commercial applications, and to alter it and redistribute it
-#  freely, subject to the following restrictions:
-#
-#  1. The origin of this software must not be misrepresented; you must not
-#     claim that you wrote the original software. If you use this software
-#     in a product, an acknowledgment in the product documentation would be
-#     appreciated but is not required.
-#  2. Altered source versions must be plainly marked as such, and must not be
-#     misrepresented as being the original software.
-#  3. This notice may not be removed or altered from any source distribution.
-#
-#  Jeroen Frijters
-#  jeroen@frijters.net
-#  
-
--assemblyattributes:commonAttributes.class
-{
-    -out:IKVM.OpenJDK.Core.dll
-    -baseaddress:0x56000000
-    -remap:map.xml
-    -assemblyattributes:coreAttributes.class
-    -exclude:exclude.lst
-    -resource:META-INF/MANIFEST.MF=MANIFEST.MF
-    -resource:java/lang/uniName.dat=@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/classes/java/lang/uniName.dat
-    -resource:sun/net/idn/uidna.spp=@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/classes/sun/net/idn/uidna.spp
-    -resource:sun/reflect/misc/Trampoline.class=@OPENJDK@/jdk/src/share/classes/sun/reflect/misc/Trampoline.class
-    -resource:java/lang/invoke/MethodHandleImpl$BindCaller$T.class=@OPENJDK@/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl$BindCaller$T.class
-    -recurse:resources.zip/sun/util/resources/*
-    ikvm/internal/*.class
-    java/io/*.class
-    java/lang/*.class
-    java/lang/ref/*.class
-    java/lang/reflect/*.class
-    java/net/*.class
-    java/nio/*.class
-    java/security/*.class
-    java/util/concurrent/*.class
-    java/util/concurrent/locks/*.class
-    gnu/java/util/*.class
-    sun/misc/*.class
-    sun/net/sdp/*.class
-    sun/net/www/protocol/file/*.class
-    sun/net/www/protocol/ikvmres/*.class
-    sun/net/www/protocol/jar/*.class
-    sun/nio/ch/*.class
-    sun/nio/cs/*.class
-    sun/nio/fs/*.class
-    sun/reflect/*.class
-    sun/reflect/annotation/*.class
-    ../classpath/gnu/java/net/protocol/ikvmres/*.class
-    ../classpath/ikvm/extensions/*.class
-    ../classpath/ikvm/internal/*.class
-    ../classpath/ikvm/io/*.class
-    ../classpath/ikvm/lang/*.class
-    ../classpath/ikvm/runtime/*.class
-    ../classpath/java/util/concurrent/atomic/*.class
-    ../classpath/sun/misc/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/lang/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/channels/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/java/nio/charset/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/locale/provider/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/istack/internal/logging/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/ServerSideException.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/nio/file/*.class
-    @OPENJDK@/jdk/src/share/classes/java/beans/ChangeListenerMap.class
-    @OPENJDK@/jdk/src/share/classes/java/beans/IndexedPropertyChangeEvent.class
-    @OPENJDK@/jdk/src/share/classes/java/beans/PropertyChangeEvent.class
-    @OPENJDK@/jdk/src/share/classes/java/beans/PropertyChangeListener.class
-    @OPENJDK@/jdk/src/share/classes/java/beans/PropertyChangeListenerProxy.class
-    @OPENJDK@/jdk/src/share/classes/java/beans/PropertyChangeSupport*.class
-    @OPENJDK@/jdk/src/share/classes/java/io/*.class
-    @OPENJDK@/jdk/src/share/classes/java/lang/*.class
-    @OPENJDK@/jdk/src/share/classes/java/lang/annotation/*.class
-    @OPENJDK@/jdk/src/share/classes/java/lang/invoke/*.class
-    @OPENJDK@/jdk/src/share/classes/java/lang/ref/*.class
-    @OPENJDK@/jdk/src/share/classes/java/lang/reflect/*.class
-    @OPENJDK@/jdk/src/share/classes/java/math/*.class
-    @OPENJDK@/jdk/src/share/classes/java/net/*.class
-    @OPENJDK@/jdk/src/share/classes/java/nio/*.class
-    @OPENJDK@/jdk/src/share/classes/java/nio/channels/*.class
-    @OPENJDK@/jdk/src/share/classes/java/nio/channels/spi/*.class
-    @OPENJDK@/jdk/src/share/classes/java/nio/charset/*.class
-    @OPENJDK@/jdk/src/share/classes/java/nio/charset/spi/*.class
-    @OPENJDK@/jdk/src/share/classes/java/nio/file/*.class
-    @OPENJDK@/jdk/src/share/classes/java/nio/file/attribute/*.class
-    @OPENJDK@/jdk/src/share/classes/java/nio/file/spi/*.class
-    @OPENJDK@/jdk/src/share/classes/java/security/*.class
-    @OPENJDK@/jdk/src/share/classes/java/security/cert/*.class
-    @OPENJDK@/jdk/src/share/classes/java/sql/Timestamp.class
-    @OPENJDK@/jdk/src/share/classes/java/time/*.class
-    @OPENJDK@/jdk/src/share/classes/java/time/chrono/*.class
-    @OPENJDK@/jdk/src/share/classes/java/time/format/*.class
-    @OPENJDK@/jdk/src/share/classes/java/time/temporal/*.class
-    @OPENJDK@/jdk/src/share/classes/java/time/zone/*.class
-    @OPENJDK@/jdk/src/share/classes/java/util/*.class
-    @OPENJDK@/jdk/src/share/classes/java/util/concurrent/*.class
-    @OPENJDK@/jdk/src/share/classes/java/util/concurrent/atomic/*.class
-    @OPENJDK@/jdk/src/share/classes/java/util/concurrent/locks/*.class
-    @OPENJDK@/jdk/src/share/classes/java/util/function/*.class
-    @OPENJDK@/jdk/src/share/classes/java/util/jar/Attributes*.class
-    @OPENJDK@/jdk/src/share/classes/java/util/jar/Manifest*.class
-    @OPENJDK@/jdk/src/share/classes/java/util/regex/*.class
-    @OPENJDK@/jdk/src/share/classes/java/util/stream/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/net/*.class
-    @OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/*.class
-    @OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/commons/*.class
-    @OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/signature/*.class
-    @OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/*.class
-    @OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/tree/analysis/*.class
-    @OPENJDK@/jdk/src/share/classes/jdk/internal/org/objectweb/asm/util/*.class
-    @OPENJDK@/jdk/src/share/classes/jdk/internal/org/xml/sax/*.class
-    @OPENJDK@/jdk/src/share/classes/jdk/internal/org/xml/sax/helpers/*.class
-    @OPENJDK@/jdk/src/share/classes/jdk/internal/util/xml/*.class
-    @OPENJDK@/jdk/src/share/classes/jdk/internal/util/xml/impl/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/invoke/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/invoke/anon/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/invoke/empty/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/invoke/util/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/misc/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/net/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/net/ftp/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/net/ftp/impl/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/net/idn/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/net/smtp/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/net/spi/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/net/spi/nameservice/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/net/util/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/net/www/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/net/www/content/text/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/net/www/http/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/ftp/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/http/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/http/logging/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/http/spnego/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/jar/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/mailto/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/nio/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/nio/ch/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/nio/cs/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/nio/fs/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/reflect/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/reflect/annotation/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/reflect/generics/factory/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/reflect/generics/parser/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/reflect/generics/repository/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/reflect/generics/scope/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/reflect/generics/tree/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/reflect/generics/visitor/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/reflect/misc/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/action/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/jca/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/provider/ByteArrayAccess.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/provider/DigestBase.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/provider/SHA.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/provider/Sun.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/provider/SunEntries$1.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/provider/SunEntries.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/util/Debug.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/util/PermissionFactory.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/util/PropertyExpander$ExpandException.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/util/PropertyExpander.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/util/SecurityConstants*.class
-    @OPENJDK@/jdk/src/share/classes/sun/util/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/util/cldr/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/util/locale/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/util/locale/provider/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/util/logging/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/util/spi/*.class
-    @OPENJDK@/jdk/src/solaris/classes/java/io/*.class
-    @OPENJDK@/jdk/src/solaris/classes/sun/net/www/protocol/http/ntlm/*.class
-    @OPENJDK@/jdk/src/windows/classes/java/io/*.class
-    @OPENJDK@/jdk/src/windows/classes/java/lang/*.class
-    @OPENJDK@/jdk/src/windows/classes/java/net/DefaultInterface.class
-    @OPENJDK@/jdk/src/windows/classes/sun/net/*.class
-    @OPENJDK@/jdk/src/windows/classes/sun/nio/ch/*.class
-    @OPENJDK@/jdk/src/windows/classes/sun/nio/fs/*.class
-    @OPENJDK@/jdk/src/windows/classes/sun/security/provider/NativePRNG.class
-    @OPENJDK@/jdk/src/windows/classes/sun/util/locale/provider/*.class
-    @OPENJDK@/langtools/src/share/classes/jdk/Exported.class
-}
-{
-    -out:IKVM.OpenJDK.Corba.dll
-    -baseaddress:0x57320000
-    -recurse:resources.zip/com/sun/corba/*
-    -recurse:resources.zip/com/sun/jndi/cosnaming/jndiprovider.properties
-    -resource:com/sun/corba/se/impl/logging/LogStrings.properties=@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/classes/com/sun/corba/se/impl/logging/LogStrings.properties
-    @OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/InitialNameServicePackage/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/LocatorPackage/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/com/sun/corba/se/spi/activation/RepositoryPackage/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CORBA/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextExtPackage/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/CosNaming/NamingContextPackage/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/Dynamic/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynAnyFactoryPackage/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/DynamicAny/DynAnyPackage/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/CodecFactoryPackage/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/IOP/CodecPackage/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/Messaging/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableInterceptor/ORBInitInfoPackage/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/CurrentPackage/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAManagerPackage/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/corba/gensrc/org/omg/PortableServer/POAPackage/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/impsrc/com/sun/corba/se/impl/logging/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/activation/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/copyobject/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/corba/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/encoding/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/interceptors/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/io/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/javax/rmi/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/legacy/connection/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/monitoring/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/namingutil/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/naming/pcosnaming/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/poa/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/oa/toa/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orb/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/closure/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/concurrent/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/fsm/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/graph/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/resolver/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/transport/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/impl/util/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/internal/corba/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/internal/CosNaming/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/internal/iiop/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/internal/Interceptors/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/internal/POA/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/org/omg/CORBA/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/broker/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/encoding/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/protocol/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/pept/transport/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/copyobject/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/encoding/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/extension/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/ior/iiop/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/legacy/connection/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/legacy/interceptor/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/logging/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/monitoring/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/oa/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orb/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/closure/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/orbutil/threadpool/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/presentation/rmi/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/protocol/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/resolver/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/servicecontext/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/corba/se/spi/transport/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/portable/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/org/omg/CORBA/ValueDefPackage/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/org/omg/SendingContext/*.class
-    @OPENJDK@/corba/src/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/*.class
-    @OPENJDK@/corba/src/share/classes/javax/activity/*.class
-    @OPENJDK@/corba/src/share/classes/javax/rmi/*.class
-    @OPENJDK@/corba/src/share/classes/javax/rmi/CORBA/*.class
-    @OPENJDK@/corba/src/share/classes/javax/transaction/*.class
-    @OPENJDK@/corba/src/share/classes/javax/transaction/xa/*.class
-    @OPENJDK@/corba/src/share/classes/org/omg/CORBA/*.class
-    @OPENJDK@/corba/src/share/classes/org/omg/CORBA/DynAnyPackage/*.class
-    @OPENJDK@/corba/src/share/classes/org/omg/CORBA/ORBPackage/*.class
-    @OPENJDK@/corba/src/share/classes/org/omg/CORBA/portable/*.class
-    @OPENJDK@/corba/src/share/classes/org/omg/CORBA/TypeCodePackage/*.class
-    @OPENJDK@/corba/src/share/classes/org/omg/CORBA_2_3/*.class
-    @OPENJDK@/corba/src/share/classes/org/omg/CORBA_2_3/portable/*.class
-    @OPENJDK@/corba/src/share/classes/org/omg/CosNaming/*.class
-    @OPENJDK@/corba/src/share/classes/org/omg/PortableServer/*.class
-    @OPENJDK@/corba/src/share/classes/org/omg/PortableServer/portable/*.class
-    @OPENJDK@/corba/src/share/classes/org/omg/PortableServer/ServantLocatorPackage/*.class
-    @OPENJDK@/corba/src/share/classes/org/omg/SendingContext/*.class
-    @OPENJDK@/corba/src/share/classes/org/omg/stub/java/rmi/*.class
-    @OPENJDK@/corba/src/share/classes/sun/corba/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/jndi/cosnaming/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/jndi/toolkit/corba/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/jndi/url/corbaname/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/jndi/url/iiop/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/jndi/url/iiopname/*.class
-}
-{
-    -out:IKVM.OpenJDK.XML.API.dll
-    -baseaddress:0x57950000
-    -resource:META-INF/services/sun.util.spi.XmlPropertiesProvider=@OPENJDK@/jdk/src/share/classes/sun/util/xml/META-INF/services/sun.util.spi.XmlPropertiesProvider
-    @OPENJDK@/jaxp/src/javax/xml/*.class
-    @OPENJDK@/jaxp/src/javax/xml/datatype/*.class
-    @OPENJDK@/jaxp/src/javax/xml/namespace/*.class
-    @OPENJDK@/jaxp/src/javax/xml/parsers/*.class
-    @OPENJDK@/jaxp/src/javax/xml/stream/*.class
-    @OPENJDK@/jaxp/src/javax/xml/stream/events/*.class
-    @OPENJDK@/jaxp/src/javax/xml/stream/util/*.class
-    @OPENJDK@/jaxp/src/javax/xml/transform/*.class
-    @OPENJDK@/jaxp/src/javax/xml/transform/dom/*.class
-    @OPENJDK@/jaxp/src/javax/xml/transform/sax/*.class
-    @OPENJDK@/jaxp/src/javax/xml/transform/stax/*.class
-    @OPENJDK@/jaxp/src/javax/xml/transform/stream/*.class
-    @OPENJDK@/jaxp/src/javax/xml/validation/*.class
-    @OPENJDK@/jaxp/src/javax/xml/xpath/*.class
-    @OPENJDK@/jaxp/src/org/w3c/dom/*.class
-    @OPENJDK@/jaxp/src/org/w3c/dom/bootstrap/*.class
-    @OPENJDK@/jaxp/src/org/w3c/dom/css/*.class
-    @OPENJDK@/jaxp/src/org/w3c/dom/events/*.class
-    @OPENJDK@/jaxp/src/org/w3c/dom/html/*.class
-    @OPENJDK@/jaxp/src/org/w3c/dom/ls/*.class
-    @OPENJDK@/jaxp/src/org/w3c/dom/ranges/*.class
-    @OPENJDK@/jaxp/src/org/w3c/dom/stylesheets/*.class
-    @OPENJDK@/jaxp/src/org/w3c/dom/traversal/*.class
-    @OPENJDK@/jaxp/src/org/w3c/dom/views/*.class
-    @OPENJDK@/jaxp/src/org/w3c/dom/xpath/*.class
-    @OPENJDK@/jaxp/src/org/xml/sax/*.class
-    @OPENJDK@/jaxp/src/org/xml/sax/ext/*.class
-    @OPENJDK@/jaxp/src/org/xml/sax/helpers/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/java/browser/dom/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/util/xml/*.class
-}
-{
-    -out:IKVM.OpenJDK.XML.XPath.dll
-    -baseaddress:0x57A10000
-    -recurse:resources.zip/com/sun/org/apache/xalan/internal/res/*
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/extensions/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/res/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/AttList.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/DOMHelper.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/DOM2Helper.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/TreeWalker.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/axes/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/compiler/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/domapi/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/functions/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/jaxp/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/objects/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/operations/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/patterns/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xpath/internal/res/*.class
-}
-{
-    -out:IKVM.OpenJDK.XML.Parse.dll
-    -baseaddress:0x57D70000
-    -recurse:resources.zip/com/sun/org/apache/xerces/*
-    -recurse:resources.zip/com/sun/org/apache/xml/internal/*
-    @OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/util/SecuritySupport.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/util/SecuritySupport$*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/utils/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/dom/events/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dtd/models/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/util/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/dv/xs/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/io/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/validation/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/identity/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/opti/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/util/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/datatype/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/parsers/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/util/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/utils/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xinclude/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/grammars/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xpointer/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xerces/internal/xs/datatypes/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/res/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/helpers/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/resolver/tools/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serialize/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/serializer/utils/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xml/internal/utils/res/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/*.class
-    @OPENJDK@/jaxp/src/com/sun/xml/internal/stream/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/*.class
-    @OPENJDK@/jaxp/src/com/sun/xml/internal/stream/dtd/*.class
-    @OPENJDK@/jaxp/src/com/sun/xml/internal/stream/dtd/nonvalidating/*.class
-    @OPENJDK@/jaxp/src/com/sun/xml/internal/stream/events/*.class
-    @OPENJDK@/jaxp/src/com/sun/xml/internal/stream/util/*.class
-    @OPENJDK@/jaxp/src/com/sun/xml/internal/stream/writers/*.class
-}
-{
-    -out:IKVM.OpenJDK.XML.Transform.dll
-    -baseaddress:0x58580000
-    @OPENJDK@/jaxp/src/com/sun/java_cup/internal/runtime/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/classfile/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/generic/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/bcel/internal/util/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/regexp/internal/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/lib/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/templates/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xslt/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/output/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/*.class
-    @OPENJDK@/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/util/*.class
-}
-{
-    -out:IKVM.OpenJDK.XML.Bind.dll
-    -baseaddress:0x589D0000
-    -recurse:resources.zip/javax/xml/bind/*
-    -recurse:resources.zip/com/sun/xml/internal/bind/*
-    -recurse:resources.zip/com/sun/xml/internal/fastinfoset/*
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/istack/internal/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/annotation/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/impl/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/util/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/bytecode/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/util/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/episode/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/alphabet/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/dom/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/factory/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/util/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/vocab/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/annotation/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/attachment/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/helpers/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/bind/util/*.class
-}
-{
-    -out:IKVM.OpenJDK.XML.WebServices.dll
-    -baseaddress:0x58DF0000
-    -recurse:resources.zip/com/sun/xml/internal/messaging/*
-    -recurse:resources.zip/com/sun/xml/internal/ws/*
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/databinding/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/api/message/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/impl/encoding/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/webservices/internal/impl/internalspi/encoding/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal/webservices/jaxws_databinding/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/istack/internal/localization/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/arc/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/annotations/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/util/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/name/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/transform/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/model/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/policy/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/v200408/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/client/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/config/management/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/config/management/policy/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/fastinfoset/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ha/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/handler/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/saaj/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/stream/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/soap/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/editable/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/helper/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/subject/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/writer/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/dev/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/binding/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/commons/xmlutil/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/config/management/policy/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/config/metro/dev/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/config/metro/util/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/db/glassfish/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/dump/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/streaming/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/xml/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/saaj/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/source/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/soap/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/spi/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/protocol/soap/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/protocol/xml/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/runtime/config/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/client/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/pipe/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/http/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/soap/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/handler/soap/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/http/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/soap/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/spi/http/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/javax/xml/ws/wsaddressing/*.class
-}
-{
-    -out:IKVM.OpenJDK.XML.Crypto.dll
-    -baseaddress:0x59600000
-    @OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/reference/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/xml/crypto/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dom/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/dom/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/keyinfo/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/xml/crypto/dsig/spec/*.class
-    @OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/*.class
-    @OPENJDK@/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/*.class
-}
-{
-    -out:IKVM.OpenJDK.SwingAWT.dll
-    -baseaddress:0x59780000
-    -remap:swingawt.xml
-    -resource:META-INF/services/sun.java2d.pipe.RenderingEngine=resources/META-INF/services/sun.java2d.pipe.RenderingEngine
-    -resource:META-INF/services/sun.java2d.cmm.CMMServiceProvider=@OPENJDK@/jdk/src/share/classes/sun/java2d/cmm/lcms/META-INF/services/sun.java2d.cmm.CMMServiceProvider
-    -recurse:resources.zip/com/sun/java/swing/*
-    -recurse:resources.zip/com/sun/swing/internal/plaf/*
-    -recurse:resources.zip/javax/swing/*
-    -r:System.Drawing.dll
-    -r:IKVM.AWT.WinForms.dll
-    ikvm/awt/*.class
-    java/awt/*.class
-    java/awt/color/*.class
-    java/awt/image/*.class
-    gnu/java/awt/*.class
-    gnu/java/awt/color/*.class
-    sun/awt/*.class
-    sun/awt/image/*.class
-    sun/awt/shell/*.class
-    sun/font/*.class
-    sun/java2d/*.class
-    sun/java2d/cmm/lcms/*.class
-    sun/java2d/pipe/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/accessibility/internal/resources/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/java/swing/plaf/motif/resources/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/java/swing/plaf/windows/resources/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/basic/resources/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/metal/resources/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/com/sun/swing/internal/plaf/synth/resources/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/javax/swing/plaf/nimbus/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/awt/resources/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/awt/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/java/swing/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/motif/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/nimbus/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/java/swing/plaf/windows/*.class
-    @OPENJDK@/jdk/src/share/classes/java/applet/*.class
-    @OPENJDK@/jdk/src/share/classes/java/awt/*.class
-    @OPENJDK@/jdk/src/share/classes/java/awt/color/*.class
-    @OPENJDK@/jdk/src/share/classes/java/awt/datatransfer/*.class
-    @OPENJDK@/jdk/src/share/classes/java/awt/dnd/*.class
-    @OPENJDK@/jdk/src/share/classes/java/awt/dnd/peer/*.class
-    @OPENJDK@/jdk/src/share/classes/java/awt/event/*.class
-    @OPENJDK@/jdk/src/share/classes/java/awt/font/*.class
-    @OPENJDK@/jdk/src/share/classes/java/awt/geom/*.class
-    @OPENJDK@/jdk/src/share/classes/java/awt/im/*.class
-    @OPENJDK@/jdk/src/share/classes/java/awt/im/spi/*.class
-    @OPENJDK@/jdk/src/share/classes/java/awt/image/*.class
-    @OPENJDK@/jdk/src/share/classes/java/awt/image/renderable/*.class
-    @OPENJDK@/jdk/src/share/classes/java/awt/peer/*.class
-    @OPENJDK@/jdk/src/share/classes/java/awt/print/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/accessibility/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/swing/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/swing/border/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/swing/colorchooser/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/swing/event/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/swing/filechooser/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/swing/plaf/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/swing/plaf/basic/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/swing/plaf/metal/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/swing/plaf/multi/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/swing/plaf/nimbus/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/swing/plaf/synth/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/swing/table/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/swing/text/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/swing/text/html/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/swing/text/html/parser/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/swing/text/rtf/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/swing/tree/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/swing/undo/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/applet/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/awt/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/awt/datatransfer/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/awt/dnd/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/awt/event/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/awt/geom/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/awt/im/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/awt/image/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/awt/shell/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/awt/util/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/font/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/java2d/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/java2d/cmm/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/java2d/cmm/lcms/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/java2d/pipe/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/java2d/pipe/hw/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/java2d/pisces/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/net/www/content/image/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/swing/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/swing/icon/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/swing/plaf/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/swing/plaf/synth/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/swing/plaf/windows/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/swing/table/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/swing/text/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/swing/text/html/*.class
-    @OPENJDK@/jdk/src/solaris/classes/sun/awt/windows/*.class
-    @OPENJDK@/jdk/src/windows/classes/sun/awt/*.class
-}
-{
-    -out:IKVM.OpenJDK.Charsets.dll
-    -baseaddress:0x5A9B0000
-    -resource:sun/nio/cs/ext/sjis0213.dat=@OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/sjis0213.dat
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/nio/cs/ext/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/nio/cs/ext/*.class
-}
-{
-    -out:IKVM.OpenJDK.Util.dll
-    -baseaddress:0x5AEC0000
-    -recurse:resources.zip/com/sun/java/util/jar/pack/intrinsic.properties
-    -recurse:resources.zip/sun/launcher/resources/*
-    -resource:META-INF/services/java.nio.file.spi.FileSystemProvider=@OPENJDK@/jdk/src/share/demo/nio/zipfs/src/META-INF/services/java.nio.file.spi.FileSystemProvider
-    com/sun/java/util/jar/pack/*.class
-    java/util/zip/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/logging/resources/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/en/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/java/browser/net/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/java/util/jar/pack/*.class
-    @OPENJDK@/jdk/src/share/classes/java/util/jar/*.class
-    @OPENJDK@/jdk/src/share/classes/java/util/logging/*.class
-    @OPENJDK@/jdk/src/share/classes/java/util/prefs/*.class
-    @OPENJDK@/jdk/src/share/classes/java/util/spi/*.class
-    @OPENJDK@/jdk/src/share/classes/java/util/zip/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/launcher/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/util/calendar/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/util/resources/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/util/resources/en/*.class
-    @OPENJDK@/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/*.class
-    @OPENJDK@/jdk/src/solaris/classes/java/util/prefs/*.class
-    @OPENJDK@/jdk/src/windows/classes/java/util/prefs/*.class
-}
-{
-    -out:IKVM.OpenJDK.Text.dll
-    -baseaddress:0x5B190000
-    -recurse:resources.zip/sun/text/resources/*
-    @OPENJDK@/jdk/src/share/classes/java/text/*.class
-    @OPENJDK@/jdk/src/share/classes/java/text/spi/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/bidi/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/normalizer/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/en/*.class
-}
-{
-    -out:IKVM.OpenJDK.Security.dll
-    -baseaddress:0x5B340000
-    -remap:security.xml
-    sun/security/jgss/wrapper/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/security/util/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/crypto/provider/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/net/ssl/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/net/ssl/internal/ssl/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/security/auth/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/security/auth/callback/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/security/auth/login/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/security/auth/module/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/security/cert/internal/x509/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/security/jgss/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/security/ntlm/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/security/sasl/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/security/sasl/digest/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/security/sasl/gsskerb/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/security/sasl/ntlm/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/security/sasl/util/*.class
-    @OPENJDK@/jdk/src/share/classes/java/security/acl/*.class
-    @OPENJDK@/jdk/src/share/classes/java/security/interfaces/*.class
-    @OPENJDK@/jdk/src/share/classes/java/security/spec/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/crypto/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/crypto/interfaces/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/crypto/spec/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/net/ssl/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/security/auth/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/security/auth/callback/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/security/auth/kerberos/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/security/auth/login/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/security/auth/spi/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/security/auth/x500/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/security/cert/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/security/sasl/*.class
-    @OPENJDK@/jdk/src/share/classes/org/ietf/jgss/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/http/ntlm/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/https/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/acl/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/internal/interfaces/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/internal/spec/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/jgss/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/jgss/krb5/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/jgss/spi/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/jgss/spnego/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/krb5/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/ccache/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/crypto/dk/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/ktab/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/rcache/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/krb5/internal/util/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/pkcs/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/pkcs10/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/pkcs12/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/provider/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/ldap/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/provider/certpath/ssl/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/rsa/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/ssl/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/ssl/krb5/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/timestamp/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/tools/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/tools/keytool/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/util/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/validator/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/security/x509/*.class
-    @OPENJDK@/jdk/src/windows/classes/sun/security/krb5/internal/tools/*.class
-    @OPENJDK@/jdk/src/windows/classes/sun/security/provider/*.class
-}
-{
-    -out:IKVM.OpenJDK.Management.dll
-    -baseaddress:0x5BB80000
-    java/lang/management/*.class
-    sun/management/*.class
-    rmistubs/org/omg/stub/javax/management/remote/rmi/*.class
-    rmistubs/javax/management/remote/rmi/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/management/resources/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/jmx/defaults/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/jmx/interceptor/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/jmx/mbeanserver/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/internal/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/protocol/iiop/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/protocol/rmi/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/security/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/jmx/remote/util/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/management/*.class
-    @OPENJDK@/jdk/src/share/classes/java/lang/management/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/management/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/management/loading/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/management/modelmbean/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/management/monitor/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/management/openmbean/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/management/relation/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/management/remote/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/management/remote/rmi/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/management/timer/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/management/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/management/counter/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/management/counter/perf/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/management/jdp/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/management/jmxremote/*.class
-    @OPENJDK@/jdk/src/windows/classes/sun/management/*.class
-}
-{
-    -out:IKVM.OpenJDK.Misc.dll
-    -baseaddress:0x5BF10000
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/misc/resources/*.class
-    @OPENJDK@/corba/src/share/classes/javax/activity/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/javax/annotation/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/javax/jws/*.class
-    @OPENJDK@/jaxws/src/share/jaxws_classes/javax/jws/soap/*.class
-    @OPENJDK@/corba/src/share/classes/javax/transaction/*.class
-    @OPENJDK@/corba/src/share/classes/javax/transaction/xa/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/net/httpserver/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/net/httpserver/spi/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/pept/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/pept/encoding/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/pept/ept/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/pept/presentation/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/pept/protocol/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/pept/transport/*.class
-    @OPENJDK@/jdk/src/share/classes/java/lang/instrument/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/script/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/smartcardio/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/misc/resources/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/net/httpserver/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/net/www/protocol/netdoc/*.class
-    @OPENJDK@/langtools/src/share/classes/javax/annotation/processing/*.class
-    @OPENJDK@/langtools/src/share/classes/javax/lang/model/*.class
-    @OPENJDK@/langtools/src/share/classes/javax/lang/model/element/*.class
-    @OPENJDK@/langtools/src/share/classes/javax/lang/model/type/*.class
-    @OPENJDK@/langtools/src/share/classes/javax/lang/model/util/*.class
-    @OPENJDK@/langtools/src/share/classes/javax/tools/*.class
-}
-{
-    -out:IKVM.OpenJDK.Naming.dll
-    -baseaddress:0x5BFD0000
-    -recurse:resources.zip/com/sun/jndi/ldap/jndiprovider.properties
-    -resource:META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor=@OPENJDK@/jdk/src/share/classes/sun/net/spi/nameservice/dns/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
-    sun/net/dns/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/jndi/dns/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/ext/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/pool/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/jndi/ldap/sasl/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/jndi/toolkit/ctx/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/jndi/toolkit/dir/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/jndi/toolkit/url/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/jndi/url/dns/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/jndi/url/ldap/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/jndi/url/ldaps/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/naming/internal/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/naming/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/naming/directory/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/naming/event/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/naming/ldap/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/naming/spi/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/net/dns/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/net/spi/nameservice/dns/*.class
-}
-{
-    -out:IKVM.OpenJDK.Jdbc.dll
-    -baseaddress:0x5C150000
-    -resource:META-INF/services/java.sql.Driver=resources/META-INF/services/java.sql.Driver
-    -recurse:resources.zip/com/sun/rowset/*
-    -recurse:resources.zip/javax/sql/*
-    -r:System.Data.dll
-    sun/jdbc/odbc/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/rowset/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/rowset/internal/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/rowset/providers/*.class
-    @OPENJDK@/jdk/src/share/classes/java/sql/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/sql/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/sql/rowset/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/sql/rowset/serial/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/sql/rowset/spi/*.class
-}
-{
-    -out:IKVM.OpenJDK.Remoting.dll
-    -baseaddress:0x5C2D0000
-    -recurse:resources.zip/sun/rmi/*
-    rmistubs/com/sun/jndi/rmi/registry/*.class
-    rmistubs/java/rmi/activation/*.class
-    rmistubs/sun/rmi/registry/*.class
-    rmistubs/sun/rmi/server/*.class
-    rmistubs/sun/rmi/transport/*.class
-    @OPENJDK@/jdk/src/share/classes/java/rmi/*.class
-    @OPENJDK@/jdk/src/share/classes/java/rmi/activation/*.class
-    @OPENJDK@/jdk/src/share/classes/java/rmi/dgc/*.class
-    @OPENJDK@/jdk/src/share/classes/java/rmi/registry/*.class
-    @OPENJDK@/jdk/src/share/classes/java/rmi/server/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/rmi/ssl/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/jndi/rmi/registry/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/jndi/url/rmi/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/rmi/rmid/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/rmi/log/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/rmi/registry/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/rmi/runtime/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/rmi/server/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/rmi/transport/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/rmi/transport/proxy/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/rmi/transport/tcp/*.class
-}
-{
-    -out:IKVM.OpenJDK.Beans.dll
-    -baseaddress:0x5C3F0000
-    -resource:META-INF/mailcap.default=@OPENJDK@/jaxws/src/share/jaf_classes/META-INF/mailcap.default
-    -resource:META-INF/mimetypes.default=@OPENJDK@/jaxws/src/share/jaf_classes/META-INF/mimetypes.default
-    @OPENJDK@/jaxws/src/share/jaf_classes/com/sun/activation/registries/*.class
-    @OPENJDK@/jaxws/src/share/jaf_classes/javax/activation/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/beans/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/beans/decoder/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/beans/editors/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/beans/finder/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/beans/infos/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/beans/util/*.class
-    @OPENJDK@/jdk/src/share/classes/java/beans/*.class
-    @OPENJDK@/jdk/src/share/classes/java/beans/beancontext/*.class
-}
-{
-    -out:IKVM.OpenJDK.Media.dll
-    -baseaddress:0x5C4E0000
-    -resource:META-INF/services/javax.print.PrintServiceLookup=@OPENJDK@/jdk/src/windows/classes/sun/print/services/javax.print.PrintServiceLookup
-    -resource:META-INF/services/javax.print.StreamPrintServiceFactory=@OPENJDK@/jdk/src/windows/classes/sun/print/services/javax.print.StreamPrintServiceFactory
-    -resource:META-INF/services/javax.sound.midi.spi.MidiDeviceProvider=@OPENJDK@/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider
-    -resource:META-INF/services/javax.sound.midi.spi.MidiFileReader=@OPENJDK@/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileReader
-    -resource:META-INF/services/javax.sound.midi.spi.MidiFileWriter=@OPENJDK@/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileWriter
-    -resource:META-INF/services/javax.sound.midi.spi.SoundbankReader=@OPENJDK@/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader
-    -resource:META-INF/services/javax.sound.sampled.spi.AudioFileReader=@OPENJDK@/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader
-    -resource:META-INF/services/javax.sound.sampled.spi.AudioFileWriter=@OPENJDK@/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileWriter
-    -resource:META-INF/services/javax.sound.sampled.spi.FormatConversionProvider=@OPENJDK@/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider
-    -resource:META-INF/services/javax.sound.sampled.spi.MixerProvider=@OPENJDK@/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider
-    -recurse:resources.zip/com/sun/imageio/plugins/common/iio-plugin.properties
-    -r:System.Drawing.dll
-    com/sun/imageio/plugins/jpeg/*.class
-    icedtea/rt/com/sun/media/sound/*.class
-    sun/print/*.class
-    sun/awt/windows/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/print/resources/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/bmp/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/common/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/gif/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/png/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/imageio/plugins/wbmp/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/imageio/spi/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/imageio/stream/*.class
-    @OPENJDK@/jdk/src/share/classes/com/sun/media/sound/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/imageio/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/imageio/event/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/imageio/metadata/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/imageio/plugins/bmp/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/imageio/plugins/jpeg/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/imageio/spi/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/imageio/stream/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/print/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/print/attribute/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/print/attribute/standard/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/print/event/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/sound/midi/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/sound/midi/spi/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/sound/sampled/*.class
-    @OPENJDK@/jdk/src/share/classes/javax/sound/sampled/spi/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/print/*.class
-    @OPENJDK@/jdk/src/windows/classes/sun/print/*.class
-}
-{
-    -out:IKVM.OpenJDK.Nashorn.dll
-    -baseaddress:0x5C750000
-    -resource:META-INF/services/javax.script.ScriptEngineFactory=@OPENJDK@/nashorn/src/META-INF/services/javax.script.ScriptEngineFactory
-    -resource:jdk/nashorn/internal/runtime/resources/version.properties=resources/nashorn/version.properties
-    -recurse:@OPENJDK@/nashorn/src/*.js
-    -recurse:@OPENJDK@/nashorn/src/*.properties
-    @OPENJDK@/nashorn/src/jdk/internal/dynalink/*.class
-    @OPENJDK@/nashorn/src/jdk/internal/dynalink/beans/*.class
-    @OPENJDK@/nashorn/src/jdk/internal/dynalink/linker/*.class
-    @OPENJDK@/nashorn/src/jdk/internal/dynalink/support/*.class
-    @OPENJDK@/nashorn/src/jdk/nashorn/api/scripting/*.class
-    @OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/*.class
-    @OPENJDK@/nashorn/src/jdk/nashorn/internal/codegen/types/*.class
-    @OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/*.class
-    @OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/annotations/*.class
-    @OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/debug/*.class
-    @OPENJDK@/nashorn/src/jdk/nashorn/internal/ir/visitor/*.class
-    @OPENJDK@/nashorn/src/jdk/nashorn/internal/lookup/*.class
-    @OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/*.class
-    @OPENJDK@/nashorn/src/jdk/nashorn/internal/objects/annotations/*.class
-    @OPENJDK@/nashorn/src/jdk/nashorn/internal/parser/*.class
-    @OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/*.class
-    @OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/arrays/*.class
-    @OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/linker/*.class
-    @OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/options/*.class
-    @OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/*.class
-    @OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/*.class
-    @OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/*.class
-    @OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/*.class
-    @OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/*.class
-    @OPENJDK@/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/*.class
-    @OPENJDK@/nashorn/src/jdk/nashorn/internal/scripts/*.class
-    @OPENJDK@/nashorn/src/jdk/nashorn/tools/*.class
-}
-{
-    -out:IKVM.OpenJDK.Localedata.dll
-    -baseaddress:0x5CBA0000
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ar/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/be/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/bg/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ca/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cs/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/da/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/de/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/el/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/es/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/et/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/fi/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/fr/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ga/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/hi/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/hr/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/hu/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/in/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/is/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/it/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/iw/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ja/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ko/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/lt/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/lv/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/mk/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ms/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/mt/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/nl/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/no/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/pl/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/pt/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ro/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/ru/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sk/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sl/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sq/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sr/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/sv/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/th/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/tr/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/uk/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/vi/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/zh/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/ar/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/be/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/bg/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/ca/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/cs/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/da/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/de/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/el/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/es/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/et/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/fi/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/fr/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/ga/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/hi/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/hr/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/hu/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/in/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/is/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/it/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/iw/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/ja/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/ko/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/lt/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/lv/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/mk/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/ms/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/mt/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/nl/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/no/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/pl/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/pt/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/ro/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/ru/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/sk/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/sl/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/sq/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/sr/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/sv/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/th/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/tr/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/uk/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/vi/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/text/resources/zh/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/util/resources/de/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/util/resources/es/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/util/resources/fr/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/util/resources/hi/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/util/resources/it/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/util/resources/ja/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/util/resources/ko/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/util/resources/pt/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/util/resources/sv/*.class
-    @OPENJDK@/jdk/src/share/classes/sun/util/resources/zh/*.class
-}
-{
-    -out:IKVM.OpenJDK.Cldrdata.dll
-    -baseaddress:0x5D080000
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/aa/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/af/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/agq/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ak/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/am/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ar/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/as/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/asa/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/az/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/bas/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/be/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/bem/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/bez/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/bg/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/bm/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/bn/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/bo/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/br/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/brx/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/bs/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/byn/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ca/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/cgg/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/chr/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/cs/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/cy/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/da/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/dav/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/de/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/dje/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/dua/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/dyo/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/dz/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ebu/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ee/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/el/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/en/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/eo/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/es/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/et/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/eu/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ewo/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/fa/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ff/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/fi/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/fil/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/fo/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/fr/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/fur/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ga/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/gd/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/gl/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/gsw/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/gu/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/guz/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/gv/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ha/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/haw/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/he/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/hi/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/hr/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/hu/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/hy/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ia/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/id/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ig/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ii/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/is/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/it/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ja/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/jmc/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ka/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/kab/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/kam/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/kde/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/kea/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/khq/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ki/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/kk/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/kl/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/kln/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/km/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/kn/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ko/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/kok/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ksb/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ksf/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ksh/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/kw/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/lag/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/lg/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ln/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/lo/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/lt/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/lu/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/luo/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/luy/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/lv/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/mas/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/mer/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/mfe/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/mg/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/mgh/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/mk/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ml/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/mr/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ms/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/mt/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/mua/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/my/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/naq/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/nb/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/nd/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ne/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/nl/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/nmg/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/nn/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/nr/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/nso/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/nus/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/nyn/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/om/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/or/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/pa/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/pl/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ps/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/pt/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/rm/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/rn/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ro/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/rof/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ru/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/rw/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/rwk/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/saq/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/sbp/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/se/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/seh/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ses/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/sg/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/shi/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/si/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/sk/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/sl/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/sn/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/so/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/sq/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/sr/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ss/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ssy/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/st/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/sv/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/sw/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/swc/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ta/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/te/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/teo/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/th/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ti/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/tig/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/tn/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/to/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/tr/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ts/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/twq/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/tzm/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/uk/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ur/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/uz/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/vai/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/ve/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/vi/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/vun/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/wae/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/wal/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/xh/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/xog/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/yav/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/yo/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/zh/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/text/resources/cldr/zu/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/cldr/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/aa/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/af/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/agq/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ak/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/am/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ar/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/as/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/asa/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/az/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bas/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/be/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bem/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bez/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bg/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bm/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bn/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bo/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/br/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/brx/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/bs/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/byn/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ca/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/cgg/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/chr/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/cs/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/cy/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/da/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/dav/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/de/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/dje/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/dua/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/dyo/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/dz/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ebu/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ee/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/el/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/en/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/eo/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/es/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/et/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/eu/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ewo/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fa/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ff/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fi/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fil/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fo/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fr/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/fur/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ga/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/gd/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/gl/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/gsw/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/gu/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/guz/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/gv/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ha/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/haw/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/he/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/hi/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/hr/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/hu/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/hy/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/id/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ig/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ii/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/is/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/it/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ja/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/jmc/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ka/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kab/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kam/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kde/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kea/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/khq/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ki/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kk/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kl/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kln/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/km/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kn/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ko/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kok/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ksb/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ksf/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ksh/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/kw/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/lag/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/lg/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ln/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/lo/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/lt/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/lu/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/luo/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/luy/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/lv/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mas/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mer/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mfe/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mg/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mgh/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mk/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ml/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mr/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ms/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mt/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/mua/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/my/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/naq/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nb/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nd/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ne/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nl/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nmg/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nn/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nr/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nso/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nus/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/nyn/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/om/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/or/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pa/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pl/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ps/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/pt/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/rm/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/rn/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ro/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/rof/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ru/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/rw/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/rwk/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sah/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/saq/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sbp/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/se/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/seh/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ses/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sg/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/shi/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/si/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sk/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sl/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sn/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/so/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sq/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sr/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ss/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ssy/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/st/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sv/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/sw/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/swc/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ta/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/te/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/teo/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/tg/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/th/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ti/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/tig/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/tn/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/to/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/tr/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ts/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/twq/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/tzm/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/uk/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ur/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/uz/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/vai/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/ve/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/vi/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/vun/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/wae/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/wal/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/xh/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/xog/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/yav/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/yo/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/zh/*.class
-    @OPENJDK@/build/linux-x86_64-normal-server-release/jdk/gensrc/sun/util/resources/cldr/zu/*.class
-}
diff --git a/openjdk/security.xml b/openjdk/security.xml
deleted file mode 100644
index 7807a738..00000000
--- a/openjdk/security.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
-  Copyright (C) 2011 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
--->
-<root>
-    <assembly>
-        <class name="sun.security.provider.SeedGenerator">
-            <method name="getSystemEntropy" sig="()[B">
-                <prologue>
-                    <exceptionBlock>
-                        <try>
-                            <ldc_i4 value="20" />
-                            <newarr sig="B" />
-                            <stloc name="buf" class="[B" />
-                            <newobj class="cli.System.Security.Cryptography.RNGCryptoServiceProvider" name="&lt;init&gt;" sig="()V" />
-                            <ldloc name="buf" />
-                            <callvirt type="System.Security.Cryptography.RandomNumberGenerator" name="GetBytes" sig="([B)V" />
-                            <leave name="return" />
-                        </try>
-                        <catch type="System.Security.Cryptography.CryptographicException">
-                            <leave name="continue" />
-                        </catch>
-                    </exceptionBlock>
-                    <label name="return" />
-                    <ldloc name="buf" />
-                    <ret />
-                    <label name="continue" />
-                </prologue>
-            </method>
-        </class>
-    </assembly>
-</root>
diff --git a/openjdk/sun/awt/AppContext.java b/openjdk/sun/awt/AppContext.java
deleted file mode 100644
index 23c86c90..00000000
--- a/openjdk/sun/awt/AppContext.java
+++ /dev/null
@@ -1,868 +0,0 @@
-/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.awt;
-
-import java.awt.EventQueue;
-import java.awt.Window;
-import java.awt.SystemTray;
-import java.awt.TrayIcon;
-import java.awt.Toolkit;
-import java.awt.GraphicsEnvironment;
-import java.awt.event.InvocationEvent;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.IdentityHashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.HashSet;
-import java.beans.PropertyChangeSupport;
-import java.beans.PropertyChangeListener;
-import sun.util.logging.PlatformLogger;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * The AppContext is a table referenced by ThreadGroup which stores
- * application service instances.  (If you are not writing an application
- * service, or don't know what one is, please do not use this class.)
- * The AppContext allows applet access to what would otherwise be
- * potentially dangerous services, such as the ability to peek at
- * EventQueues or change the look-and-feel of a Swing application.<p>
- *
- * Most application services use a singleton object to provide their
- * services, either as a default (such as getSystemEventQueue or
- * getDefaultToolkit) or as static methods with class data (System).
- * The AppContext works with the former method by extending the concept
- * of "default" to be ThreadGroup-specific.  Application services
- * lookup their singleton in the AppContext.<p>
- *
- * For example, here we have a Foo service, with its pre-AppContext
- * code:<p>
- * <code><pre>
- *    public class Foo {
- *        private static Foo defaultFoo = new Foo();
- *
- *        public static Foo getDefaultFoo() {
- *            return defaultFoo;
- *        }
- *
- *    ... Foo service methods
- *    }</pre></code><p>
- *
- * The problem with the above is that the Foo service is global in scope,
- * so that applets and other untrusted code can execute methods on the
- * single, shared Foo instance.  The Foo service therefore either needs
- * to block its use by untrusted code using a SecurityManager test, or
- * restrict its capabilities so that it doesn't matter if untrusted code
- * executes it.<p>
- *
- * Here's the Foo class written to use the AppContext:<p>
- * <code><pre>
- *    public class Foo {
- *        public static Foo getDefaultFoo() {
- *            Foo foo = (Foo)AppContext.getAppContext().get(Foo.class);
- *            if (foo == null) {
- *                foo = new Foo();
- *                getAppContext().put(Foo.class, foo);
- *            }
- *            return foo;
- *        }
- *
- *    ... Foo service methods
- *    }</pre></code><p>
- *
- * Since a separate AppContext can exist for each ThreadGroup, trusted
- * and untrusted code have access to different Foo instances.  This allows
- * untrusted code access to "system-wide" services -- the service remains
- * within the AppContext "sandbox".  For example, say a malicious applet
- * wants to peek all of the key events on the EventQueue to listen for
- * passwords; if separate EventQueues are used for each ThreadGroup
- * using AppContexts, the only key events that applet will be able to
- * listen to are its own.  A more reasonable applet request would be to
- * change the Swing default look-and-feel; with that default stored in
- * an AppContext, the applet's look-and-feel will change without
- * disrupting other applets or potentially the browser itself.<p>
- *
- * Because the AppContext is a facility for safely extending application
- * service support to applets, none of its methods may be blocked by a
- * a SecurityManager check in a valid Java implementation.  Applets may
- * therefore safely invoke any of its methods without worry of being
- * blocked.
- *
- * Note: If a SecurityManager is installed which derives from
- * sun.awt.AWTSecurityManager, it may override the
- * AWTSecurityManager.getAppContext() method to return the proper
- * AppContext based on the execution context, in the case where
- * the default ThreadGroup-based AppContext indexing would return
- * the main "system" AppContext.  For example, in an applet situation,
- * if a system thread calls into an applet, rather than returning the
- * main "system" AppContext (the one corresponding to the system thread),
- * an installed AWTSecurityManager may return the applet's AppContext
- * based on the execution context.
- *
- * @author  Thomas Ball
- * @author  Fred Ecks
- */
-public final class AppContext {
-    private static final PlatformLogger log = PlatformLogger.getLogger("sun.awt.AppContext");
-
-    /* Since the contents of an AppContext are unique to each Java
-     * session, this class should never be serialized. */
-
-    /*
-     * The key to put()/get() the Java EventQueue into/from the AppContext.
-     */
-    public static final Object EVENT_QUEUE_KEY = new StringBuffer("EventQueue");
-
-    /*
-     * The keys to store EventQueue push/pop lock and condition.
-     */
-    public final static Object EVENT_QUEUE_LOCK_KEY = new StringBuilder("EventQueue.Lock");
-    public final static Object EVENT_QUEUE_COND_KEY = new StringBuilder("EventQueue.Condition");
-
-    /* A map of AppContexts, referenced by ThreadGroup.
-     */
-    private static final Map<ThreadGroup, AppContext> threadGroup2appContext =
-            Collections.synchronizedMap(new IdentityHashMap<ThreadGroup, AppContext>());
-
-    /**
-     * Returns a set containing all <code>AppContext</code>s.
-     */
-    public static Set<AppContext> getAppContexts() {
-        synchronized (threadGroup2appContext) {
-            return new HashSet<AppContext>(threadGroup2appContext.values());
-        }
-    }
-
-    /* The main "system" AppContext, used by everything not otherwise
-       contained in another AppContext. It is implicitly created for
-       standalone apps only (i.e. not applets)
-    */
-    private static volatile AppContext mainAppContext = null;
-
-    /*
-     * The hash map associated with this AppContext.  A private delegate
-     * is used instead of subclassing HashMap so as to avoid all of
-     * HashMap's potentially risky methods, such as clear(), elements(),
-     * putAll(), etc.
-     */
-    private final HashMap table = new HashMap();
-
-    private final ThreadGroup threadGroup;
-
-    /**
-     * If any <code>PropertyChangeListeners</code> have been registered,
-     * the <code>changeSupport</code> field describes them.
-     *
-     * @see #addPropertyChangeListener
-     * @see #removePropertyChangeListener
-     * @see #firePropertyChange
-     */
-    private PropertyChangeSupport changeSupport = null;
-
-    public static final String DISPOSED_PROPERTY_NAME = "disposed";
-    public static final String GUI_DISPOSED = "guidisposed";
-
-    private enum State {
-        VALID,
-        BEING_DISPOSED,
-        DISPOSED
-    };
-
-    private volatile State state = State.VALID;
-
-    public boolean isDisposed() {
-        return state == State.DISPOSED;
-    }
-
-    /*
-     * The total number of AppContexts, system-wide.  This number is
-     * incremented at the beginning of the constructor, and decremented
-     * at the end of dispose().  getAppContext() checks to see if this
-     * number is 1.  If so, it returns the sole AppContext without
-     * checking Thread.currentThread().
-     */
-    private static final AtomicInteger numAppContexts = new AtomicInteger(0);
-
-    /*
-     * The context ClassLoader that was used to create this AppContext.
-     */
-    private final ClassLoader contextClassLoader;
-
-    /**
-     * Constructor for AppContext.  This method is <i>not</i> public,
-     * nor should it ever be used as such.  The proper way to construct
-     * an AppContext is through the use of SunToolkit.createNewAppContext.
-     * A ThreadGroup is created for the new AppContext, a Thread is
-     * created within that ThreadGroup, and that Thread calls
-     * SunToolkit.createNewAppContext before calling anything else.
-     * That creates both the new AppContext and its EventQueue.
-     *
-     * @param   threadGroup     The ThreadGroup for the new AppContext
-     * @see     sun.awt.SunToolkit
-     * @since   1.2
-     */
-    AppContext(ThreadGroup threadGroup) {
-        numAppContexts.incrementAndGet();
-
-        this.threadGroup = threadGroup;
-        threadGroup2appContext.put(threadGroup, this);
-
-        this.contextClassLoader =
-             AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
-                    public ClassLoader run() {
-                        return Thread.currentThread().getContextClassLoader();
-                    }
-                });
-
-        // Initialize push/pop lock and its condition to be used by all the
-        // EventQueues within this AppContext
-        Lock eventQueuePushPopLock = new ReentrantLock();
-        put(EVENT_QUEUE_LOCK_KEY, eventQueuePushPopLock);
-        Condition eventQueuePushPopCond = eventQueuePushPopLock.newCondition();
-        put(EVENT_QUEUE_COND_KEY, eventQueuePushPopCond);
-    }
-
-    private static final ThreadLocal<AppContext> threadAppContext =
-            new ThreadLocal<AppContext>();
-
-    private final static void initMainAppContext() {
-        // On the main Thread, we get the ThreadGroup, make a corresponding
-        // AppContext, and instantiate the Java EventQueue.  This way, legacy
-        // code is unaffected by the move to multiple AppContext ability.
-        AccessController.doPrivileged(new PrivilegedAction<Void>() {
-            public Void run() {
-                ThreadGroup currentThreadGroup =
-                        Thread.currentThread().getThreadGroup();
-                ThreadGroup parentThreadGroup = currentThreadGroup.getParent();
-                while (parentThreadGroup != null) {
-                    // Find the root ThreadGroup to construct our main AppContext
-                    currentThreadGroup = parentThreadGroup;
-                    parentThreadGroup = currentThreadGroup.getParent();
-                }
-
-                mainAppContext = SunToolkit.createNewAppContext(currentThreadGroup);
-                return null;
-            }
-        });
-    }
-
-    /**
-     * Returns the appropriate AppContext for the caller,
-     * as determined by its ThreadGroup.  If the main "system" AppContext
-     * would be returned and there's an AWTSecurityManager installed, it
-     * is called to get the proper AppContext based on the execution
-     * context.
-     *
-     * @return  the AppContext for the caller.
-     * @see     java.lang.ThreadGroup
-     * @since   1.2
-     */
-    public final static AppContext getAppContext() {
-        // we are standalone app, return the main app context
-        if (numAppContexts.get() == 1 && mainAppContext != null) {
-            return mainAppContext;
-        }
-
-        AppContext appContext = threadAppContext.get();
-
-        if (null == appContext) {
-            appContext = AccessController.doPrivileged(new PrivilegedAction<AppContext>()
-            {
-                public AppContext run() {
-                    // Get the current ThreadGroup, and look for it and its
-                    // parents in the hash from ThreadGroup to AppContext --
-                    // it should be found, because we use createNewContext()
-                    // when new AppContext objects are created.
-                    ThreadGroup currentThreadGroup = Thread.currentThread().getThreadGroup();
-                    ThreadGroup threadGroup = currentThreadGroup;
-
-                    // Special case: we implicitly create the main app context
-                    // if no contexts have been created yet. This covers standalone apps
-                    // and excludes applets because by the time applet starts
-                    // a number of contexts have already been created by the plugin.
-                    if (numAppContexts.get() == 0) {
-                        // This check is not necessary, its purpose is to help
-                        // Plugin devs to catch all the cases of main AC creation.
-                        if (System.getProperty("javaplugin.version") == null &&
-                                System.getProperty("javawebstart.version") == null) {
-                            initMainAppContext();
-                        }
-                    }
-
-                    AppContext context = threadGroup2appContext.get(threadGroup);
-                    while (context == null) {
-                        threadGroup = threadGroup.getParent();
-                        if (threadGroup == null) {
-                            return null;
-                        }
-                        context = threadGroup2appContext.get(threadGroup);
-                    }
-
-                    // In case we did anything in the above while loop, we add
-                    // all the intermediate ThreadGroups to threadGroup2appContext
-                    // so we won't spin again.
-                    for (ThreadGroup tg = currentThreadGroup; tg != threadGroup; tg = tg.getParent()) {
-                        threadGroup2appContext.put(tg, context);
-                    }
-
-                    // Now we're done, so we cache the latest key/value pair.
-                    threadAppContext.set(context);
-
-                    return context;
-                }
-            });
-        }
-
-        return appContext;
-    }
-
-    /**
-     * Returns true if the specified AppContext is the main AppContext.
-     *
-     * @param   ctx the context to compare with the main context
-     * @return  true if the specified AppContext is the main AppContext.
-     * @since   1.8
-     */
-    public final static boolean isMainContext(AppContext ctx) {
-        return (ctx != null && ctx == mainAppContext);
-    }
-
-    private final static AppContext getExecutionAppContext() {
-        SecurityManager securityManager = System.getSecurityManager();
-        if ((securityManager != null) &&
-            (securityManager instanceof AWTSecurityManager))
-        {
-            AWTSecurityManager awtSecMgr = (AWTSecurityManager) securityManager;
-            AppContext secAppContext = awtSecMgr.getAppContext();
-            return secAppContext; // Return what we're told
-        }
-        return null;
-    }
-
-    private long DISPOSAL_TIMEOUT = 5000;  // Default to 5-second timeout
-                                           // for disposal of all Frames
-                                           // (we wait for this time twice,
-                                           // once for dispose(), and once
-                                           // to clear the EventQueue).
-
-    private long THREAD_INTERRUPT_TIMEOUT = 1000;
-                            // Default to 1-second timeout for all
-                            // interrupted Threads to exit, and another
-                            // 1 second for all stopped Threads to die.
-
-    /**
-     * Disposes of this AppContext, all of its top-level Frames, and
-     * all Threads and ThreadGroups contained within it.
-     *
-     * This method must be called from a Thread which is not contained
-     * within this AppContext.
-     *
-     * @exception  IllegalThreadStateException  if the current thread is
-     *                                    contained within this AppContext
-     * @since      1.2
-     */
-    public void dispose() throws IllegalThreadStateException {
-        // Check to be sure that the current Thread isn't in this AppContext
-        if (this.threadGroup.parentOf(Thread.currentThread().getThreadGroup())) {
-            throw new IllegalThreadStateException(
-                "Current Thread is contained within AppContext to be disposed."
-              );
-        }
-
-        synchronized(this) {
-            if (this.state != State.VALID) {
-                return; // If already disposed or being disposed, bail.
-            }
-
-            this.state = State.BEING_DISPOSED;
-        }
-
-        final PropertyChangeSupport changeSupport = this.changeSupport;
-        if (changeSupport != null) {
-            changeSupport.firePropertyChange(DISPOSED_PROPERTY_NAME, false, true);
-        }
-
-        // First, we post an InvocationEvent to be run on the
-        // EventDispatchThread which disposes of all top-level Frames and TrayIcons
-
-        final Object notificationLock = new Object();
-
-        Runnable runnable = new Runnable() {
-            public void run() {
-                Window[] windowsToDispose = Window.getOwnerlessWindows();
-                for (Window w : windowsToDispose) {
-                    try {
-                        w.dispose();
-                    } catch (Throwable t) {
-                        log.finer("exception occured while disposing app context", t);
-                    }
-                }
-                AccessController.doPrivileged(new PrivilegedAction() {
-                        public Object run() {
-                            if (!GraphicsEnvironment.isHeadless() && SystemTray.isSupported())
-                            {
-                                SystemTray systemTray = SystemTray.getSystemTray();
-                                TrayIcon[] trayIconsToDispose = systemTray.getTrayIcons();
-                                for (TrayIcon ti : trayIconsToDispose) {
-                                    systemTray.remove(ti);
-                                }
-                            }
-                            return null;
-                        }
-                    });
-                // Alert PropertyChangeListeners that the GUI has been disposed.
-                if (changeSupport != null) {
-                    changeSupport.firePropertyChange(GUI_DISPOSED, false, true);
-                }
-                synchronized(notificationLock) {
-                    notificationLock.notifyAll(); // Notify caller that we're done
-                }
-            }
-        };
-        synchronized(notificationLock) {
-            SunToolkit.postEvent(this,
-                new InvocationEvent(Toolkit.getDefaultToolkit(), runnable));
-            try {
-                notificationLock.wait(DISPOSAL_TIMEOUT);
-            } catch (InterruptedException e) { }
-        }
-
-        // Next, we post another InvocationEvent to the end of the
-        // EventQueue.  When it's executed, we know we've executed all
-        // events in the queue.
-
-        runnable = new Runnable() { public void run() {
-            synchronized(notificationLock) {
-                notificationLock.notifyAll(); // Notify caller that we're done
-            }
-        } };
-        synchronized(notificationLock) {
-            SunToolkit.postEvent(this,
-                new InvocationEvent(Toolkit.getDefaultToolkit(), runnable));
-            try {
-                notificationLock.wait(DISPOSAL_TIMEOUT);
-            } catch (InterruptedException e) { }
-        }
-
-        // We are done with posting events, so change the state to disposed
-        synchronized(this) {
-            this.state = State.DISPOSED;
-        }
-
-        // Next, we interrupt all Threads in the ThreadGroup
-        this.threadGroup.interrupt();
-            // Note, the EventDispatchThread we've interrupted may dump an
-            // InterruptedException to the console here.  This needs to be
-            // fixed in the EventDispatchThread, not here.
-
-        // Next, we sleep 10ms at a time, waiting for all of the active
-        // Threads in the ThreadGroup to exit.
-
-        long startTime = System.currentTimeMillis();
-        long endTime = startTime + THREAD_INTERRUPT_TIMEOUT;
-        while ((this.threadGroup.activeCount() > 0) &&
-               (System.currentTimeMillis() < endTime)) {
-            try {
-                Thread.sleep(10);
-            } catch (InterruptedException e) { }
-        }
-
-        // Then, we stop any remaining Threads
-        this.threadGroup.stop();
-
-        // Next, we sleep 10ms at a time, waiting for all of the active
-        // Threads in the ThreadGroup to die.
-
-        startTime = System.currentTimeMillis();
-        endTime = startTime + THREAD_INTERRUPT_TIMEOUT;
-        while ((this.threadGroup.activeCount() > 0) &&
-               (System.currentTimeMillis() < endTime)) {
-            try {
-                Thread.sleep(10);
-            } catch (InterruptedException e) { }
-        }
-
-        // Next, we remove this and all subThreadGroups from threadGroup2appContext
-        int numSubGroups = this.threadGroup.activeGroupCount();
-        if (numSubGroups > 0) {
-            ThreadGroup [] subGroups = new ThreadGroup[numSubGroups];
-            numSubGroups = this.threadGroup.enumerate(subGroups);
-            for (int subGroup = 0; subGroup < numSubGroups; subGroup++) {
-                threadGroup2appContext.remove(subGroups[subGroup]);
-            }
-        }
-        threadGroup2appContext.remove(this.threadGroup);
-
-        threadAppContext.set(null);
-
-        // Finally, we destroy the ThreadGroup entirely.
-        try {
-            this.threadGroup.destroy();
-        } catch (IllegalThreadStateException e) {
-            // Fired if not all the Threads died, ignore it and proceed
-        }
-
-        synchronized (table) {
-            this.table.clear(); // Clear out the Hashtable to ease garbage collection
-        }
-
-        numAppContexts.decrementAndGet();
-
-        mostRecentKeyValue = null;
-    }
-
-    static final class PostShutdownEventRunnable implements Runnable {
-        private final AppContext appContext;
-
-        public PostShutdownEventRunnable(AppContext ac) {
-            appContext = ac;
-        }
-
-        public void run() {
-            final EventQueue eq = (EventQueue)appContext.get(EVENT_QUEUE_KEY);
-            if (eq != null) {
-                eq.postEvent(AWTAutoShutdown.getShutdownEvent());
-            }
-        }
-    }
-
-    static final class CreateThreadAction implements PrivilegedAction {
-        private final AppContext appContext;
-        private final Runnable runnable;
-
-        public CreateThreadAction(AppContext ac, Runnable r) {
-            appContext = ac;
-            runnable = r;
-        }
-
-        public Object run() {
-            Thread t = new Thread(appContext.getThreadGroup(), runnable);
-            t.setContextClassLoader(appContext.getContextClassLoader());
-            t.setPriority(Thread.NORM_PRIORITY + 1);
-            t.setDaemon(true);
-            return t;
-        }
-    }
-
-    static void stopEventDispatchThreads() {
-        for (AppContext appContext: getAppContexts()) {
-            if (appContext.isDisposed()) {
-                continue;
-            }
-            Runnable r = new PostShutdownEventRunnable(appContext);
-            // For security reasons EventQueue.postEvent should only be called
-            // on a thread that belongs to the corresponding thread group.
-            if (appContext != AppContext.getAppContext()) {
-                // Create a thread that belongs to the thread group associated
-                // with the AppContext and invokes EventQueue.postEvent.
-                PrivilegedAction action = new CreateThreadAction(appContext, r);
-                Thread thread = (Thread)AccessController.doPrivileged(action);
-                thread.start();
-            } else {
-                r.run();
-            }
-        }
-    }
-
-    private MostRecentKeyValue mostRecentKeyValue = null;
-    private MostRecentKeyValue shadowMostRecentKeyValue = null;
-
-    /**
-     * Returns the value to which the specified key is mapped in this context.
-     *
-     * @param   key   a key in the AppContext.
-     * @return  the value to which the key is mapped in this AppContext;
-     *          <code>null</code> if the key is not mapped to any value.
-     * @see     #put(Object, Object)
-     * @since   1.2
-     */
-    public Object get(Object key) {
-        /*
-         * The most recent reference should be updated inside a synchronized
-         * block to avoid a race when put() and get() are executed in
-         * parallel on different threads.
-         */
-        synchronized (table) {
-            // Note: this most recent key/value caching is thread-hot.
-            // A simple test using SwingSet found that 72% of lookups
-            // were matched using the most recent key/value.  By instantiating
-            // a simple MostRecentKeyValue object on cache misses, the
-            // cache hits can be processed without synchronization.
-
-            MostRecentKeyValue recent = mostRecentKeyValue;
-            if ((recent != null) && (recent.key == key)) {
-                return recent.value;
-            }
-
-            Object value = table.get(key);
-            if(mostRecentKeyValue == null) {
-                mostRecentKeyValue = new MostRecentKeyValue(key, value);
-                shadowMostRecentKeyValue = new MostRecentKeyValue(key, value);
-            } else {
-                MostRecentKeyValue auxKeyValue = mostRecentKeyValue;
-                shadowMostRecentKeyValue.setPair(key, value);
-                mostRecentKeyValue = shadowMostRecentKeyValue;
-                shadowMostRecentKeyValue = auxKeyValue;
-            }
-            return value;
-        }
-    }
-
-    /**
-     * Maps the specified <code>key</code> to the specified
-     * <code>value</code> in this AppContext.  Neither the key nor the
-     * value can be <code>null</code>.
-     * <p>
-     * The value can be retrieved by calling the <code>get</code> method
-     * with a key that is equal to the original key.
-     *
-     * @param      key     the AppContext key.
-     * @param      value   the value.
-     * @return     the previous value of the specified key in this
-     *             AppContext, or <code>null</code> if it did not have one.
-     * @exception  NullPointerException  if the key or value is
-     *               <code>null</code>.
-     * @see     #get(Object)
-     * @since   1.2
-     */
-    public Object put(Object key, Object value) {
-        synchronized (table) {
-            MostRecentKeyValue recent = mostRecentKeyValue;
-            if ((recent != null) && (recent.key == key))
-                recent.value = value;
-            return table.put(key, value);
-        }
-    }
-
-    /**
-     * Removes the key (and its corresponding value) from this
-     * AppContext. This method does nothing if the key is not in the
-     * AppContext.
-     *
-     * @param   key   the key that needs to be removed.
-     * @return  the value to which the key had been mapped in this AppContext,
-     *          or <code>null</code> if the key did not have a mapping.
-     * @since   1.2
-     */
-    public Object remove(Object key) {
-        synchronized (table) {
-            MostRecentKeyValue recent = mostRecentKeyValue;
-            if ((recent != null) && (recent.key == key))
-                recent.value = null;
-            return table.remove(key);
-        }
-    }
-
-    /**
-     * Returns the root ThreadGroup for all Threads contained within
-     * this AppContext.
-     * @since   1.2
-     */
-    public ThreadGroup getThreadGroup() {
-        return threadGroup;
-    }
-
-    /**
-     * Returns the context ClassLoader that was used to create this
-     * AppContext.
-     *
-     * @see java.lang.Thread#getContextClassLoader
-     */
-    public ClassLoader getContextClassLoader() {
-        return contextClassLoader;
-    }
-
-    /**
-     * Returns a string representation of this AppContext.
-     * @since   1.2
-     */
-    @Override
-    public String toString() {
-        return getClass().getName() + "[threadGroup=" + threadGroup.getName() + "]";
-    }
-
-    /**
-     * Returns an array of all the property change listeners
-     * registered on this component.
-     *
-     * @return all of this component's <code>PropertyChangeListener</code>s
-     *         or an empty array if no property change
-     *         listeners are currently registered
-     *
-     * @see      #addPropertyChangeListener
-     * @see      #removePropertyChangeListener
-     * @see      #getPropertyChangeListeners(java.lang.String)
-     * @see      java.beans.PropertyChangeSupport#getPropertyChangeListeners
-     * @since    1.4
-     */
-    public synchronized PropertyChangeListener[] getPropertyChangeListeners() {
-        if (changeSupport == null) {
-            return new PropertyChangeListener[0];
-        }
-        return changeSupport.getPropertyChangeListeners();
-    }
-
-    /**
-     * Adds a PropertyChangeListener to the listener list for a specific
-     * property. The specified property may be one of the following:
-     * <ul>
-     *    <li>if this AppContext is disposed ("disposed")</li>
-     * </ul>
-     * <ul>
-     *    <li>if this AppContext's unowned Windows have been disposed
-     *    ("guidisposed").  Code to cleanup after the GUI is disposed
-     *    (such as LookAndFeel.uninitialize()) should execute in response to
-     *    this property being fired.  Notifications for the "guidisposed"
-     *    property are sent on the event dispatch thread.</li>
-     * </ul>
-     * <p>
-     * If listener is null, no exception is thrown and no action is performed.
-     *
-     * @param propertyName one of the property names listed above
-     * @param listener the PropertyChangeListener to be added
-     *
-     * @see #removePropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener)
-     * @see #getPropertyChangeListeners(java.lang.String)
-     * @see #addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener)
-     */
-    public synchronized void addPropertyChangeListener(
-                             String propertyName,
-                             PropertyChangeListener listener) {
-        if (listener == null) {
-            return;
-        }
-        if (changeSupport == null) {
-            changeSupport = new PropertyChangeSupport(this);
-        }
-        changeSupport.addPropertyChangeListener(propertyName, listener);
-    }
-
-    /**
-     * Removes a PropertyChangeListener from the listener list for a specific
-     * property. This method should be used to remove PropertyChangeListeners
-     * that were registered for a specific bound property.
-     * <p>
-     * If listener is null, no exception is thrown and no action is performed.
-     *
-     * @param propertyName a valid property name
-     * @param listener the PropertyChangeListener to be removed
-     *
-     * @see #addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener)
-     * @see #getPropertyChangeListeners(java.lang.String)
-     * @see #removePropertyChangeListener(java.beans.PropertyChangeListener)
-     */
-    public synchronized void removePropertyChangeListener(
-                             String propertyName,
-                             PropertyChangeListener listener) {
-        if (listener == null || changeSupport == null) {
-            return;
-        }
-        changeSupport.removePropertyChangeListener(propertyName, listener);
-    }
-
-    /**
-     * Returns an array of all the listeners which have been associated
-     * with the named property.
-     *
-     * @return all of the <code>PropertyChangeListeners</code> associated with
-     *         the named property or an empty array if no listeners have
-     *         been added
-     *
-     * @see #addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener)
-     * @see #removePropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener)
-     * @see #getPropertyChangeListeners
-     * @since 1.4
-     */
-    public synchronized PropertyChangeListener[] getPropertyChangeListeners(
-                                                        String propertyName) {
-        if (changeSupport == null) {
-            return new PropertyChangeListener[0];
-        }
-        return changeSupport.getPropertyChangeListeners(propertyName);
-    }
-
-    // Set up JavaAWTAccess in SharedSecrets
-    static {
-        sun.misc.SharedSecrets.setJavaAWTAccess(new sun.misc.JavaAWTAccess() {
-            public Object get(Object key) {
-                AppContext ac = getAppContext();
-                return (ac == null) ? null : ac.get(key);
-            }
-            public void put(Object key, Object value) {
-                AppContext ac = getAppContext();
-                if (ac != null) {
-                    ac.put(key, value);
-                }
-            }
-            public void remove(Object key) {
-                AppContext ac = getAppContext();
-                if (ac != null) {
-                    ac.remove(key);
-                }
-            }
-            public boolean isDisposed() {
-                AppContext ac = getAppContext();
-                return (ac == null) ? true : ac.isDisposed();
-            }
-            public boolean isMainAppContext() {
-                return (numAppContexts.get() == 1 && mainAppContext != null);
-            }
-            public Object getContext() {
-                return getAppContext();
-            }
-            public Object getExecutionContext() {
-                return getExecutionAppContext();
-            }
-            public Object get(Object context, Object key) {
-                return ((AppContext)context).get(key);
-            }
-            public void put(Object context, Object key, Object value) {
-                ((AppContext)context).put(key, value);
-            }
-            public void remove(Object context, Object key) {
-                ((AppContext)context).remove(key);
-            }
-        });
-    }
-}
-
-final class MostRecentKeyValue {
-    Object key;
-    Object value;
-    MostRecentKeyValue(Object k, Object v) {
-        key = k;
-        value = v;
-    }
-    void setPair(Object k, Object v) {
-        key = k;
-        value = v;
-    }
-}
diff --git a/openjdk/sun/awt/EmbeddedFrame.java b/openjdk/sun/awt/EmbeddedFrame.java
deleted file mode 100644
index ac350852..00000000
--- a/openjdk/sun/awt/EmbeddedFrame.java
+++ /dev/null
@@ -1,590 +0,0 @@
-/*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.awt;
-
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.image.*;
-import java.awt.peer.*;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Field;
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeEvent;
-import java.util.Set;
-import java.awt.AWTKeyStroke;
-import java.applet.Applet;
-
-/**
- * A generic container used for embedding Java components, usually applets.
- * An EmbeddedFrame has two related uses:
- *
- * . Within a Java-based application, an EmbeddedFrame serves as a sort of
- *   firewall, preventing the contained components or applets from using
- *   getParent() to find parent components, such as menubars.
- *
- * . Within a C-based application, an EmbeddedFrame contains a window handle
- *   which was created by the application, which serves as the top-level
- *   Java window.  EmbeddedFrames created for this purpose are passed-in a
- *   handle of an existing window created by the application.  The window
- *   handle should be of the appropriate native type for a specific
- *   platform, as stored in the pData field of the ComponentPeer.
- *
- * @author      Thomas Ball
- */
-public abstract class EmbeddedFrame extends Frame
-                          implements KeyEventDispatcher, PropertyChangeListener {
-
-    private boolean isCursorAllowed = true;
-    private static Field fieldPeer;
-    private static Field currentCycleRoot;
-    private boolean supportsXEmbed = false;
-    private KeyboardFocusManager appletKFM;
-    // JDK 1.1 compatibility
-    private static final long serialVersionUID = 2967042741780317130L;
-
-    // Use these in traverseOut method to determine directions
-    protected static final boolean FORWARD = true;
-    protected static final boolean BACKWARD = false;
-
-    public boolean supportsXEmbed() {
-        return supportsXEmbed && SunToolkit.needsXEmbed();
-    }
-
-    protected EmbeddedFrame(boolean supportsXEmbed) {
-        this((long)0, supportsXEmbed);
-    }
-
-
-    protected EmbeddedFrame() {
-        this((long)0);
-    }
-
-    /**
-     * @deprecated This constructor will be removed in 1.5
-     */
-    @Deprecated
-    protected EmbeddedFrame(int handle) {
-        this((long)handle);
-    }
-
-    protected EmbeddedFrame(long handle) {
-        this(handle, false);
-    }
-
-    protected EmbeddedFrame(long handle, boolean supportsXEmbed) {
-        this.supportsXEmbed = supportsXEmbed;
-        registerListeners();
-    }
-
-    /**
-     * Block introspection of a parent window by this child.
-     */
-    public Container getParent() {
-        return null;
-    }
-
-    /**
-     * Needed to track which KeyboardFocusManager is current. We want to avoid memory
-     * leaks, so when KFM stops being current, we remove ourselves as listeners.
-     */
-    public void propertyChange(PropertyChangeEvent evt) {
-        // We don't handle any other properties. Skip it.
-        if (!evt.getPropertyName().equals("managingFocus")) {
-            return;
-        }
-
-        // We only do it if it stops being current. Technically, we should
-        // never get an event about KFM starting being current.
-        if (evt.getNewValue() == Boolean.TRUE) {
-            return;
-        }
-
-        // should be the same as appletKFM
-        removeTraversingOutListeners((KeyboardFocusManager)evt.getSource());
-
-        appletKFM = KeyboardFocusManager.getCurrentKeyboardFocusManager();
-        if (isVisible()) {
-            addTraversingOutListeners(appletKFM);
-        }
-    }
-
-    /**
-     * Register us as KeyEventDispatcher and property "managingFocus" listeners.
-     */
-    private void addTraversingOutListeners(KeyboardFocusManager kfm) {
-        kfm.addKeyEventDispatcher(this);
-        kfm.addPropertyChangeListener("managingFocus", this);
-    }
-
-    /**
-     * Deregister us as KeyEventDispatcher and property "managingFocus" listeners.
-     */
-    private void removeTraversingOutListeners(KeyboardFocusManager kfm) {
-        kfm.removeKeyEventDispatcher(this);
-        kfm.removePropertyChangeListener("managingFocus", this);
-    }
-
-    /**
-     * Because there may be many AppContexts, and we can't be sure where this
-     * EmbeddedFrame is first created or shown, we can't automatically determine
-     * the correct KeyboardFocusManager to attach to as KeyEventDispatcher.
-     * Those who want to use the functionality of traversing out of the EmbeddedFrame
-     * must call this method on the Applet's AppContext. After that, all the changes
-     * can be handled automatically, including possible replacement of
-     * KeyboardFocusManager.
-     */
-    public void registerListeners() {
-        if (appletKFM != null) {
-            removeTraversingOutListeners(appletKFM);
-        }
-        appletKFM = KeyboardFocusManager.getCurrentKeyboardFocusManager();
-        if (isVisible()) {
-            addTraversingOutListeners(appletKFM);
-        }
-    }
-
-    /**
-     * Needed to avoid memory leak: we register this EmbeddedFrame as a listener with
-     * KeyboardFocusManager of applet's AppContext. We don't want the KFM to keep
-     * reference to our EmbeddedFrame forever if the Frame is no longer in use, so we
-     * add listeners in show() and remove them in hide().
-     */
-    public void show() {
-        if (appletKFM != null) {
-            addTraversingOutListeners(appletKFM);
-        }
-        super.show();
-    }
-
-    /**
-     * Needed to avoid memory leak: we register this EmbeddedFrame as a listener with
-     * KeyboardFocusManager of applet's AppContext. We don't want the KFM to keep
-     * reference to our EmbeddedFrame forever if the Frame is no longer in use, so we
-     * add listeners in show() and remove them in hide().
-     */
-    public void hide() {
-        if (appletKFM != null) {
-            removeTraversingOutListeners(appletKFM);
-        }
-        super.hide();
-    }
-
-    /**
-     * Need this method to detect when the focus may have chance to leave the
-     * focus cycle root which is EmbeddedFrame. Mostly, the code here is copied
-     * from DefaultKeyboardFocusManager.processKeyEvent with some minor
-     * modifications.
-     */
-    public boolean dispatchKeyEvent(KeyEvent e) {
-
-        // We can't guarantee that this is called on the same AppContext as EmbeddedFrame
-        // belongs to. That's why we can't use public methods to find current focus cycle
-        // root. Instead, we access KFM's private field directly.
-        if (currentCycleRoot == null) {
-            currentCycleRoot = (Field)AccessController.doPrivileged(new PrivilegedAction() {
-                public Object run() {
-                    try {
-                        Field unaccessibleRoot = KeyboardFocusManager.class.
-                                                     getDeclaredField("currentFocusCycleRoot");
-                        if (unaccessibleRoot != null) {
-                            unaccessibleRoot.setAccessible(true);
-                        }
-                        return unaccessibleRoot;
-                    } catch (NoSuchFieldException e1) {
-                        assert false;
-                    } catch (SecurityException e2) {
-                        assert false;
-                    }
-                    return null;
-                }
-            });
-        }
-
-        Container currentRoot = null;
-        if (currentCycleRoot != null) {
-            try {
-                // The field is static, so we can pass null to Field.get() as the argument.
-                currentRoot = (Container)currentCycleRoot.get(null);
-            } catch (IllegalAccessException e3) {
-                // This is impossible: currentCycleRoot would be null if setAccessible failed.
-                assert false;
-            }
-        }
-
-        // if we are not in EmbeddedFrame's cycle, we should not try to leave.
-        if (this != currentRoot) {
-            return false;
-        }
-
-        // KEY_TYPED events cannot be focus traversal keys
-        if (e.getID() == KeyEvent.KEY_TYPED) {
-            return false;
-        }
-
-        if (!getFocusTraversalKeysEnabled() || e.isConsumed()) {
-            return false;
-        }
-
-        AWTKeyStroke stroke = AWTKeyStroke.getAWTKeyStrokeForEvent(e);
-        Set toTest;
-        Component currentFocused = e.getComponent();
-
-        Component last = getFocusTraversalPolicy().getLastComponent(this);
-        toTest = getFocusTraversalKeys(KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS);
-        if (toTest.contains(stroke) && (currentFocused == last || last == null)) {
-            if (traverseOut(FORWARD)) {
-                e.consume();
-                return true;
-            }
-        }
-
-        Component first = getFocusTraversalPolicy().getFirstComponent(this);
-        toTest = getFocusTraversalKeys(KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS);
-        if (toTest.contains(stroke) && (currentFocused == first || first == null)) {
-            if (traverseOut(BACKWARD)) {
-                e.consume();
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * This method is called from dispatchKeyEvent in the following two cases:
-     * 1. The focus is on the first Component of this EmbeddedFrame and we are
-     *    about to transfer the focus backward.
-     * 2. The focus in on the last Component of this EmbeddedFrame and we are
-     *    about to transfer the focus forward.
-     * This is needed to give the opportuity for keyboard focus to leave the
-     * EmbeddedFrame. Override this method, initiate focus transfer in it and
-     * return true if you want the focus to leave EmbeddedFrame's cycle.
-     * The direction parameter specifies which of the two mentioned cases is
-     * happening. Use FORWARD and BACKWARD constants defined in EmbeddedFrame
-     * to avoid confusing boolean values.
-     *
-     * @param direction FORWARD or BACKWARD
-     * @return true, if EmbeddedFrame wants the focus to leave it,
-     *         false otherwise.
-     */
-    protected boolean traverseOut(boolean direction) {
-        return false;
-    }
-
-    /**
-     * Block modifying any frame attributes, since they aren't applicable
-     * for EmbeddedFrames.
-     */
-    public void setTitle(String title) {}
-    public void setIconImage(Image image) {}
-    public void setIconImages(java.util.List<? extends Image> icons) {}
-    public void setMenuBar(MenuBar mb) {}
-    public void setResizable(boolean resizable) {}
-    public void remove(MenuComponent m) {}
-
-    public boolean isResizable() {
-        return true;
-    }
-
-    public void addNotify() {
-        synchronized (getTreeLock()) {
-            if (getPeer() == null) {
-                setPeer(new NullEmbeddedFramePeer());
-            }
-            super.addNotify();
-        }
-    }
-
-    // These three functions consitute RFE 4100710. Do not remove.
-    public void setCursorAllowed(boolean isCursorAllowed) {
-        this.isCursorAllowed = isCursorAllowed;
-        getPeer().updateCursorImmediately();
-    }
-    public boolean isCursorAllowed() {
-        return isCursorAllowed;
-    }
-    public Cursor getCursor() {
-        return (isCursorAllowed)
-            ? super.getCursor()
-            : Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR);
-    }
-
-    protected  void setPeer(final ComponentPeer p){
-        if (fieldPeer == null) {
-            fieldPeer = (Field)AccessController.doPrivileged(new PrivilegedAction() {
-                    public Object run() {
-                        try {
-                            Field lnkPeer = Component.class.getDeclaredField("peer");
-                            if (lnkPeer != null) {
-                                lnkPeer.setAccessible(true);
-                            }
-                            return lnkPeer;
-                        } catch (NoSuchFieldException e) {
-                            assert false;
-                        } catch (SecurityException e) {
-                            assert false;
-                        }
-                        return null;
-                    }//run
-                });
-        }
-        try{
-            if (fieldPeer !=null){
-                fieldPeer.set(EmbeddedFrame.this, p);
-            }
-        } catch (IllegalAccessException e) {
-            assert false;
-        }
-    };  //setPeer method ends
-
-    /**
-     * Synthesize native message to activate or deactivate EmbeddedFrame window
-     * depending on the value of parameter <code>b</code>.
-     * Peers should override this method if they are to implement
-     * this functionality.
-     * @param doActivate  if <code>true</code>, activates the window;
-     * otherwise, deactivates the window
-     */
-    public void synthesizeWindowActivation(boolean doActivate) {}
-
-    /**
-     * Moves this embedded frame to a new location. The top-left corner of
-     * the new location is specified by the <code>x</code> and <code>y</code>
-     * parameters relative to the native parent component.
-     * <p>
-     * setLocation() and setBounds() for EmbeddedFrame really don't move it
-     * within the native parent. These methods always put embedded frame to
-     * (0, 0) for backward compatibility. To allow moving embedded frame
-     * setLocationPrivate() and setBoundsPrivate() were introduced, and they
-     * work just the same way as setLocation() and setBounds() for usual,
-     * non-embedded components.
-     * </p>
-     * <p>
-     * Using usual get/setLocation() and get/setBounds() together with new
-     * get/setLocationPrivate() and get/setBoundsPrivate() is not recommended.
-     * For example, calling getBoundsPrivate() after setLocation() works fine,
-     * but getBounds() after setBoundsPrivate() may return unpredictable value.
-     * </p>
-     * @param x the new <i>x</i>-coordinate relative to the parent component
-     * @param y the new <i>y</i>-coordinate relative to the parent component
-     * @see java.awt.Component#setLocation
-     * @see #getLocationPrivate
-     * @see #setBoundsPrivate
-     * @see #getBoundsPrivate
-     * @since 1.5
-     */
-    protected void setLocationPrivate(int x, int y) {
-        Dimension size = getSize();
-        setBoundsPrivate(x, y, size.width, size.height);
-    }
-
-    /**
-     * Gets the location of this embedded frame as a point specifying the
-     * top-left corner relative to parent component.
-     * <p>
-     * setLocation() and setBounds() for EmbeddedFrame really don't move it
-     * within the native parent. These methods always put embedded frame to
-     * (0, 0) for backward compatibility. To allow getting location and size
-     * of embedded frame getLocationPrivate() and getBoundsPrivate() were
-     * introduced, and they work just the same way as getLocation() and getBounds()
-     * for ususal, non-embedded components.
-     * </p>
-     * <p>
-     * Using usual get/setLocation() and get/setBounds() together with new
-     * get/setLocationPrivate() and get/setBoundsPrivate() is not recommended.
-     * For example, calling getBoundsPrivate() after setLocation() works fine,
-     * but getBounds() after setBoundsPrivate() may return unpredictable value.
-     * </p>
-     * @return a point indicating this embedded frame's top-left corner
-     * @see java.awt.Component#getLocation
-     * @see #setLocationPrivate
-     * @see #setBoundsPrivate
-     * @see #getBoundsPrivate
-     * @since 1.6
-     */
-    protected Point getLocationPrivate() {
-        Rectangle bounds = getBoundsPrivate();
-        return new Point(bounds.x, bounds.y);
-    }
-
-    /**
-     * Moves and resizes this embedded frame. The new location of the top-left
-     * corner is specified by <code>x</code> and <code>y</code> parameters
-     * relative to the native parent component. The new size is specified by
-     * <code>width</code> and <code>height</code>.
-     * <p>
-     * setLocation() and setBounds() for EmbeddedFrame really don't move it
-     * within the native parent. These methods always put embedded frame to
-     * (0, 0) for backward compatibility. To allow moving embedded frames
-     * setLocationPrivate() and setBoundsPrivate() were introduced, and they
-     * work just the same way as setLocation() and setBounds() for usual,
-     * non-embedded components.
-     * </p>
-     * <p>
-     * Using usual get/setLocation() and get/setBounds() together with new
-     * get/setLocationPrivate() and get/setBoundsPrivate() is not recommended.
-     * For example, calling getBoundsPrivate() after setLocation() works fine,
-     * but getBounds() after setBoundsPrivate() may return unpredictable value.
-     * </p>
-     * @param x the new <i>x</i>-coordinate relative to the parent component
-     * @param y the new <i>y</i>-coordinate relative to the parent component
-     * @param width the new <code>width</code> of this embedded frame
-     * @param height the new <code>height</code> of this embedded frame
-     * @see java.awt.Component#setBounds
-     * @see #setLocationPrivate
-     * @see #getLocationPrivate
-     * @see #getBoundsPrivate
-     * @since 1.5
-     */
-    protected void setBoundsPrivate(int x, int y, int width, int height) {
-        final FramePeer peer = (FramePeer)getPeer();
-        if (peer != null) {
-            peer.setBoundsPrivate(x, y, width, height);
-        }
-    }
-
-    /**
-     * Gets the bounds of this embedded frame as a rectangle specifying the
-     * width, height and location relative to the native parent component.
-     * <p>
-     * setLocation() and setBounds() for EmbeddedFrame really don't move it
-     * within the native parent. These methods always put embedded frame to
-     * (0, 0) for backward compatibility. To allow getting location and size
-     * of embedded frames getLocationPrivate() and getBoundsPrivate() were
-     * introduced, and they work just the same way as getLocation() and getBounds()
-     * for ususal, non-embedded components.
-     * </p>
-     * <p>
-     * Using usual get/setLocation() and get/setBounds() together with new
-     * get/setLocationPrivate() and get/setBoundsPrivate() is not recommended.
-     * For example, calling getBoundsPrivate() after setLocation() works fine,
-     * but getBounds() after setBoundsPrivate() may return unpredictable value.
-     * </p>
-     * @return a rectangle indicating this embedded frame's bounds
-     * @see java.awt.Component#getBounds
-     * @see #setLocationPrivate
-     * @see #getLocationPrivate
-     * @see #setBoundsPrivate
-     * @since 1.6
-     */
-    protected Rectangle getBoundsPrivate() {
-        final FramePeer peer = (FramePeer)getPeer();
-        if (peer != null) {
-            return peer.getBoundsPrivate();
-        }
-        else {
-            return getBounds();
-        }
-    }
-
-    public void toFront() {}
-    public void toBack() {}
-
-    public abstract void registerAccelerator(AWTKeyStroke stroke);
-    public abstract void unregisterAccelerator(AWTKeyStroke stroke);
-
-    /**
-     * Checks if the component is in an EmbeddedFrame. If so,
-     * returns the applet found in the hierarchy or null if
-     * not found.
-     * @return the parent applet or {@ null}
-     * @since 1.6
-     */
-    public static Applet getAppletIfAncestorOf(Component comp) {
-        Container parent = comp.getParent();
-        Applet applet = null;
-        while (parent != null && !(parent instanceof EmbeddedFrame)) {
-            if (parent instanceof Applet) {
-                applet = (Applet)parent;
-            }
-            parent = parent.getParent();
-        }
-        return parent == null ? null : applet;
-    }
-
-    /**
-     * This method should be overriden in subclasses. It is
-     * called when window this frame is within should be blocked
-     * by some modal dialog.
-     */
-    public void notifyModalBlocked(Dialog blocker, boolean blocked) {
-    }
-
-    private static class NullEmbeddedFramePeer
-        extends NullComponentPeer implements FramePeer {
-        public void setTitle(String title) {}
-        public void setIconImage(Image im) {}
-        public void updateIconImages() {}
-        public void setMenuBar(MenuBar mb) {}
-        public void setResizable(boolean resizeable) {}
-        public void setState(int state) {}
-        public int getState() { return Frame.NORMAL; }
-        public void setMaximizedBounds(Rectangle b) {}
-        public void toFront() {}
-        public void toBack() {}
-        public void updateFocusableWindowState() {}
-        public void updateAlwaysOnTop() {}
-        public void setAlwaysOnTop(boolean alwaysOnTop) {}
-        public Component getGlobalHeavyweightFocusOwner() { return null; }
-        public void setBoundsPrivate(int x, int y, int width, int height) {
-            setBounds(x, y, width, height, SET_BOUNDS);
-        }
-        public Rectangle getBoundsPrivate() {
-            return getBounds();
-        }
-        public void setModalBlocked(Dialog blocker, boolean blocked) {}
-
-        /**
-         * @see java.awt.peer.ContainerPeer#restack
-         */
-        public void restack() {
-            throw new UnsupportedOperationException();
-        }
-
-        /**
-         * @see java.awt.peer.ContainerPeer#isRestackSupported
-         */
-        public boolean isRestackSupported() {
-            return false;
-        }
-        public boolean requestWindowFocus() {
-            return false;
-        }
-        public void updateMinimumSize() {
-        }
-		public void setOpacity(float opacity) {
-		}
-		public void setOpaque(boolean isOpaque) {
-		}
-		public void updateWindow() {
-		}
-		public void repositionSecurityWarning() {
-		}
-    }
-} // class EmbeddedFrame
diff --git a/openjdk/sun/awt/IkvmDataTransferer.java b/openjdk/sun/awt/IkvmDataTransferer.java
deleted file mode 100644
index 27040318..00000000
--- a/openjdk/sun/awt/IkvmDataTransferer.java
+++ /dev/null
@@ -1,605 +0,0 @@
-/*
-  Copyright (C) 2009 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net 
-
- */
-
-package sun.awt;
-
-import java.awt.Image;
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.FlavorTable;
-import java.awt.datatransfer.Transferable;
-import java.awt.datatransfer.UnsupportedFlavorException;
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.SortedMap;
-
-import sun.awt.datatransfer.DataTransferer;
-import cli.System.Runtime.InteropServices.DllImportAttribute;
-
-public abstract class IkvmDataTransferer extends DataTransferer {
-	public static final int CF_TEXT = 1;
-	public static final int CF_METAFILEPICT = 3;
-	public static final int CF_DIB = 8;
-	public static final int CF_ENHMETAFILE = 14;
-	public static final int CF_HDROP = 15;
-	public static final int CF_LOCALE = 16;
-
-	public static final long CF_HTML = RegisterClipboardFormat("HTML Format");
-	public static final long CFSTR_INETURL = RegisterClipboardFormat("UniformResourceLocator");
-	public static final long CF_PNG = RegisterClipboardFormat("PNG");
-	public static final long CF_JFIF = RegisterClipboardFormat("JFIF");
-	
-    private static final String[] predefinedClipboardNames = {
-        "",
-        "TEXT",
-        "BITMAP",
-        "METAFILEPICT",
-        "SYLK",
-        "DIF",
-        "TIFF",
-        "OEM TEXT",
-        "DIB",
-        "PALETTE",
-        "PENDATA",
-        "RIFF",
-        "WAVE",
-        "UNICODE TEXT",
-        "ENHMETAFILE",
-        "HDROP",
-        "LOCALE",
-        "DIBV5"
-    };
-
-    private static final Map<String, Long> predefinedClipboardNameMap;
-
-    static {
-        Map<String, Long> tempMap = new HashMap<String, Long>(predefinedClipboardNames.length, 1.0f);
-        for (int i = 1; i < predefinedClipboardNames.length; i++) {
-            tempMap.put(predefinedClipboardNames[i], Long.valueOf(i));
-        }
-        predefinedClipboardNameMap = Collections.synchronizedMap(tempMap);
-    }
-
-    private static final Long L_CF_LOCALE = (Long) predefinedClipboardNameMap.get(predefinedClipboardNames[CF_LOCALE]);
-    
-    @DllImportAttribute.Annotation(value = "user32.dll", EntryPoint = "RegisterClipboardFormat")
-    private native static int _RegisterClipboardFormat(String format);
-
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    private static int RegisterClipboardFormat(String format)
-    {
-        return _RegisterClipboardFormat(format);
-    }
-
-    public SortedMap getFormatsForFlavors(DataFlavor[] flavors, FlavorTable map) {
-        SortedMap retval = super.getFormatsForFlavors(flavors, map);
-
-        // The Win32 native code does not support exporting LOCALE data, nor
-        // should it.
-        retval.remove(L_CF_LOCALE);
-
-        return retval;
-    }
-
-    public String getDefaultUnicodeEncoding() {
-        return "utf-16le";
-    }
-
-    public byte[] translateTransferable(Transferable contents,
-                                        DataFlavor flavor,
-                                        long format) throws IOException
-    {
-        byte[] bytes = super.translateTransferable(contents, flavor, format);
-
-        if (format == CF_HTML) {
-            bytes = HTMLCodec.convertToHTMLFormat(bytes);
-        }
-        return bytes;
-    }
-
-    protected Object translateBytesOrStream(InputStream str, byte[] bytes,
-                                            DataFlavor flavor, long format,
-                                            Transferable localeTransferable)
-        throws IOException
-    {
-        if (format == CF_HTML && flavor.isFlavorTextType()) {
-            if (str == null) {
-                str = new ByteArrayInputStream(bytes);
-                bytes = null;
-            }
-
-            str = new HTMLCodec(str,  EHTMLReadMode.HTML_READ_SELECTION);
-        }
-
-        if (format == CFSTR_INETURL &&
-            URL.class.equals(flavor.getRepresentationClass()))
-        {
-            if (bytes == null) {
-                bytes = inputStreamToByteArray(str);
-                str = null;
-            }
-            String charset = getDefaultTextCharset();
-            if (localeTransferable != null && localeTransferable.
-                isDataFlavorSupported(javaTextEncodingFlavor))
-            {
-                try {
-                    charset = new String((byte[])localeTransferable.
-                                   getTransferData(javaTextEncodingFlavor),
-                                   "UTF-8");
-                } catch (UnsupportedFlavorException cannotHappen) {
-                }
-            }
-            return new URL(new String(bytes, charset));
-        }
-
-        return super.translateBytesOrStream(str, bytes, flavor, format,
-                                            localeTransferable);
-    }
-    
-	protected byte[] imageToPlatformBytes(Image image, long format)
-			throws IOException {
-		String mimeType = null;
-		if (format == CF_PNG) {
-			mimeType = "image/png";
-		} else if (format == CF_JFIF) {
-			mimeType = "image/jpeg";
-		}
-		if (mimeType != null) {
-			return imageToStandardBytes(image, mimeType);
-		}
-		throw new Error("Not implemented");
-	}
-
-	protected abstract byte[] imageToStandardBytes(Image image, String mimeType)
-			throws IOException;
-
-	protected Image platformImageBytesOrStreamToImage(InputStream str,
-			byte[] bytes, long format) {
-		throw new Error("Not implemented");
-	}
-
-	protected String[] dragQueryFile(byte[] bytes) {
-		throw new Error("Not implemented");
-	}
-
-    protected String getNativeForFormat(long format) {
-        return (format < predefinedClipboardNames.length && format>=0)
-            ? predefinedClipboardNames[(int)format]
-            : getClipboardFormatName(format);
-    }
-
-	protected Long getFormatForNativeAsLong(String str) {
-        Long format = (Long)predefinedClipboardNameMap.get(str);
-        if (format == null) {
-            format = Long.valueOf(RegisterClipboardFormat(str));
-        }
-        return format;	}
-	
-	protected abstract String getClipboardFormatName(long format);
-
-    public boolean isImageFormat(long format) {
-        return format == CF_DIB || format == CF_ENHMETAFILE ||
-               format == CF_METAFILEPICT || format == CF_PNG ||
-               format == CF_JFIF;
-    }
-
-    public boolean isLocaleDependentTextFormat(long format) {
-        return format == CF_TEXT || format == CFSTR_INETURL;
-    }
-
-    public boolean isFileFormat(long format) {
-        return format == CF_HDROP;
-    }
-
-}
-
-enum EHTMLReadMode {
-    HTML_READ_ALL,
-    HTML_READ_FRAGMENT,
-    HTML_READ_SELECTION
-}
-
-/**
- * on decode: This stream takes an InputStream which provides data in CF_HTML format,
- * strips off the description and context to extract the original HTML data.
- *
- * on encode: static convertToHTMLFormat is responsible for HTML clipboard header creation
- */
-class HTMLCodec extends InputStream {
-    //static section
-    public static final String ENCODING = "UTF-8";
-
-    public static final String VERSION = "Version:";
-    public static final String START_HTML = "StartHTML:";
-    public static final String END_HTML = "EndHTML:";
-    public static final String START_FRAGMENT = "StartFragment:";
-    public static final String END_FRAGMENT = "EndFragment:";
-    public static final String START_SELECTION = "StartSelection:"; //optional
-    public static final String END_SELECTION = "EndSelection:"; //optional
-
-    public static final String START_FRAGMENT_CMT = "<!--StartFragment-->";
-    public static final String END_FRAGMENT_CMT = "<!--EndFragment-->";
-    public static final String SOURCE_URL = "SourceURL:";
-    public static final String DEF_SOURCE_URL = "about:blank";
-
-    public static final String EOLN = "\r\n";
-
-    private static final String VERSION_NUM = "1.0";
-    private static final int PADDED_WIDTH = 10;
-
-    private static String toPaddedString(int n, int width) {
-        String string = "" + n;
-        int len = string.length();
-        if (n >= 0 && len < width) {
-            char[] array = new char[width - len];
-            Arrays.fill(array, '0');
-            StringBuffer buffer = new StringBuffer(width);
-            buffer.append(array);
-            buffer.append(string);
-            string = buffer.toString();
-        }
-        return string;
-    }
-
-    /**
-     * convertToHTMLFormat adds the MS HTML clipboard header to byte array that
-     * contains the parameters pairs.
-     *
-     * The consequence of parameters is fixed, but some or all of them could be
-     * omitted. One parameter per one text line.
-     * It looks like that:
-     *
-     * Version:1.0\r\n                -- current supported version
-     * StartHTML:000000192\r\n        -- shift in array to the first byte after the header
-     * EndHTML:000000757\r\n          -- shift in array of last byte for HTML syntax analysis
-     * StartFragment:000000396\r\n    -- shift in array jast after <!--StartFragment-->
-     * EndFragment:000000694\r\n      -- shift in array before start  <!--EndFragment-->
-     * StartSelection:000000398\r\n   -- shift in array of the first char in copied selection
-     * EndSelection:000000692\r\n     -- shift in array of the last char in copied selection
-     * SourceURL:http://sun.com/\r\n  -- base URL for related referenses
-     * <HTML>...<BODY>...<!--StartFragment-->.....................<!--EndFragment-->...</BODY><HTML>
-     * ^                                     ^ ^                ^^                                 ^
-     * \ StartHTML                           | \-StartSelection | \EndFragment              EndHTML/
-     *                                       \-StartFragment    \EndSelection
-     *
-     *Combinations with tags sequence
-     *<!--StartFragment--><HTML>...<BODY>...</BODY><HTML><!--EndFragment-->
-     * or
-     *<HTML>...<!--StartFragment-->...<BODY>...</BODY><!--EndFragment--><HTML>
-     * are vailid too.
-     */
-    public static byte[] convertToHTMLFormat(byte[] bytes) {
-        // Calculate section offsets
-        String htmlPrefix = "";
-        String htmlSuffix = "";
-        {
-            //we have extend the fragment to full HTML document correctly
-            //to avoid HTML and BODY tags doubling
-            String stContext = new String(bytes);
-            String stUpContext = stContext.toUpperCase();
-            if( -1 == stUpContext.indexOf("<HTML") ) {
-                htmlPrefix = "<HTML>";
-                htmlSuffix = "</HTML>";
-                if( -1 == stUpContext.indexOf("<BODY") ) {
-                    htmlPrefix = htmlPrefix +"<BODY>";
-                    htmlSuffix = "</BODY>" + htmlSuffix;
-                };
-            };
-            htmlPrefix = htmlPrefix + START_FRAGMENT_CMT;
-            htmlSuffix = END_FRAGMENT_CMT + htmlSuffix;
-        }
-
-        String stBaseUrl = DEF_SOURCE_URL;
-        int nStartHTML =
-            VERSION.length() + VERSION_NUM.length() + EOLN.length()
-            + START_HTML.length() + PADDED_WIDTH + EOLN.length()
-            + END_HTML.length() + PADDED_WIDTH + EOLN.length()
-            + START_FRAGMENT.length() + PADDED_WIDTH + EOLN.length()
-            + END_FRAGMENT.length() + PADDED_WIDTH + EOLN.length()
-            + SOURCE_URL.length() + stBaseUrl.length() + EOLN.length()
-            ;
-        int nStartFragment = nStartHTML + htmlPrefix.length();
-        int nEndFragment = nStartFragment + bytes.length - 1;
-        int nEndHTML = nEndFragment + htmlSuffix.length();
-
-        StringBuilder header = new StringBuilder(
-            nStartFragment
-            + START_FRAGMENT_CMT.length()
-        );
-        //header
-        header.append(VERSION);
-        header.append(VERSION_NUM);
-        header.append(EOLN);
-
-        header.append(START_HTML);
-        header.append(toPaddedString(nStartHTML, PADDED_WIDTH));
-        header.append(EOLN);
-
-        header.append(END_HTML);
-        header.append(toPaddedString(nEndHTML, PADDED_WIDTH));
-        header.append(EOLN);
-
-        header.append(START_FRAGMENT);
-        header.append(toPaddedString(nStartFragment, PADDED_WIDTH));
-        header.append(EOLN);
-
-        header.append(END_FRAGMENT);
-        header.append(toPaddedString(nEndFragment, PADDED_WIDTH));
-        header.append(EOLN);
-
-        header.append(SOURCE_URL);
-        header.append(stBaseUrl);
-        header.append(EOLN);
-
-        //HTML
-        header.append(htmlPrefix);
-
-        byte[] headerBytes = null, trailerBytes = null;
-
-        try {
-            headerBytes = new String(header).getBytes(ENCODING);
-            trailerBytes = htmlSuffix.getBytes(ENCODING);
-        } catch (UnsupportedEncodingException cannotHappen) {
-        }
-
-        byte[] retval = new byte[headerBytes.length + bytes.length +
-                                 trailerBytes.length];
-
-        System.arraycopy(headerBytes, 0, retval, 0, headerBytes.length);
-        System.arraycopy(bytes, 0, retval, headerBytes.length,
-                       bytes.length - 1);
-        System.arraycopy(trailerBytes, 0, retval,
-                         headerBytes.length + bytes.length - 1,
-                         trailerBytes.length);
-        retval[retval.length-1] = 0;
-
-        return retval;
-    }
-
-    ////////////////////////////////////
-    //decoder instance data and methods:
-
-    private final BufferedInputStream bufferedStream;
-    private boolean descriptionParsed = false;
-    private boolean closed = false;
-
-     // InputStreamReader uses an 8K buffer. The size is not customizable.
-    public static final int BYTE_BUFFER_LEN = 8192;
-
-    // CharToByteUTF8.getMaxBytesPerChar returns 3, so we should not buffer
-    // more chars than 3 times the number of bytes we can buffer.
-    public static final int CHAR_BUFFER_LEN = BYTE_BUFFER_LEN / 3;
-
-    private static final String FAILURE_MSG =
-        "Unable to parse HTML description: ";
-    private static final String INVALID_MSG =
-        " invalid";
-
-    //HTML header mapping:
-    private long   iHTMLStart,// StartHTML -- shift in array to the first byte after the header
-                   iHTMLEnd,  // EndHTML -- shift in array of last byte for HTML syntax analysis
-                   iFragStart,// StartFragment -- shift in array jast after <!--StartFragment-->
-                   iFragEnd,  // EndFragment -- shift in array before start <!--EndFragment-->
-                   iSelStart, // StartSelection -- shift in array of the first char in copied selection
-                   iSelEnd;   // EndSelection -- shift in array of the last char in copied selection
-    private String stBaseURL; // SourceURL -- base URL for related referenses
-    private String stVersion; // Version -- current supported version
-
-    //Stream reader markers:
-    private long iStartOffset,
-                 iEndOffset,
-                 iReadCount;
-
-    private EHTMLReadMode readMode;
-
-    public HTMLCodec(
-        InputStream _bytestream,
-        EHTMLReadMode _readMode) throws IOException
-    {
-        bufferedStream = new BufferedInputStream(_bytestream, BYTE_BUFFER_LEN);
-        readMode = _readMode;
-    }
-
-    public synchronized String getBaseURL() throws IOException
-    {
-        if( !descriptionParsed ) {
-            parseDescription();
-        }
-        return stBaseURL;
-    }
-    public synchronized String getVersion() throws IOException
-    {
-        if( !descriptionParsed ) {
-            parseDescription();
-        }
-        return stVersion;
-    }
-
-    /**
-     * parseDescription parsing HTML clipboard header as it described in
-     * comment to convertToHTMLFormat
-     */
-    private void parseDescription() throws IOException
-    {
-        stBaseURL = null;
-        stVersion = null;
-
-        // initialization of array offset pointers
-        // to the same "uninitialized" state.
-        iHTMLEnd =
-            iHTMLStart =
-                iFragEnd =
-                    iFragStart =
-                        iSelEnd =
-                            iSelStart = -1;
-
-        bufferedStream.mark(BYTE_BUFFER_LEN);
-        String astEntries[] = new String[] {
-            //common
-            VERSION,
-            START_HTML,
-            END_HTML,
-            START_FRAGMENT,
-            END_FRAGMENT,
-            //ver 1.0
-            START_SELECTION,
-            END_SELECTION,
-            SOURCE_URL
-        };
-        BufferedReader bufferedReader = new BufferedReader(
-            new InputStreamReader(
-                bufferedStream,
-                ENCODING
-            ),
-            CHAR_BUFFER_LEN
-        );
-        long iHeadSize = 0;
-        long iCRSize = EOLN.length();
-        int iEntCount = astEntries.length;
-        boolean bContinue = true;
-
-        for( int  iEntry = 0; iEntry < iEntCount; ++iEntry ){
-            String stLine = bufferedReader.readLine();
-            if( null==stLine ) {
-                break;
-            }
-            //some header entries are optional, but the order is fixed.
-            for( ; iEntry < iEntCount; ++iEntry ){
-                if( !stLine.startsWith(astEntries[iEntry]) ) {
-                    continue;
-                }
-                iHeadSize += stLine.length() + iCRSize;
-                String stValue = stLine.substring(astEntries[iEntry].length()).trim();
-                if( null!=stValue ) {
-                    try{
-                        switch( iEntry ){
-                        case 0:
-                            stVersion = stValue;
-                            break;
-                        case 1:
-                            iHTMLStart = Integer.parseInt(stValue);
-                            break;
-                        case 2:
-                            iHTMLEnd = Integer.parseInt(stValue);
-                            break;
-                        case 3:
-                            iFragStart = Integer.parseInt(stValue);
-                            break;
-                        case 4:
-                            iFragEnd = Integer.parseInt(stValue);
-                            break;
-                        case 5:
-                            iSelStart = Integer.parseInt(stValue);
-                            break;
-                        case 6:
-                            iSelEnd = Integer.parseInt(stValue);
-                            break;
-                        case 7:
-                            stBaseURL = stValue;
-                            break;
-                        };
-                    } catch ( NumberFormatException e ) {
-                        throw new IOException(FAILURE_MSG + astEntries[iEntry]+ " value " + e + INVALID_MSG);
-                    }
-                }
-                break;
-            }
-        }
-        //some entries could absent in HTML header,
-        //so we have find they by another way.
-        if( -1 == iHTMLStart )
-            iHTMLStart = iHeadSize;
-        if( -1 == iFragStart )
-            iFragStart = iHTMLStart;
-        if( -1 == iFragEnd )
-            iFragEnd = iHTMLEnd;
-        if( -1 == iSelStart )
-            iSelStart = iFragStart;
-        if( -1 == iSelEnd )
-            iSelEnd = iFragEnd;
-
-        //one of possible modes
-        switch( readMode ){
-        case HTML_READ_ALL:
-            iStartOffset = iHTMLStart;
-            iEndOffset = iHTMLEnd;
-            break;
-        case HTML_READ_FRAGMENT:
-            iStartOffset = iFragStart;
-            iEndOffset = iFragEnd;
-            break;
-        case HTML_READ_SELECTION:
-        default:
-            iStartOffset = iSelStart;
-            iEndOffset = iSelEnd;
-            break;
-        }
-
-        bufferedStream.reset();
-        if( -1 == iStartOffset ){
-            throw new IOException(FAILURE_MSG + "invalid HTML format.");
-        }
-        iReadCount = bufferedStream.skip(iStartOffset);
-        if( iStartOffset != iReadCount ){
-            throw new IOException(FAILURE_MSG + "Byte stream ends in description.");
-        }
-        descriptionParsed = true;
-    }
-
-    public synchronized int read() throws IOException {
-        if( closed ){
-            throw new IOException("Stream closed");
-        }
-
-        if( !descriptionParsed ){
-            parseDescription();
-        }
-        if( -1 != iEndOffset && iReadCount >= iEndOffset ) {
-            return -1;
-        }
-
-        int retval = bufferedStream.read();
-        if( retval == -1 ) {
-            return -1;
-        }
-        ++iReadCount;
-        return retval;
-    }
-
-    public synchronized void close() throws IOException {
-        if( !closed ){
-            closed = true;
-            bufferedStream.close();
-        }
-    }
-}
diff --git a/openjdk/sun/awt/SunToolkit.java b/openjdk/sun/awt/SunToolkit.java
deleted file mode 100644
index 11612ec1..00000000
--- a/openjdk/sun/awt/SunToolkit.java
+++ /dev/null
@@ -1,2010 +0,0 @@
-/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.awt;
-
-import java.awt.*;
-import static java.awt.RenderingHints.*;
-import java.awt.dnd.*;
-import java.awt.dnd.peer.DragSourceContextPeer;
-import java.awt.peer.*;
-import java.awt.event.WindowEvent;
-import java.awt.event.KeyEvent;
-import java.awt.image.*;
-import java.awt.TrayIcon;
-import java.awt.SystemTray;
-import java.awt.event.InputEvent;
-import java.net.URL;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-import sun.security.util.SecurityConstants;
-import sun.util.logging.PlatformLogger;
-import sun.misc.SoftCache;
-import sun.font.FontDesignMetrics;
-import sun.awt.im.InputContext;
-import sun.awt.image.*;
-import sun.security.action.GetPropertyAction;
-import sun.security.action.GetBooleanAction;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-
-public abstract class SunToolkit extends Toolkit
-    implements WindowClosingSupport, WindowClosingListener,
-    ComponentFactory, InputMethodSupport, KeyboardFocusManagerPeerProvider {
-
-    // 8014736: logging has been removed from SunToolkit
-
-    /**
-     * Special mask for the UngrabEvent events, in addition to the
-     * public masks defined in AWTEvent.  Should be used as the mask
-     * value for Toolkit.addAWTEventListener.
-     */
-    public static final int GRAB_EVENT_MASK = 0x80000000;
-
-    private static Method  wakeupMethod;
-    /* The key to put()/get() the PostEventQueue into/from the AppContext.
-     */
-    private static final String POST_EVENT_QUEUE_KEY = "PostEventQueue";
-
-    /**
-     * Number of buttons.
-     * By default it's taken from the system. If system value does not
-     * fit into int type range, use our own MAX_BUTTONS_SUPPORT value.
-     */
-    protected static int numberOfButtons = 0;
-
-
-    /* XFree standard mention 24 buttons as maximum:
-     * http://www.xfree86.org/current/mouse.4.html
-     * We workaround systems supporting more than 24 buttons.
-     * Otherwise, we have to use long type values as masks
-     * which leads to API change.
-     * InputEvent.BUTTON_DOWN_MASK may contain only 21 masks due to
-     * the 4-bytes limit for the int type. (CR 6799099)
-     * One more bit is reserved for FIRST_HIGH_BIT.
-     */
-    public final static int MAX_BUTTONS_SUPPORTED = 20;
-
-    /**
-     * Creates and initializes EventQueue instance for the specified
-     * AppContext.
-     * Note that event queue must be created from createNewAppContext()
-     * only in order to ensure that EventQueue constructor obtains
-     * the correct AppContext.
-     * @param appContext AppContext to associate with the event queue
-     */
-    private static void initEQ(AppContext appContext) {
-        EventQueue eventQueue;
-
-        String eqName = System.getProperty("AWT.EventQueueClass",
-                "java.awt.EventQueue");
-
-        try {
-            eventQueue = (EventQueue)Class.forName(eqName).newInstance();
-        } catch (Exception e) {
-            e.printStackTrace();
-            System.err.println("Failed loading " + eqName + ": " + e);
-            eventQueue = new EventQueue();
-        }
-        appContext.put(AppContext.EVENT_QUEUE_KEY, eventQueue);
-
-        PostEventQueue postEventQueue = new PostEventQueue(eventQueue);
-        appContext.put(POST_EVENT_QUEUE_KEY, postEventQueue);
-    }
-
-    public SunToolkit() {
-    }
-
-    public boolean useBufferPerWindow() {
-        return false;
-    }
-
-    public abstract WindowPeer createWindow(Window target)
-        throws HeadlessException;
-
-    public abstract FramePeer createFrame(Frame target)
-        throws HeadlessException;
-
-    public abstract DialogPeer createDialog(Dialog target)
-        throws HeadlessException;
-
-    public abstract ButtonPeer createButton(Button target)
-        throws HeadlessException;
-
-    public abstract TextFieldPeer createTextField(TextField target)
-        throws HeadlessException;
-
-    public abstract ChoicePeer createChoice(Choice target)
-        throws HeadlessException;
-
-    public abstract LabelPeer createLabel(Label target)
-        throws HeadlessException;
-
-    public abstract ListPeer createList(java.awt.List target)
-        throws HeadlessException;
-
-    public abstract CheckboxPeer createCheckbox(Checkbox target)
-        throws HeadlessException;
-
-    public abstract ScrollbarPeer createScrollbar(Scrollbar target)
-        throws HeadlessException;
-
-    public abstract ScrollPanePeer createScrollPane(ScrollPane target)
-        throws HeadlessException;
-
-    public abstract TextAreaPeer createTextArea(TextArea target)
-        throws HeadlessException;
-
-    public abstract FileDialogPeer createFileDialog(FileDialog target)
-        throws HeadlessException;
-
-    public abstract MenuBarPeer createMenuBar(MenuBar target)
-        throws HeadlessException;
-
-    public abstract MenuPeer createMenu(Menu target)
-        throws HeadlessException;
-
-    public abstract PopupMenuPeer createPopupMenu(PopupMenu target)
-        throws HeadlessException;
-
-    public abstract MenuItemPeer createMenuItem(MenuItem target)
-        throws HeadlessException;
-
-    public abstract CheckboxMenuItemPeer createCheckboxMenuItem(
-        CheckboxMenuItem target)
-        throws HeadlessException;
-
-    public abstract DragSourceContextPeer createDragSourceContextPeer(
-        DragGestureEvent dge)
-        throws InvalidDnDOperationException;
-
-    public abstract TrayIconPeer createTrayIcon(TrayIcon target)
-        throws HeadlessException, AWTException;
-
-    public abstract SystemTrayPeer createSystemTray(SystemTray target);
-
-    public abstract boolean isTraySupported();
-
-    public abstract FontPeer getFontPeer(String name, int style);
-
-    public abstract RobotPeer createRobot(Robot target, GraphicsDevice screen)
-        throws AWTException;
-
-    public abstract KeyboardFocusManagerPeer createKeyboardFocusManagerPeer(KeyboardFocusManager manager)
-        throws HeadlessException;
-
-    /**
-     * The AWT lock is typically only used on Unix platforms to synchronize
-     * access to Xlib, OpenGL, etc.  However, these methods are implemented
-     * in SunToolkit so that they can be called from shared code (e.g.
-     * from the OGL pipeline) or from the X11 pipeline regardless of whether
-     * XToolkit or MToolkit is currently in use.  There are native macros
-     * (such as AWT_LOCK) defined in awt.h, so if the implementation of these
-     * methods is changed, make sure it is compatible with the native macros.
-     *
-     * Note: The following methods (awtLock(), awtUnlock(), etc) should be
-     * used in place of:
-     *     synchronized (getAWTLock()) {
-     *         ...
-     *     }
-     *
-     * By factoring these methods out specially, we are able to change the
-     * implementation of these methods (e.g. use more advanced locking
-     * mechanisms) without impacting calling code.
-     *
-     * Sample usage:
-     *     private void doStuffWithXlib() {
-     *         assert !SunToolkit.isAWTLockHeldByCurrentThread();
-     *         SunToolkit.awtLock();
-     *         try {
-     *             ...
-     *             XlibWrapper.XDoStuff();
-     *         } finally {
-     *             SunToolkit.awtUnlock();
-     *         }
-     *     }
-     */
-
-    private static final ReentrantLock AWT_LOCK = new ReentrantLock();
-    private static final Condition AWT_LOCK_COND = AWT_LOCK.newCondition();
-
-    public static final void awtLock() {
-        AWT_LOCK.lock();
-    }
-
-    public static final boolean awtTryLock() {
-        return AWT_LOCK.tryLock();
-    }
-
-    public static final void awtUnlock() {
-        AWT_LOCK.unlock();
-    }
-
-    public static final void awtLockWait()
-        throws InterruptedException
-    {
-        AWT_LOCK_COND.await();
-    }
-
-    public static final void awtLockWait(long timeout)
-        throws InterruptedException
-    {
-        AWT_LOCK_COND.await(timeout, TimeUnit.MILLISECONDS);
-    }
-
-    public static final void awtLockNotify() {
-        AWT_LOCK_COND.signal();
-    }
-
-    public static final void awtLockNotifyAll() {
-        AWT_LOCK_COND.signalAll();
-    }
-
-    public static final boolean isAWTLockHeldByCurrentThread() {
-        return AWT_LOCK.isHeldByCurrentThread();
-    }
-
-    /*
-     * Create a new AppContext, along with its EventQueue, for a
-     * new ThreadGroup.  Browser code, for example, would use this
-     * method to create an AppContext & EventQueue for an Applet.
-     */
-    public static AppContext createNewAppContext() {
-        ThreadGroup threadGroup = Thread.currentThread().getThreadGroup();
-        return createNewAppContext(threadGroup);
-    }
-
-    static final AppContext createNewAppContext(ThreadGroup threadGroup) {
-        // Create appContext before initialization of EventQueue, so all
-        // the calls to AppContext.getAppContext() from EventQueue ctor
-        // return correct values
-        AppContext appContext = new AppContext(threadGroup);
-        initEQ(appContext);
-
-        return appContext;
-    }
-
-    public static Field getField(final Class klass, final String fieldName) {
-        return AccessController.doPrivileged(new PrivilegedAction<Field>() {
-            public Field run() {
-                try {
-                    Field field = klass.getDeclaredField(fieldName);
-                    assert (field != null);
-                    field.setAccessible(true);
-                    return field;
-                } catch (SecurityException e) {
-                    assert false;
-                } catch (NoSuchFieldException e) {
-                    assert false;
-                }
-                return null;
-            }//run
-        });
-    }
-
-    static void wakeupEventQueue(EventQueue q, boolean isShutdown){
-        if (wakeupMethod == null){
-            wakeupMethod = (Method)AccessController.doPrivileged(new PrivilegedAction(){
-                    public Object run(){
-                        try {
-                            Method method  = EventQueue.class.getDeclaredMethod("wakeup",new Class [] {Boolean.TYPE} );
-                            if (method != null) {
-                                method.setAccessible(true);
-                            }
-                            return method;
-                        } catch (NoSuchMethodException e) {
-                            assert false;
-                        } catch (SecurityException e) {
-                            assert false;
-                        }
-                        return null;
-                    }//run
-                });
-        }
-        try{
-            if (wakeupMethod != null){
-                wakeupMethod.invoke(q, new Object[]{Boolean.valueOf(isShutdown)});
-            }
-        } catch (InvocationTargetException e){
-            assert false;
-        } catch (IllegalAccessException e) {
-            assert false;
-        }
-    }
-
-    /*
-     * Fetch the peer associated with the given target (as specified
-     * in the peer creation method).  This can be used to determine
-     * things like what the parent peer is.  If the target is null
-     * or the target can't be found (either because the a peer was
-     * never created for it or the peer was disposed), a null will
-     * be returned.
-     */
-    protected static Object targetToPeer(Object target) {
-        if (target != null && !GraphicsEnvironment.isHeadless()) {
-            return AWTAutoShutdown.getInstance().getPeer(target);
-        }
-        return null;
-    }
-
-    protected static void targetCreatedPeer(Object target, Object peer) {
-        if (target != null && peer != null &&
-            !GraphicsEnvironment.isHeadless())
-        {
-            AWTAutoShutdown.getInstance().registerPeer(target, peer);
-        }
-    }
-
-    protected static void targetDisposedPeer(Object target, Object peer) {
-        if (target != null && peer != null &&
-            !GraphicsEnvironment.isHeadless())
-        {
-            AWTAutoShutdown.getInstance().unregisterPeer(target, peer);
-        }
-    }
-
-    // Maps from non-Component/MenuComponent to AppContext.
-    // WeakHashMap<Component,AppContext>
-    private static final Map appContextMap =
-        Collections.synchronizedMap(new WeakHashMap());
-
-    /**
-     * Sets the appContext field of target. If target is not a Component or
-     * MenuComponent, this returns false.
-     */
-    private static boolean setAppContext(Object target,
-                                         AppContext context) {
-        if (target instanceof Component) {
-            AWTAccessor.getComponentAccessor().
-                setAppContext((Component)target, context);
-        } else if (target instanceof MenuComponent) {
-            AWTAccessor.getMenuComponentAccessor().
-                setAppContext((MenuComponent)target, context);
-        } else {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Returns the appContext field for target. If target is not a
-     * Component or MenuComponent this returns null.
-     */
-    private static AppContext getAppContext(Object target) {
-        if (target instanceof Component) {
-            return AWTAccessor.getComponentAccessor().
-                       getAppContext((Component)target);
-        } else if (target instanceof MenuComponent) {
-            return AWTAccessor.getMenuComponentAccessor().
-                       getAppContext((MenuComponent)target);
-        } else {
-            return null;
-        }
-    }
-
-    /*
-     * Fetch the AppContext associated with the given target.
-     * This can be used to determine things like which EventQueue
-     * to use for posting events to a Component.  If the target is
-     * null or the target can't be found, a null with be returned.
-     */
-    public static AppContext targetToAppContext(Object target) {
-        if (target == null || GraphicsEnvironment.isHeadless()) {
-            return null;
-        }
-        AppContext context = getAppContext(target);
-        if (context == null) {
-            // target is not a Component/MenuComponent, try the
-            // appContextMap.
-            context = (AppContext)appContextMap.get(target);
-        }
-        return context;
-    }
-
-     /**
-      * Sets the synchronous status of focus requests on lightweight
-      * components in the specified window to the specified value.
-      * If the boolean parameter is <code>true</code> then the focus
-      * requests on lightweight components will be performed
-      * synchronously, if it is <code>false</code>, then asynchronously.
-      * By default, all windows have their lightweight request status
-      * set to asynchronous.
-      * <p>
-      * The application can only set the status of lightweight focus
-      * requests to synchronous for any of its windows if it doesn't
-      * perform focus transfers between different heavyweight containers.
-      * In this case the observable focus behaviour is the same as with
-      * asynchronous status.
-      * <p>
-      * If the application performs focus transfer between different
-      * heavyweight containers and sets the lightweight focus request
-      * status to synchronous for any of its windows, then further focus
-      * behaviour is unspecified.
-      * <p>
-      * @param    w window for which the lightweight focus request status
-      *             should be set
-      * @param    status the value of lightweight focus request status
-      */
-
-    public static void setLWRequestStatus(Window changed,boolean status){
-        AWTAccessor.getWindowAccessor().setLWRequestStatus(changed, status);
-    };
-
-    public static void checkAndSetPolicy(Container cont) {
-        FocusTraversalPolicy defaultPolicy = KeyboardFocusManager.
-            getCurrentKeyboardFocusManager().
-                getDefaultFocusTraversalPolicy();
-
-        cont.setFocusTraversalPolicy(defaultPolicy);
-    }
-
-    private static FocusTraversalPolicy createLayoutPolicy() {
-        FocusTraversalPolicy policy = null;
-        try {
-            Class layoutPolicyClass =
-                Class.forName("javax.swing.LayoutFocusTraversalPolicy");
-            policy = (FocusTraversalPolicy) layoutPolicyClass.newInstance();
-        }
-        catch (ClassNotFoundException e) {
-            assert false;
-        }
-        catch (InstantiationException e) {
-            assert false;
-        }
-        catch (IllegalAccessException e) {
-            assert false;
-        }
-
-        return policy;
-    }
-
-    /*
-     * Insert a mapping from target to AppContext, for later retrieval
-     * via targetToAppContext() above.
-     */
-    public static void insertTargetMapping(Object target, AppContext appContext) {
-        if (!GraphicsEnvironment.isHeadless()) {
-            if (!setAppContext(target, appContext)) {
-                // Target is not a Component/MenuComponent, use the private Map
-                // instead.
-                appContextMap.put(target, appContext);
-            }
-        }
-    }
-
-    /*
-     * Post an AWTEvent to the Java EventQueue, using the PostEventQueue
-     * to avoid possibly calling client code (EventQueueSubclass.postEvent())
-     * on the toolkit (AWT-Windows/AWT-Motif) thread.  This function should
-     * not be called under another lock since it locks the EventQueue.
-     * See bugids 4632918, 4526597.
-     */
-    public static void postEvent(AppContext appContext, AWTEvent event) {
-        if (event == null) {
-            throw new NullPointerException();
-        }
-        // All events posted via this method are system-generated.
-        // Placing the following call here reduces considerably the
-        // number of places throughout the toolkit that would
-        // otherwise have to be modified to precisely identify
-        // system-generated events.
-        setSystemGenerated(event);
-        PostEventQueue postEventQueue =
-            (PostEventQueue)appContext.get(POST_EVENT_QUEUE_KEY);
-        if (postEventQueue != null) {
-            postEventQueue.postEvent(event);
-        }
-    }
-
-    /*
-     * Post AWTEvent of high priority.
-     */
-    public static void postPriorityEvent(final AWTEvent e) {
-        PeerEvent pe = new PeerEvent(Toolkit.getDefaultToolkit(), new Runnable() {
-                public void run() {
-                    AWTAccessor.getAWTEventAccessor().setPosted(e);
-                    ((Component)e.getSource()).dispatchEvent(e);
-                }
-            }, PeerEvent.ULTIMATE_PRIORITY_EVENT);
-        postEvent(targetToAppContext(e.getSource()), pe);
-    }
-
-    protected static final Lock flushLock = new ReentrantLock();
-    private static boolean isFlushingPendingEvents = false;
-
-    /*
-     * Flush any pending events which haven't been posted to the AWT
-     * EventQueue yet.
-     */
-    public static void flushPendingEvents()  {
-        AppContext appContext = AppContext.getAppContext();
-        flushPendingEvents(appContext);
-    }
-
-    public static void flushPendingEvents(AppContext appContext)  {
-        flushLock.lock();
-        try {
-            // Don't call flushPendingEvents() recursively
-            if (!isFlushingPendingEvents) {
-                isFlushingPendingEvents = true;
-                try {
-                    PostEventQueue postEventQueue =
-                        (PostEventQueue)appContext.get(POST_EVENT_QUEUE_KEY);
-                    if (postEventQueue != null) {
-                        postEventQueue.flush();
-                    }
-                }
-                finally {
-                    isFlushingPendingEvents = false;
-                }
-            }
-        } finally {
-            flushLock.unlock();
-        }
-    }
-
-    public static boolean isPostEventQueueEmpty()  {
-        AppContext appContext = AppContext.getAppContext();
-        PostEventQueue postEventQueue =
-            (PostEventQueue)appContext.get(POST_EVENT_QUEUE_KEY);
-        if (postEventQueue != null) {
-            return postEventQueue.noEvents();
-        } else {
-            return true;
-        }
-    }
-
-    /*
-     * Execute a chunk of code on the Java event handler thread for the
-     * given target.  Does not wait for the execution to occur before
-     * returning to the caller.
-     */
-    public static void executeOnEventHandlerThread(Object target,
-                                                   Runnable runnable) {
-        executeOnEventHandlerThread(new PeerEvent(target, runnable, PeerEvent.PRIORITY_EVENT));
-    }
-
-    /*
-     * Fixed 5064013: the InvocationEvent time should be equals
-     * the time of the ActionEvent
-     */
-    public static void executeOnEventHandlerThread(Object target,
-                                                   Runnable runnable,
-                                                   final long when) {
-        executeOnEventHandlerThread(new PeerEvent(target, runnable, PeerEvent.PRIORITY_EVENT){
-                public long getWhen(){
-                    return when;
-                }
-            });
-    }
-
-    /*
-     * Execute a chunk of code on the Java event handler thread for the
-     * given target.  Does not wait for the execution to occur before
-     * returning to the caller.
-     */
-    public static void executeOnEventHandlerThread(PeerEvent peerEvent) {
-        postEvent(targetToAppContext(peerEvent.getSource()), peerEvent);
-    }
-
-    /*
-     * Execute a chunk of code on the Java event handler thread. The
-     * method takes into account provided AppContext and sets
-     * <code>SunToolkit.getDefaultToolkit()</code> as a target of the
-     * event. See 6451487 for detailes.
-     * Does not wait for the execution to occur before returning to
-     * the caller.
-     */
-     public static void invokeLaterOnAppContext(
-        AppContext appContext, Runnable dispatcher)
-     {
-        postEvent(appContext,
-            new PeerEvent(Toolkit.getDefaultToolkit(), dispatcher,
-                PeerEvent.PRIORITY_EVENT));
-     }
-
-    /*
-     * Execute a chunk of code on the Java event handler thread for the
-     * given target.  Waits for the execution to occur before returning
-     * to the caller.
-     */
-    public static void executeOnEDTAndWait(Object target, Runnable runnable)
-        throws InterruptedException, InvocationTargetException
-    {
-        if (EventQueue.isDispatchThread()) {
-            throw new Error("Cannot call executeOnEDTAndWait from any event dispatcher thread");
-        }
-
-        class AWTInvocationLock {}
-        Object lock = new AWTInvocationLock();
-
-        PeerEvent event = new PeerEvent(target, runnable, lock, true, PeerEvent.PRIORITY_EVENT);
-
-        synchronized (lock) {
-            executeOnEventHandlerThread(event);
-            while(!event.isDispatched()) {
-                lock.wait();
-            }
-        }
-
-        Throwable eventThrowable = event.getThrowable();
-        if (eventThrowable != null) {
-            throw new InvocationTargetException(eventThrowable);
-        }
-    }
-
-    /*
-     * Returns true if the calling thread is the event dispatch thread
-     * contained within AppContext which associated with the given target.
-     * Use this call to ensure that a given task is being executed
-     * (or not being) on the event dispatch thread for the given target.
-     */
-    public static boolean isDispatchThreadForAppContext(Object target) {
-        AppContext appContext = targetToAppContext(target);
-        EventQueue eq = (EventQueue)appContext.get(AppContext.EVENT_QUEUE_KEY);
-
-        AWTAccessor.EventQueueAccessor accessor = AWTAccessor.getEventQueueAccessor();
-        return accessor.isDispatchThreadImpl(eq);
-    }
-
-    public Dimension getScreenSize() {
-        return new Dimension(getScreenWidth(), getScreenHeight());
-    }
-    protected abstract int getScreenWidth();
-    protected abstract int getScreenHeight();
-
-    public String[] getFontList() {
-        String[] hardwiredFontList = {
-            Font.DIALOG, Font.SANS_SERIF, Font.SERIF, Font.MONOSPACED,
-            Font.DIALOG_INPUT
-
-            // -- Obsolete font names from 1.0.2.  It was decided that
-            // -- getFontList should not return these old names:
-            //    "Helvetica", "TimesRoman", "Courier", "ZapfDingbats"
-        };
-        return hardwiredFontList;
-    }
-
-    public PanelPeer createPanel(Panel target) {
-        return (PanelPeer)createComponent(target);
-    }
-
-    public CanvasPeer createCanvas(Canvas target) {
-        return (CanvasPeer)createComponent(target);
-    }
-
-    /**
-     * Disables erasing of background on the canvas before painting if
-     * this is supported by the current toolkit. It is recommended to
-     * call this method early, before the Canvas becomes displayable,
-     * because some Toolkit implementations do not support changing
-     * this property once the Canvas becomes displayable.
-     */
-    public void disableBackgroundErase(Canvas canvas) {
-        disableBackgroundEraseImpl(canvas);
-    }
-
-    /**
-     * Disables the native erasing of the background on the given
-     * component before painting if this is supported by the current
-     * toolkit. This only has an effect for certain components such as
-     * Canvas, Panel and Window. It is recommended to call this method
-     * early, before the Component becomes displayable, because some
-     * Toolkit implementations do not support changing this property
-     * once the Component becomes displayable.
-     */
-    public void disableBackgroundErase(Component component) {
-        disableBackgroundEraseImpl(component);
-    }
-
-    private void disableBackgroundEraseImpl(Component component) {
-        AWTAccessor.getComponentAccessor().setBackgroundEraseDisabled(component, true);
-    }
-
-    /**
-     * Returns the value of "sun.awt.noerasebackground" property. Default
-     * value is {@code false}.
-     */
-    public static boolean getSunAwtNoerasebackground() {
-        return AccessController.doPrivileged(new GetBooleanAction("sun.awt.noerasebackground"));
-    }
-
-    /**
-     * Returns the value of "sun.awt.erasebackgroundonresize" property. Default
-     * value is {@code false}.
-     */
-    public static boolean getSunAwtErasebackgroundonresize() {
-        return AccessController.doPrivileged(new GetBooleanAction("sun.awt.erasebackgroundonresize"));
-    }
-
-    public Image createImage(ImageProducer producer) {
-        return new ToolkitImage(producer);
-    }
-
-    public int checkImage(Image img, int w, int h, ImageObserver o) {
-        if (!(img instanceof ToolkitImage)) {
-            return ImageObserver.ALLBITS;
-        }
-
-        ToolkitImage tkimg = (ToolkitImage)img;
-        int repbits;
-        if (w == 0 || h == 0) {
-            repbits = ImageObserver.ALLBITS;
-        } else {
-            repbits = tkimg.getImageRep().check(o);
-        }
-        return tkimg.check(o) | repbits;
-    }
-
-    public boolean prepareImage(Image img, int w, int h, ImageObserver o) {
-        if (w == 0 || h == 0) {
-            return true;
-        }
-
-        // Must be a ToolkitImage
-        if (!(img instanceof ToolkitImage)) {
-            return true;
-        }
-
-        ToolkitImage tkimg = (ToolkitImage)img;
-        if (tkimg.hasError()) {
-            if (o != null) {
-                o.imageUpdate(img, ImageObserver.ERROR|ImageObserver.ABORT,
-                              -1, -1, -1, -1);
-            }
-            return false;
-        }
-        ImageRepresentation ir = tkimg.getImageRep();
-        return ir.prepare(o);
-    }
-
-    /**
-     * Scans {@code imageList} for best-looking image of specified dimensions.
-     * Image can be scaled and/or padded with transparency.
-     */
-    public static BufferedImage getScaledIconImage(java.util.List<Image> imageList, int width, int height) {
-        if (width == 0 || height == 0) {
-            return null;
-        }
-        Image bestImage = null;
-        int bestWidth = 0;
-        int bestHeight = 0;
-        double bestSimilarity = 3; //Impossibly high value
-        double bestScaleFactor = 0;
-        for (Iterator<Image> i = imageList.iterator();i.hasNext();) {
-            //Iterate imageList looking for best matching image.
-            //'Similarity' measure is defined as good scale factor and small insets.
-            //best possible similarity is 0 (no scale, no insets).
-            //It's found while the experiments that good-looking result is achieved
-            //with scale factors x1, x3/4, x2/3, xN, x1/N.
-            Image im = i.next();
-            if (im == null) {
-                continue;
-            }
-            if (im instanceof ToolkitImage) {
-                ImageRepresentation ir = ((ToolkitImage)im).getImageRep();
-                ir.reconstruct(ImageObserver.ALLBITS);
-            }
-            int iw;
-            int ih;
-            try {
-                iw = im.getWidth(null);
-                ih = im.getHeight(null);
-            } catch (Exception e){
-                continue;
-            }
-            if (iw > 0 && ih > 0) {
-                //Calc scale factor
-                double scaleFactor = Math.min((double)width / (double)iw,
-                                              (double)height / (double)ih);
-                //Calculate scaled image dimensions
-                //adjusting scale factor to nearest "good" value
-                int adjw = 0;
-                int adjh = 0;
-                double scaleMeasure = 1; //0 - best (no) scale, 1 - impossibly bad
-                if (scaleFactor >= 2) {
-                    //Need to enlarge image more than twice
-                    //Round down scale factor to multiply by integer value
-                    scaleFactor = Math.floor(scaleFactor);
-                    adjw = iw * (int)scaleFactor;
-                    adjh = ih * (int)scaleFactor;
-                    scaleMeasure = 1.0 - 0.5 / scaleFactor;
-                } else if (scaleFactor >= 1) {
-                    //Don't scale
-                    scaleFactor = 1.0;
-                    adjw = iw;
-                    adjh = ih;
-                    scaleMeasure = 0;
-                } else if (scaleFactor >= 0.75) {
-                    //Multiply by 3/4
-                    scaleFactor = 0.75;
-                    adjw = iw * 3 / 4;
-                    adjh = ih * 3 / 4;
-                    scaleMeasure = 0.3;
-                } else if (scaleFactor >= 0.6666) {
-                    //Multiply by 2/3
-                    scaleFactor = 0.6666;
-                    adjw = iw * 2 / 3;
-                    adjh = ih * 2 / 3;
-                    scaleMeasure = 0.33;
-                } else {
-                    //Multiply size by 1/scaleDivider
-                    //where scaleDivider is minimum possible integer
-                    //larger than 1/scaleFactor
-                    double scaleDivider = Math.ceil(1.0 / scaleFactor);
-                    scaleFactor = 1.0 / scaleDivider;
-                    adjw = (int)Math.round((double)iw / scaleDivider);
-                    adjh = (int)Math.round((double)ih / scaleDivider);
-                    scaleMeasure = 1.0 - 1.0 / scaleDivider;
-                }
-                double similarity = ((double)width - (double)adjw) / (double)width +
-                    ((double)height - (double)adjh) / (double)height + //Large padding is bad
-                    scaleMeasure; //Large rescale is bad
-                if (similarity < bestSimilarity) {
-                    bestSimilarity = similarity;
-                    bestScaleFactor = scaleFactor;
-                    bestImage = im;
-                    bestWidth = adjw;
-                    bestHeight = adjh;
-                }
-                if (similarity == 0) break;
-            }
-        }
-        if (bestImage == null) {
-            //No images were found, possibly all are broken
-            return null;
-        }
-        BufferedImage bimage =
-            new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
-        Graphics2D g = bimage.createGraphics();
-        g.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
-                           RenderingHints.VALUE_INTERPOLATION_BILINEAR);
-        try {
-            int x = (width - bestWidth) / 2;
-            int y = (height - bestHeight) / 2;
-            g.drawImage(bestImage, x, y, bestWidth, bestHeight, null);
-        } finally {
-            g.dispose();
-        }
-        return bimage;
-    }
-
-    public static DataBufferInt getScaledIconData(java.util.List<Image> imageList, int width, int height) {
-        BufferedImage bimage = getScaledIconImage(imageList, width, height);
-        if (bimage == null) {
-            return null;
-        }
-        Raster raster = bimage.getRaster();
-        DataBuffer buffer = raster.getDataBuffer();
-        return (DataBufferInt)buffer;
-    }
-
-    protected EventQueue getSystemEventQueueImpl() {
-        return getSystemEventQueueImplPP();
-    }
-
-    // Package private implementation
-    static EventQueue getSystemEventQueueImplPP() {
-        return getSystemEventQueueImplPP(AppContext.getAppContext());
-    }
-
-    public static EventQueue getSystemEventQueueImplPP(AppContext appContext) {
-        EventQueue theEventQueue =
-            (EventQueue)appContext.get(AppContext.EVENT_QUEUE_KEY);
-        return theEventQueue;
-    }
-
-    /**
-     * Give native peers the ability to query the native container
-     * given a native component (eg the direct parent may be lightweight).
-     */
-    public static Container getNativeContainer(Component c) {
-        return Toolkit.getNativeContainer(c);
-    }
-
-    /**
-     * Gives native peers the ability to query the closest HW component.
-     * If the given component is heavyweight, then it returns this. Otherwise,
-     * it goes one level up in the hierarchy and tests next component.
-     */
-    public static Component getHeavyweightComponent(Component c) {
-        while (c != null && AWTAccessor.getComponentAccessor().isLightweight(c)) {
-            c = AWTAccessor.getComponentAccessor().getParent(c);
-        }
-        return c;
-    }
-
-    /**
-     * Returns key modifiers used by Swing to set up a focus accelerator key stroke.
-     */
-    public int getFocusAcceleratorKeyMask() {
-        return InputEvent.ALT_MASK;
-    }
-
-    /**
-     * Tests whether specified key modifiers mask can be used to enter a printable
-     * character. This is a default implementation of this method, which reflects
-     * the way things work on Windows: here, pressing ctrl + alt allows user to enter
-     * characters from the extended character set (like euro sign or math symbols)
-     */
-    public boolean isPrintableCharacterModifiersMask(int mods) {
-        return ((mods & InputEvent.ALT_MASK) == (mods & InputEvent.CTRL_MASK));
-    }
-
-    /**
-     * Returns whether popup is allowed to be shown above the task bar.
-     * This is a default implementation of this method, which checks
-     * corresponding security permission.
-     */
-    public boolean canPopupOverlapTaskBar() {
-        boolean result = true;
-        try {
-            SecurityManager sm = System.getSecurityManager();
-            if (sm != null) {
-                sm.checkPermission(
-                        SecurityConstants.AWT.SET_WINDOW_ALWAYS_ON_TOP_PERMISSION);
-            }
-        } catch (SecurityException se) {
-            // There is no permission to show popups over the task bar
-            result = false;
-        }
-        return result;
-    }
-
-    /**
-     * Returns whether enableInputMethods should be set to true for peered
-     * TextComponent instances on this platform. False by default.
-     */
-    public boolean enableInputMethodsForTextComponent() {
-        return false;
-    }
-
-    private static Locale startupLocale = null;
-
-    /**
-     * Returns the locale in which the runtime was started.
-     */
-    public static Locale getStartupLocale() {
-        if (startupLocale == null) {
-            String language, region, country, variant;
-            language = (String) AccessController.doPrivileged(
-                            new GetPropertyAction("user.language", "en"));
-            // for compatibility, check for old user.region property
-            region = (String) AccessController.doPrivileged(
-                            new GetPropertyAction("user.region"));
-            if (region != null) {
-                // region can be of form country, country_variant, or _variant
-                int i = region.indexOf('_');
-                if (i >= 0) {
-                    country = region.substring(0, i);
-                    variant = region.substring(i + 1);
-                } else {
-                    country = region;
-                    variant = "";
-                }
-            } else {
-                country = (String) AccessController.doPrivileged(
-                                new GetPropertyAction("user.country", ""));
-                variant = (String) AccessController.doPrivileged(
-                                new GetPropertyAction("user.variant", ""));
-            }
-            startupLocale = new Locale(language, country, variant);
-        }
-        return startupLocale;
-    }
-
-    /**
-     * Returns the default keyboard locale of the underlying operating system
-     */
-    public Locale getDefaultKeyboardLocale() {
-        return getStartupLocale();
-    }
-
-    private static String dataTransfererClassName = null;
-
-    protected static void setDataTransfererClassName(String className) {
-        dataTransfererClassName = className;
-    }
-
-    public static String getDataTransfererClassName() {
-        if (dataTransfererClassName == null) {
-            Toolkit.getDefaultToolkit(); // transferer set during toolkit init
-        }
-        return dataTransfererClassName;
-    }
-
-    // Support for window closing event notifications
-    private transient WindowClosingListener windowClosingListener = null;
-    /**
-     * @see sun.awt.WindowClosingSupport#getWindowClosingListener
-     */
-    public WindowClosingListener getWindowClosingListener() {
-        return windowClosingListener;
-    }
-    /**
-     * @see sun.awt.WindowClosingSupport#setWindowClosingListener
-     */
-    public void setWindowClosingListener(WindowClosingListener wcl) {
-        windowClosingListener = wcl;
-    }
-
-    /**
-     * @see sun.awt.WindowClosingListener#windowClosingNotify
-     */
-    public RuntimeException windowClosingNotify(WindowEvent event) {
-        if (windowClosingListener != null) {
-            return windowClosingListener.windowClosingNotify(event);
-        } else {
-            return null;
-        }
-    }
-    /**
-     * @see sun.awt.WindowClosingListener#windowClosingDelivered
-     */
-    public RuntimeException windowClosingDelivered(WindowEvent event) {
-        if (windowClosingListener != null) {
-            return windowClosingListener.windowClosingDelivered(event);
-        } else {
-            return null;
-        }
-    }
-
-
-
-    /**
-     * Returns whether default toolkit needs the support of the xembed
-     * from embedding host(if any).
-     * @return <code>true</code>, if XEmbed is needed, <code>false</code> otherwise
-     */
-    public static boolean needsXEmbed() {
-        String noxembed = (String) AccessController.
-            doPrivileged(new GetPropertyAction("sun.awt.noxembed", "false"));
-        if ("true".equals(noxembed)) {
-            return false;
-        }
-
-        Toolkit tk = Toolkit.getDefaultToolkit();
-        if (tk instanceof SunToolkit) {
-            // SunToolkit descendants should override this method to specify
-            // concrete behavior
-            return ((SunToolkit)tk).needsXEmbedImpl();
-        } else {
-            // Non-SunToolkit doubtly might support XEmbed
-            return false;
-        }
-    }
-
-    /**
-     * Returns whether this toolkit needs the support of the xembed
-     * from embedding host(if any).
-     * @return <code>true</code>, if XEmbed is needed, <code>false</code> otherwise
-     */
-    protected boolean needsXEmbedImpl() {
-        return false;
-    }
-
-    private static Dialog.ModalExclusionType DEFAULT_MODAL_EXCLUSION_TYPE = null;
-
-    /**
-     * Returns whether the XEmbed server feature is requested by
-     * developer.  If true, Toolkit should return an
-     * XEmbed-server-enabled CanvasPeer instead of the ordinary CanvasPeer.
-     */
-    protected final boolean isXEmbedServerRequested() {
-        return AccessController.doPrivileged(new GetBooleanAction("sun.awt.xembedserver"));
-    }
-
-    /**
-     * Returns whether the modal exclusion API is supported by the current toolkit.
-     * When it isn't supported, calling <code>setModalExcluded</code> has no
-     * effect, and <code>isModalExcluded</code> returns false for all windows.
-     *
-     * @return true if modal exclusion is supported by the toolkit, false otherwise
-     *
-     * @see sun.awt.SunToolkit#setModalExcluded(java.awt.Window)
-     * @see sun.awt.SunToolkit#isModalExcluded(java.awt.Window)
-     *
-     * @since 1.5
-     */
-    public static boolean isModalExcludedSupported()
-    {
-        Toolkit tk = Toolkit.getDefaultToolkit();
-        return tk.isModalExclusionTypeSupported(DEFAULT_MODAL_EXCLUSION_TYPE);
-    }
-    /*
-     * Default implementation for isModalExcludedSupportedImpl(), returns false.
-     *
-     * @see sun.awt.windows.WToolkit#isModalExcludeSupportedImpl
-     * @see sun.awt.X11.XToolkit#isModalExcludeSupportedImpl
-     *
-     * @since 1.5
-     */
-    protected boolean isModalExcludedSupportedImpl()
-    {
-        return false;
-    }
-
-    /*
-     * Sets this window to be excluded from being modally blocked. When the
-     * toolkit supports modal exclusion and this method is called, input
-     * events, focus transfer and z-order will continue to work for the
-     * window, it's owned windows and child components, even in the
-     * presence of a modal dialog.
-     * For details on which <code>Window</code>s are normally blocked
-     * by modal dialog, see {@link java.awt.Dialog}.
-     * Invoking this method when the modal exclusion API is not supported by
-     * the current toolkit has no effect.
-     * @param window Window to be marked as not modally blocked
-     * @see java.awt.Dialog
-     * @see java.awt.Dialog#setModal(boolean)
-     * @see sun.awt.SunToolkit#isModalExcludedSupported
-     * @see sun.awt.SunToolkit#isModalExcluded(java.awt.Window)
-     */
-    public static void setModalExcluded(Window window)
-    {
-        if (DEFAULT_MODAL_EXCLUSION_TYPE == null) {
-            DEFAULT_MODAL_EXCLUSION_TYPE = Dialog.ModalExclusionType.APPLICATION_EXCLUDE;
-        }
-        window.setModalExclusionType(DEFAULT_MODAL_EXCLUSION_TYPE);
-    }
-
-    /*
-     * Returns whether the specified window is blocked by modal dialogs.
-     * If the modal exclusion API isn't supported by the current toolkit,
-     * it returns false for all windows.
-     *
-     * @param window Window to test for modal exclusion
-     *
-     * @return true if the window is modal excluded, false otherwise. If
-     * the modal exclusion isn't supported by the current Toolkit, false
-     * is returned
-     *
-     * @see sun.awt.SunToolkit#isModalExcludedSupported
-     * @see sun.awt.SunToolkit#setModalExcluded(java.awt.Window)
-     *
-     * @since 1.5
-     */
-    public static boolean isModalExcluded(Window window)
-    {
-        if (DEFAULT_MODAL_EXCLUSION_TYPE == null) {
-            DEFAULT_MODAL_EXCLUSION_TYPE = Dialog.ModalExclusionType.APPLICATION_EXCLUDE;
-        }
-        return window.getModalExclusionType().compareTo(DEFAULT_MODAL_EXCLUSION_TYPE) >= 0;
-    }
-
-    /**
-     * Overridden in XToolkit and WToolkit
-     */
-    public boolean isModalityTypeSupported(Dialog.ModalityType modalityType) {
-        return (modalityType == Dialog.ModalityType.MODELESS) ||
-               (modalityType == Dialog.ModalityType.APPLICATION_MODAL);
-    }
-
-    /**
-     * Overridden in XToolkit and WToolkit
-     */
-    public boolean isModalExclusionTypeSupported(Dialog.ModalExclusionType exclusionType) {
-        return (exclusionType == Dialog.ModalExclusionType.NO_EXCLUDE);
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // The following is used by the Java Plug-in to coordinate dialog modality
-    // between containing applications (browsers, ActiveX containers etc) and
-    // the AWT.
-    //
-    ///////////////////////////////////////////////////////////////////////////
-
-    private ModalityListenerList modalityListeners = new ModalityListenerList();
-
-    public void addModalityListener(ModalityListener listener) {
-        modalityListeners.add(listener);
-    }
-
-    public void removeModalityListener(ModalityListener listener) {
-        modalityListeners.remove(listener);
-    }
-
-    public void notifyModalityPushed(Dialog dialog) {
-        notifyModalityChange(ModalityEvent.MODALITY_PUSHED, dialog);
-    }
-
-    public void notifyModalityPopped(Dialog dialog) {
-        notifyModalityChange(ModalityEvent.MODALITY_POPPED, dialog);
-    }
-
-    final void notifyModalityChange(int id, Dialog source) {
-        ModalityEvent ev = new ModalityEvent(source, modalityListeners, id);
-        ev.dispatch();
-    }
-
-    static class ModalityListenerList implements ModalityListener {
-
-        Vector<ModalityListener> listeners = new Vector<ModalityListener>();
-
-        void add(ModalityListener listener) {
-            listeners.addElement(listener);
-        }
-
-        void remove(ModalityListener listener) {
-            listeners.removeElement(listener);
-        }
-
-        public void modalityPushed(ModalityEvent ev) {
-            Iterator<ModalityListener> it = listeners.iterator();
-            while (it.hasNext()) {
-                it.next().modalityPushed(ev);
-            }
-        }
-
-        public void modalityPopped(ModalityEvent ev) {
-            Iterator<ModalityListener> it = listeners.iterator();
-            while (it.hasNext()) {
-                it.next().modalityPopped(ev);
-            }
-        }
-    } // end of class ModalityListenerList
-
-    ///////////////////////////////////////////////////////////////////////////
-    // End Plug-in code
-    ///////////////////////////////////////////////////////////////////////////
-
-    public static boolean isLightweightOrUnknown(Component comp) {
-        if (comp.isLightweight()
-            || !(getDefaultToolkit() instanceof SunToolkit))
-        {
-            return true;
-        }
-        return !(comp instanceof Button
-            || comp instanceof Canvas
-            || comp instanceof Checkbox
-            || comp instanceof Choice
-            || comp instanceof Label
-            || comp instanceof java.awt.List
-            || comp instanceof Panel
-            || comp instanceof Scrollbar
-            || comp instanceof ScrollPane
-            || comp instanceof TextArea
-            || comp instanceof TextField
-            || comp instanceof Window);
-    }
-
-    public static Method getMethod(final Class clz, final String methodName, final Class[] params) {
-        Method res = null;
-        try {
-            res = AccessController.doPrivileged(new PrivilegedExceptionAction<Method>() {
-                    public Method run() throws Exception {
-                        Method m = clz.getDeclaredMethod(methodName, params);
-                        m.setAccessible(true);
-                        return m;
-                    }
-                });
-        } catch (PrivilegedActionException ex) {
-            ex.printStackTrace();
-        }
-        return res;
-    }
-
-    public static class OperationTimedOut extends RuntimeException {
-        public OperationTimedOut(String msg) {
-            super(msg);
-        }
-        public OperationTimedOut() {
-        }
-    }
-    public static class InfiniteLoop extends RuntimeException {
-    }
-
-    public static class IllegalThreadException extends RuntimeException {
-        public IllegalThreadException(String msg) {
-            super(msg);
-        }
-        public IllegalThreadException() {
-        }
-    }
-
-    public static final int DEFAULT_WAIT_TIME = 10000;
-    private static final int MAX_ITERS = 20;
-    private static final int MIN_ITERS = 0;
-    private static final int MINIMAL_EDELAY = 0;
-
-    /**
-     * Parameterless version of realsync which uses default timout (see DEFAUL_WAIT_TIME).
-     */
-    public void realSync() throws OperationTimedOut, InfiniteLoop {
-        realSync(DEFAULT_WAIT_TIME);
-    }
-
-    /**
-     * Forces toolkit to synchronize with the native windowing
-     * sub-system, flushing all pending work and waiting for all the
-     * events to be processed.  This method guarantees that after
-     * return no additional Java events will be generated, unless
-     * cause by user. Obviously, the method cannot be used on the
-     * event dispatch thread (EDT). In case it nevertheless gets
-     * invoked on this thread, the method throws the
-     * IllegalThreadException runtime exception.
-     *
-     * <p> This method allows to write tests without explicit timeouts
-     * or wait for some event.  Example:
-     * <code>
-     * Frame f = ...;
-     * f.setVisible(true);
-     * ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
-     * </code>
-     *
-     * <p> After realSync, <code>f</code> will be completely visible
-     * on the screen, its getLocationOnScreen will be returning the
-     * right result and it will be the focus owner.
-     *
-     * <p> Another example:
-     * <code>
-     * b.requestFocus();
-     * ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
-     * </code>
-     *
-     * <p> After realSync, <code>b</code> will be focus owner.
-     *
-     * <p> Notice that realSync isn't guaranteed to work if recurring
-     * actions occur, such as if during processing of some event
-     * another request which may generate some events occurs.  By
-     * default, sync tries to perform as much as {@value MAX_ITERS}
-     * cycles of event processing, allowing for roughly {@value
-     * MAX_ITERS} additional requests.
-     *
-     * <p> For example, requestFocus() generates native request, which
-     * generates one or two Java focus events, which then generate a
-     * serie of paint events, a serie of Java focus events, which then
-     * generate a serie of paint events which then are processed -
-     * three cycles, minimum.
-     *
-     * @param timeout the maximum time to wait in milliseconds, negative means "forever".
-     */
-    public void realSync(final long timeout) throws OperationTimedOut, InfiniteLoop
-    {
-        if (EventQueue.isDispatchThread()) {
-            throw new IllegalThreadException("The SunToolkit.realSync() method cannot be used on the event dispatch thread (EDT).");
-        }
-        int bigLoop = 0;
-        do {
-            // Let's do sync first
-            sync();
-
-            // During the wait process, when we were processing incoming
-            // events, we could have made some new request, which can
-            // generate new events.  Example: MapNotify/XSetInputFocus.
-            // Therefore, we dispatch them as long as there is something
-            // to dispatch.
-            int iters = 0;
-            while (iters < MIN_ITERS) {
-                syncNativeQueue(timeout);
-                iters++;
-            }
-            while (syncNativeQueue(timeout) && iters < MAX_ITERS) {
-                iters++;
-            }
-            if (iters >= MAX_ITERS) {
-                throw new InfiniteLoop();
-            }
-
-            // native requests were dispatched by X/Window Manager or Windows
-            // Moreover, we processed them all on Toolkit thread
-            // Now wait while EDT processes them.
-            //
-            // During processing of some events (focus, for example),
-            // some other events could have been generated.  So, after
-            // waitForIdle, we may end up with full EventQueue
-            iters = 0;
-            while (iters < MIN_ITERS) {
-                waitForIdle(timeout);
-                iters++;
-            }
-            while (waitForIdle(timeout) && iters < MAX_ITERS) {
-                iters++;
-            }
-            if (iters >= MAX_ITERS) {
-                throw new InfiniteLoop();
-            }
-
-            bigLoop++;
-            // Again, for Java events, it was simple to check for new Java
-            // events by checking event queue, but what if Java events
-            // resulted in native requests?  Therefor, check native events again.
-        } while ((syncNativeQueue(timeout) || waitForIdle(timeout)) && bigLoop < MAX_ITERS);
-    }
-
-    /**
-     * Platform toolkits need to implement this method to perform the
-     * sync of the native queue.  The method should wait until native
-     * requests are processed, all native events are processed and
-     * corresponding Java events are generated.  Should return
-     * <code>true</code> if some events were processed,
-     * <code>false</code> otherwise.
-     */
-    protected abstract boolean syncNativeQueue(final long timeout);
-
-    private boolean eventDispatched = false;
-    private boolean queueEmpty = false;
-    private final Object waitLock = "Wait Lock";
-
-    static Method eqNoEvents;
-
-    private boolean isEQEmpty() {
-        EventQueue queue = getSystemEventQueueImpl();
-        synchronized(SunToolkit.class) {
-            if (eqNoEvents == null) {
-                eqNoEvents = getMethod(java.awt.EventQueue.class, "noEvents", null);
-            }
-        }
-        try {
-            return (Boolean)eqNoEvents.invoke(queue);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    /**
-     * Waits for the Java event queue to empty.  Ensures that all
-     * events are processed (including paint events), and that if
-     * recursive events were generated, they are also processed.
-     * Should return <code>true</code> if more processing is
-     * necessary, <code>false</code> otherwise.
-     */
-    protected final boolean waitForIdle(final long timeout) {
-        flushPendingEvents();
-        boolean queueWasEmpty = isEQEmpty();
-        queueEmpty = false;
-        eventDispatched = false;
-        synchronized(waitLock) {
-            postEvent(AppContext.getAppContext(),
-                      new PeerEvent(getSystemEventQueueImpl(), null, PeerEvent.LOW_PRIORITY_EVENT) {
-                          public void dispatch() {
-                              // Here we block EDT.  It could have some
-                              // events, it should have dispatched them by
-                              // now.  So native requests could have been
-                              // generated.  First, dispatch them.  Then,
-                              // flush Java events again.
-                              int iters = 0;
-                              while (iters < MIN_ITERS) {
-                                  syncNativeQueue(timeout);
-                                  iters++;
-                              }
-                              while (syncNativeQueue(timeout) && iters < MAX_ITERS) {
-                                  iters++;
-                              }
-                              flushPendingEvents();
-
-                              synchronized(waitLock) {
-                                  queueEmpty = isEQEmpty();
-                                  eventDispatched = true;
-                                  waitLock.notifyAll();
-                              }
-                          }
-                      });
-            try {
-                while (!eventDispatched) {
-                    waitLock.wait();
-                }
-            } catch (InterruptedException ie) {
-                return false;
-            }
-        }
-
-        try {
-            Thread.sleep(MINIMAL_EDELAY);
-        } catch (InterruptedException ie) {
-            throw new RuntimeException("Interrupted");
-        }
-
-        flushPendingEvents();
-
-        // Lock to force write-cache flush for queueEmpty.
-        synchronized (waitLock) {
-            return !(queueEmpty && isEQEmpty() && queueWasEmpty);
-        }
-    }
-
-    /**
-     * Grabs the mouse input for the given window.  The window must be
-     * visible.  The window or its children do not receive any
-     * additional mouse events besides those targeted to them.  All
-     * other events will be dispatched as before - to the respective
-     * targets.  This Window will receive UngrabEvent when automatic
-     * ungrab is about to happen.  The event can be listened to by
-     * installing AWTEventListener with WINDOW_EVENT_MASK.  See
-     * UngrabEvent class for the list of conditions when ungrab is
-     * about to happen.
-     * @see UngrabEvent
-     */
-    public abstract void grab(Window w);
-
-    /**
-     * Forces ungrab.  No event will be sent.
-     */
-    public abstract void ungrab(Window w);
-
-
-    /**
-     * Locates the splash screen library in a platform dependent way and closes
-     * the splash screen. Should be invoked on first top-level frame display.
-     * @see java.awt.SplashScreen
-     * @since 1.6
-     */
-    public static native void closeSplashScreen();
-
-    /* The following methods and variables are to support retrieving
-     * desktop text anti-aliasing settings
-     */
-
-    /* Need an instance method because setDesktopProperty(..) is protected. */
-    private void fireDesktopFontPropertyChanges() {
-        setDesktopProperty(SunToolkit.DESKTOPFONTHINTS,
-                           SunToolkit.getDesktopFontHints());
-    }
-
-    private static boolean checkedSystemAAFontSettings;
-    private static boolean useSystemAAFontSettings;
-    private static boolean lastExtraCondition = true;
-    private static RenderingHints desktopFontHints;
-
-    /* Since Swing is the reason for this "extra condition" logic its
-     * worth documenting it in some detail.
-     * First, a goal is for Swing and applications to both retrieve and
-     * use the same desktop property value so that there is complete
-     * consistency between the settings used by JDK's Swing implementation
-     * and 3rd party custom Swing components, custom L&Fs and any general
-     * text rendering that wants to be consistent with these.
-     * But by default on Solaris & Linux Swing will not use AA text over
-     * remote X11 display (unless Xrender can be used which is TBD and may not
-     * always be available anyway) as that is a noticeable performance hit.
-     * So there needs to be a way to express that extra condition so that
-     * it is seen by all clients of the desktop property API.
-     * If this were the only condition it could be handled here as it would
-     * be the same for any L&F and could reasonably be considered to be
-     * a static behaviour of those systems.
-     * But GTK currently has an additional test based on locale which is
-     * not applied by Metal. So mixing GTK in a few locales with Metal
-     * would mean the last one wins.
-     * This could be stored per-app context which would work
-     * for different applets, but wouldn't help for a single application
-     * using GTK and some other L&F concurrently.
-     * But it is expected this will be addressed within GTK and the font
-     * system so is a temporary and somewhat unlikely harmless corner case.
-     */
-    public static void setAAFontSettingsCondition(boolean extraCondition) {
-        if (extraCondition != lastExtraCondition) {
-            lastExtraCondition = extraCondition;
-            if (checkedSystemAAFontSettings) {
-                /* Someone already asked for this info, under a different
-                 * condition.
-                 * We'll force re-evaluation instead of replicating the
-                 * logic, then notify any listeners of any change.
-                 */
-                checkedSystemAAFontSettings = false;
-                Toolkit tk = Toolkit.getDefaultToolkit();
-                if (tk instanceof SunToolkit) {
-                     ((SunToolkit)tk).fireDesktopFontPropertyChanges();
-                }
-            }
-        }
-    }
-
-    /* "false", "off", ""default" aren't explicitly tested, they
-     * just fall through to produce a null return which all are equated to
-     * "false".
-     */
-    private static RenderingHints getDesktopAAHintsByName(String hintname) {
-        Object aaHint = null;
-        hintname = hintname.toLowerCase(Locale.ENGLISH);
-        if (hintname.equals("on")) {
-            aaHint = VALUE_TEXT_ANTIALIAS_ON;
-        } else if (hintname.equals("gasp")) {
-            aaHint = VALUE_TEXT_ANTIALIAS_GASP;
-        } else if (hintname.equals("lcd") || hintname.equals("lcd_hrgb")) {
-            aaHint = VALUE_TEXT_ANTIALIAS_LCD_HRGB;
-        } else if (hintname.equals("lcd_hbgr")) {
-            aaHint = VALUE_TEXT_ANTIALIAS_LCD_HBGR;
-        } else if (hintname.equals("lcd_vrgb")) {
-            aaHint = VALUE_TEXT_ANTIALIAS_LCD_VRGB;
-        } else if (hintname.equals("lcd_vbgr")) {
-            aaHint = VALUE_TEXT_ANTIALIAS_LCD_VBGR;
-        }
-        if (aaHint != null) {
-            RenderingHints map = new RenderingHints(null);
-            map.put(KEY_TEXT_ANTIALIASING, aaHint);
-            return map;
-        } else {
-            return null;
-        }
-    }
-
-    /* This method determines whether to use the system font settings,
-     * or ignore them if a L&F has specified they should be ignored, or
-     * to override both of these with a system property specified value.
-     * If the toolkit isn't a SunToolkit, (eg may be headless) then that
-     * system property isn't applied as desktop properties are considered
-     * to be inapplicable in that case. In that headless case although
-     * this method will return "true" the toolkit will return a null map.
-     */
-    private static boolean useSystemAAFontSettings() {
-        if (!checkedSystemAAFontSettings) {
-            useSystemAAFontSettings = true; /* initially set this true */
-            String systemAAFonts = null;
-            Toolkit tk = Toolkit.getDefaultToolkit();
-            if (tk instanceof SunToolkit) {
-                systemAAFonts =
-                    (String)AccessController.doPrivileged(
-                         new GetPropertyAction("awt.useSystemAAFontSettings"));
-            }
-            if (systemAAFonts != null) {
-                useSystemAAFontSettings =
-                    Boolean.valueOf(systemAAFonts).booleanValue();
-                /* If it is anything other than "true", then it may be
-                 * a hint name , or it may be "off, "default", etc.
-                 */
-                if (!useSystemAAFontSettings) {
-                    desktopFontHints = getDesktopAAHintsByName(systemAAFonts);
-                }
-            }
-            /* If its still true, apply the extra condition */
-            if (useSystemAAFontSettings) {
-                 useSystemAAFontSettings = lastExtraCondition;
-            }
-            checkedSystemAAFontSettings = true;
-        }
-        return useSystemAAFontSettings;
-    }
-
-    /* A variable defined for the convenience of JDK code */
-    public static final String DESKTOPFONTHINTS = "awt.font.desktophints";
-
-    /* Overridden by subclasses to return platform/desktop specific values */
-    protected RenderingHints getDesktopAAHints() {
-        return null;
-    }
-
-    /* Subclass desktop property loading methods call this which
-     * in turn calls the appropriate subclass implementation of
-     * getDesktopAAHints() when system settings are being used.
-     * Its public rather than protected because subclasses may delegate
-     * to a helper class.
-     */
-    public static RenderingHints getDesktopFontHints() {
-        if (useSystemAAFontSettings()) {
-             Toolkit tk = Toolkit.getDefaultToolkit();
-             if (tk instanceof SunToolkit) {
-                 Object map = ((SunToolkit)tk).getDesktopAAHints();
-                 return (RenderingHints)map;
-             } else { /* Headless Toolkit */
-                 return null;
-             }
-        } else if (desktopFontHints != null) {
-            /* cloning not necessary as the return value is cloned later, but
-             * its harmless.
-             */
-            return (RenderingHints)(desktopFontHints.clone());
-        } else {
-            return null;
-        }
-    }
-
-
-    public abstract boolean isDesktopSupported();
-
-    /*
-     * consumeNextKeyTyped() method is not currently used,
-     * however Swing could use it in the future.
-     */
-    private static Method consumeNextKeyTypedMethod = null;
-    public static synchronized void consumeNextKeyTyped(KeyEvent keyEvent) {
-        if (consumeNextKeyTypedMethod == null) {
-            consumeNextKeyTypedMethod = getMethod(DefaultKeyboardFocusManager.class,
-                                                  "consumeNextKeyTyped",
-                                                  new Class[] {KeyEvent.class});
-        }
-        try {
-            consumeNextKeyTypedMethod.invoke(KeyboardFocusManager.getCurrentKeyboardFocusManager(),
-                                             keyEvent);
-        } catch (IllegalAccessException iae) {
-            iae.printStackTrace();
-        } catch (InvocationTargetException ite) {
-            ite.printStackTrace();
-        }
-    }
-
-    protected static void dumpPeers(final PlatformLogger aLog) {
-        AWTAutoShutdown.getInstance().dumpPeers(aLog);
-    }
-
-    /**
-     * Returns the <code>Window</code> ancestor of the component <code>comp</code>.
-     * @return Window ancestor of the component or component by itself if it is Window;
-     *         null, if component is not a part of window hierarchy
-     */
-    public static Window getContainingWindow(Component comp) {
-        while (comp != null && !(comp instanceof Window)) {
-            comp = comp.getParent();
-        }
-        return (Window)comp;
-    }
-
-    private static Boolean sunAwtDisableMixing = null;
-
-    /**
-     * Returns the value of "sun.awt.disableMixing" property. Default
-     * value is {@code false}.
-     */
-    public synchronized static boolean getSunAwtDisableMixing() {
-        if (sunAwtDisableMixing == null) {
-            sunAwtDisableMixing = AccessController.doPrivileged(
-                                      new GetBooleanAction("sun.awt.disableMixing"));
-        }
-        return sunAwtDisableMixing.booleanValue();
-    }
-
-    /**
-     * Returns true if the native GTK libraries are available.  The
-     * default implementation returns false, but UNIXToolkit overrides this
-     * method to provide a more specific answer.
-     */
-    public boolean isNativeGTKAvailable() {
-        return false;
-    }
-
-    private static final Object DEACTIVATION_TIMES_MAP_KEY = new Object();
-
-    public synchronized void setWindowDeactivationTime(Window w, long time) {
-        AppContext ctx = getAppContext(w);
-        WeakHashMap<Window, Long> map = (WeakHashMap<Window, Long>)ctx.get(DEACTIVATION_TIMES_MAP_KEY);
-        if (map == null) {
-            map = new WeakHashMap<Window, Long>();
-            ctx.put(DEACTIVATION_TIMES_MAP_KEY, map);
-        }
-        map.put(w, time);
-    }
-
-    public synchronized long getWindowDeactivationTime(Window w) {
-        AppContext ctx = getAppContext(w);
-        WeakHashMap<Window, Long> map = (WeakHashMap<Window, Long>)ctx.get(DEACTIVATION_TIMES_MAP_KEY);
-        if (map == null) {
-            return -1;
-        }
-        Long time = map.get(w);
-        return time == null ? -1 : time;
-    }
-
-    // Cosntant alpha
-    public boolean isWindowOpacitySupported() {
-        return false;
-    }
-
-    // Shaping
-    public boolean isWindowShapingSupported() {
-        return false;
-    }
-
-    // Per-pixel alpha
-    public boolean isWindowTranslucencySupported() {
-        return false;
-    }
-
-    public boolean isTranslucencyCapable(GraphicsConfiguration gc) {
-        return false;
-    }
-
-    /**
-     * Returns true if swing backbuffer should be translucent.
-     */
-    public boolean isSwingBackbufferTranslucencySupported() {
-        return false;
-    }
-
-    /**
-     * Returns whether or not a containing top level window for the passed
-     * component is
-     * {@link GraphicsDevice.WindowTranslucency#PERPIXEL_TRANSLUCENT PERPIXEL_TRANSLUCENT}.
-     *
-     * @param c a Component which toplevel's to check
-     * @return {@code true}  if the passed component is not null and has a
-     * containing toplevel window which is opaque (so per-pixel translucency
-     * is not enabled), {@code false} otherwise
-     * @see GraphicsDevice.WindowTranslucency#PERPIXEL_TRANSLUCENT
-     */
-    public static boolean isContainingTopLevelOpaque(Component c) {
-        Window w = getContainingWindow(c);
-        return w != null && w.isOpaque();
-    }
-
-    /**
-     * Returns whether or not a containing top level window for the passed
-     * component is
-     * {@link GraphicsDevice.WindowTranslucency#TRANSLUCENT TRANSLUCENT}.
-     *
-     * @param c a Component which toplevel's to check
-     * @return {@code true} if the passed component is not null and has a
-     * containing toplevel window which has opacity less than
-     * 1.0f (which means that it is translucent), {@code false} otherwise
-     * @see GraphicsDevice.WindowTranslucency#TRANSLUCENT
-     */
-    public static boolean isContainingTopLevelTranslucent(Component c) {
-        Window w = getContainingWindow(c);
-        return w != null && ((Window)w).getOpacity() < 1.0f;
-    }
-
-    /**
-     * Returns whether the native system requires using the peer.updateWindow()
-     * method to update the contents of a non-opaque window, or if usual
-     * painting procedures are sufficient. The default return value covers
-     * the X11 systems. On MS Windows this method is overriden in WToolkit
-     * to return true.
-     */
-    public boolean needUpdateWindow() {
-        return false;
-    }
-
-    /**
-     * Descendants of the SunToolkit should override and put their own logic here.
-     */
-    public int getNumberOfButtons(){
-        return 3;
-    }
-
-    /**
-     * Checks that the given object implements/extends the given
-     * interface/class.
-     *
-     * Note that using the instanceof operator causes a class to be loaded.
-     * Using this method doesn't load a class and it can be used instead of
-     * the instanceof operator for performance reasons.
-     *
-     * @param obj Object to be checked
-     * @param type The name of the interface/class. Must be
-     * fully-qualified interface/class name.
-     * @return true, if this object implements/extends the given
-     *         interface/class, false, otherwise, or if obj or type is null
-     */
-    public static boolean isInstanceOf(Object obj, String type) {
-        if (obj == null) return false;
-        if (type == null) return false;
-
-        return isInstanceOf(obj.getClass(), type);
-    }
-
-    private static boolean isInstanceOf(Class cls, String type) {
-        if (cls == null) return false;
-
-        if (cls.getName().equals(type)) {
-            return true;
-        }
-
-        for (Class c : cls.getInterfaces()) {
-            if (c.getName().equals(type)) {
-                return true;
-            }
-        }
-        return isInstanceOf(cls.getSuperclass(), type);
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // The following methods help set and identify whether a particular
-    // AWTEvent object was produced by the system or by user code. As of this
-    // writing the only consumer is the Java Plug-In, although this information
-    // could be useful to more clients and probably should be formalized in
-    // the public API.
-    //
-    ///////////////////////////////////////////////////////////////////////////
-
-    public static void setSystemGenerated(AWTEvent e) {
-        AWTAccessor.getAWTEventAccessor().setSystemGenerated(e);
-    }
-
-    public static boolean isSystemGenerated(AWTEvent e) {
-        return AWTAccessor.getAWTEventAccessor().isSystemGenerated(e);
-    }
-
-} // class SunToolkit
-
-
-/*
- * PostEventQueue is a Thread that runs in the same AppContext as the
- * Java EventQueue.  It is a queue of AWTEvents to be posted to the
- * Java EventQueue.  The toolkit Thread (AWT-Windows/AWT-Motif) posts
- * events to this queue, which then calls EventQueue.postEvent().
- *
- * We do this because EventQueue.postEvent() may be overridden by client
- * code, and we mustn't ever call client code from the toolkit thread.
- */
-class PostEventQueue {
-    private EventQueueItem queueHead = null;
-    private EventQueueItem queueTail = null;
-    private final EventQueue eventQueue;
-
-    // For the case when queue is cleared but events are not posted
-    private volatile boolean isFlushing = false;
-
-    PostEventQueue(EventQueue eq) {
-        eventQueue = eq;
-    }
-
-    public synchronized boolean noEvents() {
-        return queueHead == null && !isFlushing;
-    }
-
-    /*
-     * Continually post pending AWTEvents to the Java EventQueue. The method
-     * is synchronized to ensure the flush is completed before a new event
-     * can be posted to this queue.
-     *
-     * 7177040: The method couldn't be wholly synchronized because of calls
-     * of EventQueue.postEvent() that uses pushPopLock, otherwise it could
-     * potentially lead to deadlock
-     */
-    public void flush() {
-        EventQueueItem tempQueue;
-        synchronized (this) {
-            tempQueue = queueHead;
-            queueHead = queueTail = null;
-            isFlushing = (tempQueue != null);
-        }
-        try {
-            while (tempQueue != null) {
-                eventQueue.postEvent(tempQueue.event);
-                tempQueue = tempQueue.next;
-            }
-        }
-        finally {
-            isFlushing = false;
-        }
-    }
-
-    /*
-     * Enqueue an AWTEvent to be posted to the Java EventQueue.
-     */
-    void postEvent(AWTEvent event) {
-        EventQueueItem item = new EventQueueItem(event);
-
-        synchronized (this) {
-            if (queueHead == null) {
-                queueHead = queueTail = item;
-            } else {
-                queueTail.next = item;
-                queueTail = item;
-            }
-        }
-        SunToolkit.wakeupEventQueue(eventQueue, event.getSource() == AWTAutoShutdown.getInstance());
-    }
-} // class PostEventQueue
diff --git a/openjdk/sun/awt/Win32FontManager.java b/openjdk/sun/awt/Win32FontManager.java
deleted file mode 100644
index 20dbe48e..00000000
--- a/openjdk/sun/awt/Win32FontManager.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-  Copyright (C) 2011 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.awt;
-
-import sun.font.SunFontManager;
-
-public class Win32FontManager extends SunFontManager {
-
-}
diff --git a/openjdk/sun/awt/X11FontManager.java b/openjdk/sun/awt/X11FontManager.java
deleted file mode 100644
index 1f1ab313..00000000
--- a/openjdk/sun/awt/X11FontManager.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-  Copyright (C) 2011 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.awt;
-
-import sun.font.SunFontManager;
-
-public class X11FontManager extends SunFontManager {
-
-}
diff --git a/openjdk/sun/awt/image/GifImageDecoder.java b/openjdk/sun/awt/image/GifImageDecoder.java
deleted file mode 100644
index 80f79e15..00000000
--- a/openjdk/sun/awt/image/GifImageDecoder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-  Copyright (C) 2010 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.awt.image;
-
-import java.io.InputStream;
-
-/**
- * Replace the same class from Sun with native parts.
- * @author Volker Berlin
- */
-public class GifImageDecoder extends IkvmImageDecoder{
-
-    GifImageDecoder(InputStreamImageSource src, InputStream is){
-        super(src, is);
-    }
-
-}
diff --git a/openjdk/sun/awt/image/IkvmImageDecoder.java b/openjdk/sun/awt/image/IkvmImageDecoder.java
deleted file mode 100644
index 17be22b9..00000000
--- a/openjdk/sun/awt/image/IkvmImageDecoder.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
-  Copyright (C) 2010 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.awt.image;
-
-import java.awt.image.*;
-import java.io.IOException;
-import java.io.InputStream;
-
-import cli.System.Drawing.Bitmap;
-import cli.System.Drawing.Imaging.ImageLockMode;
-import cli.System.Drawing.Imaging.PixelFormat;
-import cli.System.IO.SeekOrigin;
-import cli.System.IO.Stream;
-import cli.System.NotSupportedException;
-import ikvm.runtime.Util;
-
-abstract class IkvmImageDecoder extends ImageDecoder {
-
-    IkvmImageDecoder(InputStreamImageSource src, InputStream is){
-        super(src, is);
-    }
-
-    @Override
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    public void produceImage() throws IOException, ImageFormatException{
-        Stream stream = new Stream(){
-
-            @Override
-            public void Flush(){
-                Util.throwException(new NotSupportedException());
-            }
-
-            @Override
-            public int Read(byte[] bytes, int off, int len){
-                try{
-                    int count = input.read(bytes, off, len);
-                    if( count < 0 ){
-                        return 0;
-                    }
-                    return count;
-                }catch(IOException ex){
-                    throw new RuntimeException(ex);
-                }
-            }
-
-            @Override
-            public long Seek(long arg0, SeekOrigin arg1){
-                Util.throwException(new NotSupportedException());
-                return 0;
-            }
-
-            @Override
-            public void SetLength(long arg0){
-                Util.throwException(new NotSupportedException());
-            }
-
-            @Override
-            public void Write(byte[] arg0, int arg1, int arg2){
-                Util.throwException(new NotSupportedException());
-            }
-
-            @Override
-            public boolean get_CanRead(){
-                return true;
-            }
-
-            @Override
-            public boolean get_CanSeek(){
-                return false;
-            }
-
-            @Override
-            public boolean get_CanWrite(){
-                return true;
-            }
-
-            @Override
-            public long get_Length(){
-                try{
-                    return input.available();
-                }catch(IOException ex){
-                    throw new RuntimeException(ex);
-                }
-            }
-
-            @Override
-            public long get_Position(){
-                Util.throwException(new NotSupportedException());
-                return 0;
-            }
-
-            @Override
-            public void set_Position(long arg0){
-                Util.throwException(new NotSupportedException());
-            }
-            
-        };
-        try{
-            Bitmap bitmap = new Bitmap(stream);
-            int width = bitmap.get_Width();
-            int height = bitmap.get_Height();
-            int size = width * height;
-            int[] pixelData = new int[size];
-            
-            cli.System.Drawing.Rectangle rect = new cli.System.Drawing.Rectangle(0, 0, width, height);
-            cli.System.Drawing.Imaging.BitmapData data = bitmap.LockBits(rect, ImageLockMode.wrap(ImageLockMode.ReadOnly), PixelFormat.wrap(PixelFormat.Format32bppArgb));
-            cli.System.IntPtr pixelPtr = data.get_Scan0();
-            cli.System.Runtime.InteropServices.Marshal.Copy(pixelPtr, pixelData, 0, size);        
-            bitmap.UnlockBits(data);
-            
-            //source.
-            
-            setDimensions(width, height);
-            ColorModel cm = ColorModel.getRGBdefault();
-            setColorModel(cm);
-            //setHints(flags);
-            headerComplete();
-            
-            setPixels(0,0,width,height, cm, pixelData,0,width);
-            imageComplete(ImageConsumer.STATICIMAGEDONE, true);
-        }catch(Throwable th){
-            th.printStackTrace();
-            imageComplete(ImageConsumer.IMAGEERROR|ImageConsumer.STATICIMAGEDONE, true);
-            throw new IOException(th);
-        } finally {
-            try { close(); } catch(Throwable e){e.printStackTrace();}
-        }
-    }
-}
diff --git a/openjdk/sun/awt/image/ImageRepresentation.java b/openjdk/sun/awt/image/ImageRepresentation.java
deleted file mode 100644
index 962d46e0..00000000
--- a/openjdk/sun/awt/image/ImageRepresentation.java
+++ /dev/null
@@ -1,421 +0,0 @@
-/*
-  Copyright (C) 2009 Jeroen Frijters
-  Copyright (C) 2010 Volker Berlin (i-net software)
-  Copyright (C) 2011 Karsten Heinrich (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net 
-
-*/
-
-package sun.awt.image;
-
-import java.awt.image.BufferedImage;
-import java.awt.image.ColorModel;
-import java.awt.image.ImageConsumer;
-import java.awt.image.ImageObserver;
-import java.util.Hashtable;
-
-import cli.System.Drawing.Bitmap;
-import cli.System.Drawing.Imaging.BitmapData;
-import cli.System.Drawing.Imaging.ImageLockMode;
-import cli.System.Drawing.Imaging.PixelFormat;
-
-public class ImageRepresentation extends ImageWatched implements ImageConsumer{
-	
-	private static final int DEFAULT_PIXEL_FORMAT = PixelFormat.Format32bppArgb;
-    InputStreamImageSource src;
-    ToolkitImage image;
-
-    private int width = -1;
-    private int height = -1;
-
-    private int availinfo;
-    
-    private BufferedImage bimage;
-    private cli.System.Drawing.Bitmap bitmap;
-    private int pixelFormat = DEFAULT_PIXEL_FORMAT;
-
-    ImageRepresentation(ToolkitImage im){
-        image = im;
-
-        if (image.getSource() instanceof InputStreamImageSource) {
-            src = (InputStreamImageSource) image.getSource();
-        }
-    }
-    
-    /* REMIND: Only used for Frame.setIcon - should use ImageWatcher instead */
-    public synchronized void reconstruct(int flags) {
-        if (src != null) {
-            src.checkSecurity(null, false);
-        }
-        int missinginfo = flags & ~availinfo;
-        if ((availinfo & ImageObserver.ERROR) == 0 && missinginfo != 0) {
-            numWaiters++;
-            try {
-                startProduction();
-                missinginfo = flags & ~availinfo;
-                while ((availinfo & ImageObserver.ERROR) == 0 &&
-                       missinginfo != 0)
-                {
-                    try {
-                        wait();
-                    } catch (InterruptedException e) {
-                        Thread.currentThread().interrupt();
-                        return;
-                    }
-                    missinginfo = flags & ~availinfo;
-                }
-            } finally {
-                decrementWaiters();
-            }
-        }
-    }
-    
-    @Override
-    public void setDimensions(int w, int h){
-        if (src != null) {
-            src.checkSecurity(null, false);
-        }
-        
-        image.setDimensions(w, h);
-//        bitmap = new cli.System.Drawing.Bitmap(w, h);
-        
-        newInfo(image, (ImageObserver.WIDTH | ImageObserver.HEIGHT),
-                0, 0, w, h);
-
-        if (w <= 0 || h <= 0) {
-            imageComplete(ImageConsumer.IMAGEERROR);
-            return;
-        }
-
-        width = w;
-        height = h;
-
-        availinfo |= ImageObserver.WIDTH | ImageObserver.HEIGHT;
-    }
-    
-    private Bitmap getBitmapRef(){
-    	if( bitmap == null ){
-    		bitmap = new Bitmap(width, height, PixelFormat.wrap(pixelFormat) );
-    	}
-    	return bitmap;
-    }
-
-    public int getWidth(){
-        return width;
-    }
-    
-    public int getHeight(){
-        return height;
-    }
-    
-    public BufferedImage getBufferedImage(){
-        return bimage;
-    }
-    
-    @Override
-    public void setProperties(Hashtable<?, ?> props){
-        // ignore it
-        
-    }
-
-    @Override
-    public synchronized void setColorModel(ColorModel model){
-        int newPixelFormat = getPixelFormatForColorModel(model);
-        if( model.getPixelSize() <= 8 ){
-        	newPixelFormat = DEFAULT_PIXEL_FORMAT;
-        }
-        if( newPixelFormat != pixelFormat && bitmap != null ){
-        	// force reconstruct of the bitmap due to a color model change
-        	bitmap.Dispose();
-        	bitmap = null;
-        }
-        pixelFormat = newPixelFormat;
-    }
-
-    @Override
-    public void setHints(int hintflags){
-        // ignore it
-    }
-
-    @Override
-    public void setPixels(int x, int y, int w, int h, ColorModel model, byte[] pixels, int off, int scansize){
-        int[] pixeli = new int[pixels.length];
-        for (int i = 0; i < pixels.length; i++)
-        {
-            pixeli[i] = model.getRGB(pixels[i] & 0xff);
-        }
-        setPixels(x, y, w, h, model, pixeli, off, scansize);
-    }
-
-    @Override
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    public void setPixels(int x, int y, int w, int h, ColorModel model, int[] pixels, int off, int scansize){
-    	// FIXME this method will fail for scan lines
-        if( x < 0) {
-            w -= x;
-            x = 0;
-        }
-        if (y < 0) {
-            h -= y;
-            y = 0;
-        }
-        if (w <= 0 || h <= 0) {
-            // nothing to set
-            return;
-        }
-        if ( off < 0 ) {
-            throw new java.lang.ArrayIndexOutOfBoundsException( "Data offset out of bounds." );
-        }
-        long length = w * h;
-        if (length > pixels.length - off)
-        {
-            throw new java.lang.ArrayIndexOutOfBoundsException("Data offset out of bounds.");
-        }
-        synchronized (this)
-        {
-            int pixelFormat = getPixelFormatForColorModel( model );
-			int bpp = model.getPixelSize();
-			if( bpp == 32 ){ // 32 can be copies 1:1 using an int array
-				copyInt(x, y, w, h, pixels, off, pixelFormat);				
-            }else if( bpp <= 8 ){
-            	// transform all pixels using the color model (for indexed color models)
-            	int[] newData = new int[pixels.length];
-            	for( int i=0; i < newData.length; i++ ){
-            		newData[i] = model.getRGB(pixels[i]);
-            	}
-            	copyInt(x, y, w, h, pixels, off, DEFAULT_PIXEL_FORMAT);
-            }else {
-            	// byte per scanline, must be a multitude of 4
-            	// see http://stackoverflow.com/questions/2185944/why-must-stride-in-the-system-drawing-bitmap-constructor-be-a-multiple-of-4
-            	int bytesPerLine = (bpp * w) / 8;
-            	int scanLine = ((bytesPerLine + 3) / 4) * 4;
-				int offset = scanLine - bytesPerLine; 
-            	byte[] newData = new byte[h * scanLine];
-            	int position = 0;
-            	int pixel;
-            	for( int i=0; i<pixels.length; i++ ){
-            		 pixel = pixels[i];
-            		 switch( bpp ){
-            		 	case 16: newData[position] = (byte)(pixel & 0xFF);
-            		 			 newData[position + 1] = (byte)((pixel >> 8) & 0xFF); break;
-            		 	case 24: newData[position] = (byte)(pixel & 0xFF);
-            		 			 newData[position + 1] = (byte)((pixel >> 8) & 0xFF);
-   		 			 			 newData[position + 2] = (byte)((pixel >> 16) & 0xFF); break;
-            		 }
-            		 position += bpp / 8;
-            		 if( position % scanLine == bytesPerLine ){
-            			 position += offset;
-            		 }
-            	}
-				copyByte(x, y, w, h, newData, off, pixelFormat, bpp);				            	
-            }
-        }
-        
-        availinfo |= ImageObserver.SOMEBITS;
-
-        // Can't do this here since we might need to transform/clip
-        // the region
-        if (((availinfo & ImageObserver.FRAMEBITS) == 0)) {
-            newInfo(image, ImageObserver.SOMEBITS, x, y, w, h);
-        }
-    }
-
-	@cli.System.Security.SecurityCriticalAttribute.Annotation
-	private void copyInt(int x, int y, int w, int h, int[] pixels, int off, int pixelFormat ) {
-		BitmapData data = getBitmapRef().LockBits(new cli.System.Drawing.Rectangle(x, y, w, h), ImageLockMode.wrap(ImageLockMode.WriteOnly), PixelFormat.wrap(pixelFormat));
-		cli.System.Runtime.InteropServices.Marshal.Copy(pixels, off, data.get_Scan0(), data.get_Width() * data.get_Height());
-		getBitmapRef().UnlockBits(data);
-	}
-    
-	@cli.System.Security.SecurityCriticalAttribute.Annotation
-	private void copyByte(int x, int y, int w, int h, byte[] pixels, int off, int pixelFormat, int bpp) {
-		BitmapData data = getBitmapRef().LockBits(new cli.System.Drawing.Rectangle(x, y, w, h), ImageLockMode.wrap(ImageLockMode.WriteOnly), PixelFormat.wrap(pixelFormat));
-		cli.System.Runtime.InteropServices.Marshal.Copy(pixels, off, data.get_Scan0(), pixels.length);
-		getBitmapRef().UnlockBits(data);
-	}
-    
-    
-    private int getPixelFormatForColorModel( ColorModel cm ){
-    	if( cm == null ){
-    		return DEFAULT_PIXEL_FORMAT; // TODO is PixelFormat.Canonical better here?
-    	}
-    	int bpp = cm.getPixelSize();
-    	int[] sizes = cm.getComponentSize();
-    	switch( bpp ){
-    		case 1: return PixelFormat.Undefined; // Indexed is invalid and there is no 1bpp
-    		case 4: return PixelFormat.Format4bppIndexed;
-    		case 8: return PixelFormat.Format8bppIndexed;
-    		case 16:
-    			if( sizes.length <= 1) {
-    				return PixelFormat.Format16bppGrayScale;
-    			}
-    			if( sizes.length == 3 ){
-    				if( sizes[0] == 5 && sizes[2] == 5 ){
-    					return sizes[1] == 5 ? PixelFormat.Format16bppRgb555 : PixelFormat.Format16bppRgb565;
-    				}
-    			}
-    			if( sizes.length == 4 && cm.hasAlpha() ){
-    				return PixelFormat.Format16bppArgb1555;
-    			}
-    			break;
-    		case 24:
-    			return PixelFormat.Format24bppRgb;
-    		case 32:
-    			if(!cm.hasAlpha()){
-    				return PixelFormat.Format32bppRgb;
-    			} else {
-    				return cm.isAlphaPremultiplied() ? PixelFormat.Format32bppPArgb : PixelFormat.Format32bppArgb;
-    			}
-    		case 48:
-    			return PixelFormat.Format48bppRgb;
-    		case 64:
-    			return cm.isAlphaPremultiplied() ? PixelFormat.Format64bppPArgb : PixelFormat.Format64bppArgb;    			
-    	}
-    	return PixelFormat.Undefined;
-    }
-
-    private boolean consuming = false;
-
-    public void imageComplete(int status) {
-        if (src != null) {
-            src.checkSecurity(null, false);
-        }
-        boolean done;
-        int info;
-        switch (status) {
-        default:
-        case ImageConsumer.IMAGEABORTED:
-            done = true;
-            info = ImageObserver.ABORT;
-            break;
-        case ImageConsumer.IMAGEERROR:
-            image.addInfo(ImageObserver.ERROR);
-            done = true;
-            info = ImageObserver.ERROR;
-            dispose();
-            break;
-        case ImageConsumer.STATICIMAGEDONE:
-            done = true;
-            info = ImageObserver.ALLBITS;
-            break;
-        case ImageConsumer.SINGLEFRAMEDONE:
-            done = false;
-            info = ImageObserver.FRAMEBITS;
-            break;
-        }
-        synchronized (this) {
-            if (done) {
-                image.getSource().removeConsumer(this);
-                consuming = false;
-            }
-            if (bimage == null ) {
-            	bimage = new BufferedImage(getBitmapRef());
-            }
-            availinfo |= info;
-            notifyAll();
-        }
-
-        newInfo(image, info, 0, 0, width, height);
-
-        image.infoDone(status);
-    }
-
-    /*synchronized*/ void startProduction() {
-        if (!consuming) {
-            consuming = true;
-            image.getSource().startProduction(this);
-        }
-    }
-
-    private int numWaiters;
-    
-    private synchronized void checkConsumption() {
-        if (isWatcherListEmpty() && numWaiters == 0 &&
-            ((availinfo & ImageObserver.ALLBITS) == 0))
-        {
-            dispose();
-        }
-    }
-
-    @Override
-    public synchronized void notifyWatcherListEmpty() {
-        checkConsumption();
-    }
-
-    private synchronized void decrementWaiters() {
-        --numWaiters;
-        checkConsumption();
-    }
-
-    public boolean prepare(ImageObserver iw) {
-        if (src != null) {
-            src.checkSecurity(null, false);
-        }
-        if ((availinfo & ImageObserver.ERROR) != 0) {
-            if (iw != null) {
-                iw.imageUpdate(image, ImageObserver.ERROR|ImageObserver.ABORT,
-                               -1, -1, -1, -1);
-            }
-            return false;
-        }
-        boolean done = ((availinfo & ImageObserver.ALLBITS) != 0);
-        if (!done) {
-            addWatcher(iw);
-            startProduction();
-            // Some producers deliver image data synchronously
-            done = ((availinfo & ImageObserver.ALLBITS) != 0);
-        }
-        return done;
-    }
-
-    public int check(ImageObserver iw) {
-
-        if (src != null) {
-            src.checkSecurity(null, false);
-        }
-        if ((availinfo & (ImageObserver.ERROR | ImageObserver.ALLBITS)) == 0) {
-            addWatcher(iw);
-        }
-
-        return availinfo;
-    }
-    
-    synchronized void abort() {
-        image.getSource().removeConsumer(this);
-        consuming = false;
-        bimage = null;
-        bitmap = null;
-
-        newInfo(image, ImageObserver.ABORT, -1, -1, -1, -1);
-        availinfo &= ~(ImageObserver.SOMEBITS
-                       | ImageObserver.FRAMEBITS
-                       | ImageObserver.ALLBITS
-                       | ImageObserver.ERROR);
-    }
-
-    synchronized void dispose() {
-        image.getSource().removeConsumer(this);
-        consuming = false;
-        availinfo &= ~(ImageObserver.SOMEBITS
-                       | ImageObserver.FRAMEBITS
-                       | ImageObserver.ALLBITS);
-    }
-}
diff --git a/openjdk/sun/awt/image/ImagingLib.java b/openjdk/sun/awt/image/ImagingLib.java
deleted file mode 100644
index 104c3c46..00000000
--- a/openjdk/sun/awt/image/ImagingLib.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.awt.image;
-
-import java.awt.geom.AffineTransform;
-import java.awt.image.AffineTransformOp;
-import java.awt.image.BufferedImage;
-import java.awt.image.BufferedImageOp;
-import java.awt.image.ByteLookupTable;
-import java.awt.image.ConvolveOp;
-import java.awt.image.Kernel;
-import java.awt.image.LookupOp;
-import java.awt.image.LookupTable;
-import java.awt.image.RasterOp;
-import java.awt.image.Raster;
-import java.awt.image.WritableRaster;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-/**
- * This class provides a hook to access platform-specific
- * imaging code.
- *
- * If the implementing class cannot handle the op, tile format or
- * image format, the method will return null;
- * If there is an error when processing the
- * data, the implementing class may either return null
- * (in which case our java code will be executed) or may throw
- * an exception.
- */
-public class ImagingLib {
-
-    public static WritableRaster filter(RasterOp op, Raster src,
-                                        WritableRaster dst) {
-        return null;
-    }
-
-
-    public static BufferedImage filter(BufferedImageOp op, BufferedImage src,
-                                       BufferedImage dst)
-    {
-        return null;
-    }
-}
diff --git a/openjdk/sun/awt/image/JPEGImageDecoder.java b/openjdk/sun/awt/image/JPEGImageDecoder.java
deleted file mode 100644
index 8a406817..00000000
--- a/openjdk/sun/awt/image/JPEGImageDecoder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-  Copyright (C) 2010 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.awt.image;
-
-import java.io.InputStream;
-
-/**
- * Replace the same class from Sun with native parts.
- * @author Volker Berlin
- */
-public class JPEGImageDecoder extends IkvmImageDecoder{
-
-    JPEGImageDecoder(InputStreamImageSource src, InputStream is){
-        super(src, is);
-    }
-
-}
diff --git a/openjdk/sun/awt/image/SunWritableRaster.java b/openjdk/sun/awt/image/SunWritableRaster.java
deleted file mode 100644
index 6eb92086..00000000
--- a/openjdk/sun/awt/image/SunWritableRaster.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.awt.image;
-
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Image;
-import java.awt.image.DataBuffer;
-import java.awt.image.DataBufferByte;
-import java.awt.image.DataBufferUShort;
-import java.awt.image.DataBufferInt;
-import java.awt.image.SampleModel;
-import java.awt.image.WritableRaster;
-
-import sun.java2d.StateTrackable.State;
-//import sun.java2d.SurfaceData;
-import sun.java2d.StateTrackableDelegate;
-
-/**
- * This class exists as a middle layer between WritableRaster and its
- * implementation specific subclasses (ByteComponentRaster, ShortBandedRaster,
- * etc).
- * It provides utilities to steal the data arrays from the standard DataBuffer
- * types and also steals the StateTrackableDelegate from the associated
- * DataBuffer so that it can be updated when the data is changed.
- */
-public class SunWritableRaster extends WritableRaster {
-    private static DataStealer stealer;
-
-    public static interface DataStealer {
-        public byte[] getData(DataBufferByte dbb, int bank);
-        public short[] getData(DataBufferUShort dbus, int bank);
-        public int[] getData(DataBufferInt dbi, int bank);
-        public StateTrackableDelegate getTrackable(DataBuffer db);
-        public void setTrackable(DataBuffer db, StateTrackableDelegate trackable);
-    }
-
-    public static void setDataStealer(DataStealer ds) {
-        if (stealer != null) {
-            throw new InternalError("Attempt to set DataStealer twice");
-        }
-        stealer = ds;
-    }
-
-    public static byte[] stealData(DataBufferByte dbb, int bank) {
-        return stealer.getData(dbb, bank);
-    }
-
-    public static short[] stealData(DataBufferUShort dbus, int bank) {
-        return stealer.getData(dbus, bank);
-    }
-
-    public static int[] stealData(DataBufferInt dbi, int bank) {
-        return stealer.getData(dbi, bank);
-    }
-
-    public static StateTrackableDelegate stealTrackable(DataBuffer db) {
-        return stealer.getTrackable(db);
-    }
-
-    public static void markDirty(DataBuffer db) {
-        stealer.getTrackable(db).markDirty();
-    }
-
-    public static void setTrackable(DataBuffer db, StateTrackableDelegate trackable) {
-        stealer.setTrackable(db, trackable);
-    }
-
-    public static void makeTrackable(DataBuffer db) {
-        stealer.setTrackable(db, StateTrackableDelegate.createInstance(State.STABLE));
-    }
-
-    public static void markDirty(WritableRaster wr) {
-        if (wr instanceof SunWritableRaster) {
-            ((SunWritableRaster) wr).markDirty();
-        } else {
-            markDirty(wr.getDataBuffer());
-        }
-    }
-
-    public static void markDirty(Image img) {
-//        SurfaceData.getPrimarySurfaceData(img).markDirty();
-    }
-
-    private StateTrackableDelegate theTrackable;
-
-    public SunWritableRaster(SampleModel sampleModel, Point origin) {
-        super(sampleModel, origin);
-        theTrackable = stealTrackable(dataBuffer);
-    }
-
-    public SunWritableRaster(SampleModel sampleModel,
-                             DataBuffer dataBuffer,
-                             Point origin)
-    {
-        super(sampleModel, dataBuffer, origin);
-        theTrackable = stealTrackable(dataBuffer);
-    }
-
-    public SunWritableRaster(SampleModel sampleModel,
-                             DataBuffer dataBuffer,
-                             Rectangle aRegion,
-                             Point sampleModelTranslate,
-                             WritableRaster parent)
-    {
-        super(sampleModel, dataBuffer, aRegion, sampleModelTranslate, parent);
-        theTrackable = stealTrackable(dataBuffer);
-    }
-
-    /**
-     * Mark the TrackableDelegate of the associated DataBuffer dirty.
-     */
-    public final void markDirty() {
-        theTrackable.markDirty();
-    }
-}
diff --git a/openjdk/sun/awt/image/ToolkitImage.java b/openjdk/sun/awt/image/ToolkitImage.java
deleted file mode 100644
index 8f882f3e..00000000
--- a/openjdk/sun/awt/image/ToolkitImage.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
- * Copyright (c) 1995, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.awt.image;
-
-import java.util.Hashtable;
-import java.util.Enumeration;
-
-import java.awt.Component;
-import java.awt.Color;
-import java.awt.Graphics;
-import java.awt.Image;
-import java.awt.image.BufferedImage;
-import java.awt.image.ColorModel;
-import java.awt.image.ImageProducer;
-import java.awt.image.ImageConsumer;
-import java.awt.image.ImageObserver;
-import sun.awt.image.ImageRepresentation;
-
-public class ToolkitImage extends Image {
-
-    /**
-     * The object which is used to reconstruct the original image data
-     * as needed.
-     */
-    ImageProducer source;
-
-    InputStreamImageSource src;
-
-    ImageRepresentation imagerep;
-
-
-    protected ToolkitImage() {
-    }
-
-    /**
-     * Construct an image from an ImageProducer object.
-     */
-    public ToolkitImage(ImageProducer is) {
-        source = is;
-        if (is instanceof InputStreamImageSource) {
-            src = (InputStreamImageSource) is;
-        }
-    }
-
-    public ImageProducer getSource() {
-        if (src != null) {
-            src.checkSecurity(null, false);
-        }
-        return source;
-    }
-
-    private int width = -1;
-    private int height = -1;
-    private Hashtable properties;
-
-    private int availinfo;
-
-    /**
-     * Return the width of the original image source.
-     * If the width isn't known, then the image is reconstructed.
-     */
-    public int getWidth() {
-        if (src != null) {
-            src.checkSecurity(null, false);
-        }
-        if ((availinfo & ImageObserver.WIDTH) == 0) {
-            reconstruct(ImageObserver.WIDTH);
-        }
-        return width;
-    }
-
-    /**
-     * Return the width of the original image source.
-     * If the width isn't known, then the ImageObserver object will be
-     * notified when the data is available.
-     */
-    public synchronized int getWidth(ImageObserver iw) {
-        if (src != null) {
-            src.checkSecurity(null, false);
-        }
-        if ((availinfo & ImageObserver.WIDTH) == 0) {
-            addWatcher(iw, true);
-            if ((availinfo & ImageObserver.WIDTH) == 0) {
-                return -1;
-            }
-        }
-        return width;
-    }
-
-    /**
-     * Return the height of the original image source.
-     * If the height isn't known, then the image is reconstructed.
-     */
-    public int getHeight() {
-        if (src != null) {
-            src.checkSecurity(null, false);
-        }
-        if ((availinfo & ImageObserver.HEIGHT) == 0) {
-            reconstruct(ImageObserver.HEIGHT);
-        }
-        return height;
-    }
-
-    /**
-     * Return the height of the original image source.
-     * If the height isn't known, then the ImageObserver object will be
-     * notified when the data is available.
-     */
-    public synchronized int getHeight(ImageObserver iw) {
-        if (src != null) {
-            src.checkSecurity(null, false);
-        }
-        if ((availinfo & ImageObserver.HEIGHT) == 0) {
-            addWatcher(iw, true);
-            if ((availinfo & ImageObserver.HEIGHT) == 0) {
-                return -1;
-            }
-        }
-        return height;
-    }
-
-    /**
-     * Return a property of the image by name.  Individual property names
-     * are defined by the various image formats.  If a property is not
-     * defined for a particular image, then this method will return the
-     * UndefinedProperty object.  If the properties for this image are
-     * not yet known, then this method will return null and the ImageObserver
-     * object will be notified later.  The property name "comment" should
-     * be used to store an optional comment which can be presented to
-     * the user as a description of the image, its source, or its author.
-     */
-    public Object getProperty(String name, ImageObserver observer) {
-        if (name == null) {
-            throw new NullPointerException("null property name is not allowed");
-        }
-
-        if (src != null) {
-            src.checkSecurity(null, false);
-        }
-        if (properties == null) {
-            addWatcher(observer, true);
-            if (properties == null) {
-                return null;
-            }
-        }
-        Object o = properties.get(name);
-        if (o == null) {
-            o = Image.UndefinedProperty;
-        }
-        return o;
-    }
-
-    public boolean hasError() {
-        if (src != null) {
-            src.checkSecurity(null, false);
-        }
-        return (availinfo & ImageObserver.ERROR) != 0;
-    }
-
-    public int check(ImageObserver iw) {
-        if (src != null) {
-            src.checkSecurity(null, false);
-        }
-        if ((availinfo & ImageObserver.ERROR) == 0 &&
-            ((~availinfo) & (ImageObserver.WIDTH |
-                             ImageObserver.HEIGHT |
-                             ImageObserver.PROPERTIES)) != 0) {
-            addWatcher(iw, false);
-        }
-        return availinfo;
-    }
-
-    public void preload(ImageObserver iw) {
-        if (src != null) {
-            src.checkSecurity(null, false);
-        }
-        if ((availinfo & ImageObserver.ALLBITS) == 0) {
-            addWatcher(iw, true);
-        }
-    }
-
-    private synchronized void addWatcher(ImageObserver iw, boolean load) {
-        if ((availinfo & ImageObserver.ERROR) != 0) {
-            if (iw != null) {
-                iw.imageUpdate(this, ImageObserver.ERROR|ImageObserver.ABORT,
-                               -1, -1, -1, -1);
-            }
-            return;
-        }
-        ImageRepresentation ir = getImageRep();
-        ir.addWatcher(iw);
-        if (load) {
-            ir.startProduction();
-        }
-    }
-
-    private synchronized void reconstruct(int flags) {
-        if ((flags & ~availinfo) != 0) {
-            if ((availinfo & ImageObserver.ERROR) != 0) {
-                return;
-            }
-            ImageRepresentation ir = getImageRep();
-            ir.startProduction();
-            while ((flags & ~availinfo) != 0) {
-                try {
-                    wait();
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                    return;
-                }
-                if ((availinfo & ImageObserver.ERROR) != 0) {
-                    return;
-                }
-            }
-        }
-    }
-
-    synchronized void addInfo(int newinfo) {
-        availinfo |= newinfo;
-        notifyAll();
-    }
-
-    void setDimensions(int w, int h) {
-        width = w;
-        height = h;
-        addInfo(ImageObserver.WIDTH | ImageObserver.HEIGHT);
-    }
-
-    void setProperties(Hashtable props) {
-        if (props == null) {
-            props = new Hashtable();
-        }
-        properties = props;
-        addInfo(ImageObserver.PROPERTIES);
-    }
-
-    synchronized void infoDone(int status) {
-        if (status == ImageConsumer.IMAGEERROR ||
-            ((~availinfo) & (ImageObserver.WIDTH |
-                             ImageObserver.HEIGHT)) != 0) {
-            addInfo(ImageObserver.ERROR);
-        } else if ((availinfo & ImageObserver.PROPERTIES) == 0) {
-            setProperties(null);
-        }
-    }
-
-    public void flush() {
-        if (src != null) {
-            src.checkSecurity(null, false);
-        }
-
-        ImageRepresentation ir;
-        synchronized (this) {
-            availinfo &= ~ImageObserver.ERROR;
-            ir = imagerep;
-            imagerep = null;
-        }
-        if (ir != null) {
-            ir.abort();
-        }
-        if (src != null) {
-            src.flush();
-        }
-    }
-
-    protected ImageRepresentation makeImageRep() {
-        return new ImageRepresentation(this);
-    }
-
-    public synchronized ImageRepresentation getImageRep() {
-        if (src != null) {
-            src.checkSecurity(null, false);
-        }
-        if (imagerep == null) {
-            imagerep = makeImageRep();
-        }
-        return imagerep;
-    }
-
-    public Graphics getGraphics() {
-        throw new UnsupportedOperationException("getGraphics() not valid for images " +
-                                     "created with createImage(producer)");
-    }
-
-//    /* this method is needed by printing code */
-//    public ColorModel getColorModel() {
-//        ImageRepresentation imageRep = getImageRep();
-//        return imageRep.getColorModel();
-//    }
-//
-    /* this method is needed by printing code */
-    public BufferedImage getBufferedImage() {
-        ImageRepresentation imageRep = getImageRep();
-        return imageRep.getBufferedImage();
-    }
-//
-//    public void setAccelerationPriority(float priority) {
-//        super.setAccelerationPriority(priority);
-//        ImageRepresentation imageRep = getImageRep();
-//        imageRep.setAccelerationPriority(accelerationPriority);
-//    }
-}
diff --git a/openjdk/sun/awt/shell/Win32ShellFolder2.java b/openjdk/sun/awt/shell/Win32ShellFolder2.java
deleted file mode 100644
index 0f5f6816..00000000
--- a/openjdk/sun/awt/shell/Win32ShellFolder2.java
+++ /dev/null
@@ -1,1145 +0,0 @@
-/*
- * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
- * Copyright (C) 2009 Volker Berlin (i-net software)
- * Copyright (C) 2010 Karsten Heinrich (i-net software)
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.awt.shell;
-
-import java.awt.Image;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.*;
-import java.util.concurrent.*;
-import javax.swing.SwingConstants;
-
-import cli.System.IntPtr;
-import cli.System.Drawing.Bitmap;
-
-// NOTE: This class basically a conversion of the OpenJDK Wen32ShellFolder2, but uses
-// .NET pointers and objects instead of representing pointers as long
-
-/**
- * Win32 Shell Folders
- * <P>
- * <BR>
- * There are two fundamental types of shell folders : file system folders
- * and non-file system folders.  File system folders are relatively easy
- * to deal with.  Non-file system folders are items such as My Computer,
- * Network Neighborhood, and the desktop.  Some of these non-file system
- * folders have special values and properties.
- * <P>
- * <BR>
- * Win32 keeps two basic data structures for shell folders.  The first
- * of these is called an ITEMIDLIST.  Usually a pointer, called an
- * LPITEMIDLIST, or more frequently just "PIDL".  This structure holds
- * a series of identifiers and can be either relative to the desktop
- * (an absolute PIDL), or relative to the shell folder that contains them.
- * Some Win32 functions can take absolute or relative PIDL values, and
- * others can only accept relative values.
- * <BR>
- * The second data structure is an IShellFolder COM interface.  Using
- * this interface, one can enumerate the relative PIDLs in a shell
- * folder, get attributes, etc.
- * <BR>
- * All Win32ShellFolder2 objects which are folder types (even non-file
- * system folders) contain an IShellFolder object. Files are named in
- * directories via relative PIDLs.
- *
- * @author Michael Martak
- * @author Leif Samuelsson
- * @author Kenneth Russell
- * @author Volker Berlin
- * @author Karsten Heinrich
- * @since 1.4 */
-
-final class Win32ShellFolder2 extends ShellFolder {
-
-    // Win32 Shell Folder Constants
-    public static final int DESKTOP = 0x0000;
-    public static final int INTERNET = 0x0001;
-    public static final int PROGRAMS = 0x0002;
-    public static final int CONTROLS = 0x0003;
-    public static final int PRINTERS = 0x0004;
-    public static final int PERSONAL = 0x0005;
-    public static final int FAVORITES = 0x0006;
-    public static final int STARTUP = 0x0007;
-    public static final int RECENT = 0x0008;
-    public static final int SENDTO = 0x0009;
-    public static final int BITBUCKET = 0x000a;
-    public static final int STARTMENU = 0x000b;
-    public static final int DESKTOPDIRECTORY = 0x0010;
-    public static final int DRIVES = 0x0011;
-    public static final int NETWORK = 0x0012;
-    public static final int NETHOOD = 0x0013;
-    public static final int FONTS = 0x0014;
-    public static final int TEMPLATES = 0x0015;
-    public static final int COMMON_STARTMENU = 0x0016;
-    public static final int COMMON_PROGRAMS = 0X0017;
-    public static final int COMMON_STARTUP = 0x0018;
-    public static final int COMMON_DESKTOPDIRECTORY = 0x0019;
-    public static final int APPDATA = 0x001a;
-    public static final int PRINTHOOD = 0x001b;
-    public static final int ALTSTARTUP = 0x001d;
-    public static final int COMMON_ALTSTARTUP = 0x001e;
-    public static final int COMMON_FAVORITES = 0x001f;
-    public static final int INTERNET_CACHE = 0x0020;
-    public static final int COOKIES = 0x0021;
-    public static final int HISTORY = 0x0022;
-
-    // Win32 shell folder attributes
-    public static final int ATTRIB_CANCOPY          = 0x00000001;
-    public static final int ATTRIB_CANMOVE          = 0x00000002;
-    public static final int ATTRIB_CANLINK          = 0x00000004;
-    public static final int ATTRIB_CANRENAME        = 0x00000010;
-    public static final int ATTRIB_CANDELETE        = 0x00000020;
-    public static final int ATTRIB_HASPROPSHEET     = 0x00000040;
-    public static final int ATTRIB_DROPTARGET       = 0x00000100;
-    public static final int ATTRIB_LINK             = 0x00010000;
-    public static final int ATTRIB_SHARE            = 0x00020000;
-    public static final int ATTRIB_READONLY         = 0x00040000;
-    public static final int ATTRIB_GHOSTED          = 0x00080000;
-    public static final int ATTRIB_HIDDEN           = 0x00080000;
-    public static final int ATTRIB_FILESYSANCESTOR  = 0x10000000;
-    public static final int ATTRIB_FOLDER           = 0x20000000;
-    public static final int ATTRIB_FILESYSTEM       = 0x40000000;
-    public static final int ATTRIB_HASSUBFOLDER     = 0x80000000;
-    public static final int ATTRIB_VALIDATE         = 0x01000000;
-    public static final int ATTRIB_REMOVABLE        = 0x02000000;
-    public static final int ATTRIB_COMPRESSED       = 0x04000000;
-    public static final int ATTRIB_BROWSABLE        = 0x08000000;
-    public static final int ATTRIB_NONENUMERATED    = 0x00100000;
-    public static final int ATTRIB_NEWCONTENT       = 0x00200000;
-
-    // IShellFolder::GetDisplayNameOf constants
-    public static final int SHGDN_NORMAL            = 0;
-    public static final int SHGDN_INFOLDER          = 1;
-    public static final int SHGDN_INCLUDE_NONFILESYS= 0x2000;
-    public static final int SHGDN_FORADDRESSBAR     = 0x4000;
-    public static final int SHGDN_FORPARSING        = 0x8000;
-
-    // Values for system call LoadIcon()
-    public enum SystemIcon {
-        IDI_APPLICATION(32512),
-        IDI_HAND(32513),
-        IDI_ERROR(32513),
-        IDI_QUESTION(32514),
-        IDI_EXCLAMATION(32515),
-        IDI_WARNING(32515),
-        IDI_ASTERISK(32516),
-        IDI_INFORMATION(32516),
-        IDI_WINLOGO(32517);
-
-        private final int iconID;
-
-        SystemIcon(int iconID) {
-            this.iconID = iconID;
-        }
-
-        public int getIconID() {
-            return iconID;
-        }
-    }
-
-    static class FolderDisposer implements sun.java2d.DisposerRecord {
-        /*
-         * This is cached as a concession to getFolderType(), which needs
-         * an absolute PIDL.
-         */
-        cli.System.IntPtr absolutePIDL;
-        /*
-         * We keep track of shell folders through the IShellFolder
-         * interface of their parents plus their relative PIDL.
-         */
-        cli.System.Object pIShellFolder;
-        cli.System.IntPtr relativePIDL;
-
-        boolean disposed;
- 
-        @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-        public void dispose() {
-            if (disposed)
-                return;
-            if ( relativePIDL != null && !cli.System.IntPtr.Zero.Equals( relativePIDL ) ) {
-                releasePIDL(relativePIDL);
-            }
-            if ( absolutePIDL != null && !cli.System.IntPtr.Zero.Equals( absolutePIDL ) ) {
-                releasePIDL(absolutePIDL);
-            }
-            if ( pIShellFolder != null ) {
-                releaseIShellFolder(pIShellFolder);
-            }
-            disposed = true;
-        }
-    }
-
-    FolderDisposer disposer = new FolderDisposer();
-
-    private void setIShellFolder( cli.System.Object iShellFolder ) {
-        disposer.pIShellFolder = iShellFolder;
-    }
-
-    private void setRelativePIDL(cli.System.IntPtr relativePIDL) {
-        disposer.relativePIDL = relativePIDL;
-    }
-
-    /*
-     * The following are for caching various shell folder properties.
-     */
-    private cli.System.Object pIShellIcon = null;
-    private String folderType = null;
-    private String displayName = null;
-    private Image smallIcon = null;
-    private Image largeIcon = null;
-    private Boolean isDir = null;
-
-    /*
-     * The following is to identify the My Documents folder as being special
-     */
-    private boolean isPersonal;
-
-    /**
-     * Create a system special shell folder, such as the
-     * desktop or Network Neighborhood.
-     */
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    Win32ShellFolder2(final int csidl) throws IOException, InterruptedException {
-        // Desktop is parent of DRIVES and NETWORK, not necessarily
-        // other special shell folders.
-        super ( null, (getFileSystemPath(csidl) == null) ? ("ShellFolder: 0x" + Integer.toHexString(csidl)) : getFileSystemPath(csidl));
-        if (csidl == DESKTOP) {
-        	// compared to the Java implementation we require two steps here since
-        	// we don't have a callback from the native methods in to this instance
-            setIShellFolder( initDesktopFolder() );
-            setRelativePIDL( initDesktopPIDL() );
-        } else {
-        	cli.System.Object desktopFolder = getDesktop().getIShellFolder();
-        	cli.System.IntPtr pidl = initSpecialPIDL( desktopFolder, csidl );
-            setRelativePIDL( pidl );
-            setIShellFolder( initSpecialFolder(desktopFolder, pidl) );
-            // At this point, the native method initSpecial() has set our relativePIDL
-            // relative to the Desktop, which may not be our immediate parent. We need
-            // to traverse this ID list and break it into a chain of shell folders from
-            // the top, with each one having an immediate parent and a relativePIDL
-            // relative to that parent.
-            bindToDesktop();
-        }
-
-        sun.java2d.Disposer.addRecord(this , disposer);
-    }
-
-        @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-	protected void bindToDesktop() {
-		cli.System.IntPtr pIDL = disposer.relativePIDL;
-		parent = getDesktop();
-		while ( pIDL != null && !cli.System.IntPtr.Zero.Equals( pIDL ) ) {
-		    // Get a child pidl relative to 'parent'
-			cli.System.IntPtr childPIDL = copyFirstPIDLEntry(pIDL);
-		    if (childPIDL != null && !cli.System.IntPtr.Zero.Equals( childPIDL ) ) {
-		        // Get a handle to the the rest of the ID list
-		        // i,e, parent's grandchilren and down
-		        pIDL = getNextPIDLEntry(pIDL);
-		        if ( pIDL != null && !cli.System.IntPtr.Zero.Equals( pIDL ) ) {
-		            // Now we know that parent isn't immediate to 'this' because it
-		            // has a continued ID list. Create a shell folder for this child
-		            // pidl and make it the new 'parent'.
-		            parent = new Win32ShellFolder2( (Win32ShellFolder2) parent, childPIDL );
-		        } else {
-		            // No grandchildren means we have arrived at the parent of 'this',
-		            // and childPIDL is directly relative to parent.
-		            disposer.relativePIDL = childPIDL;
-		        }
-		    } else {
-		        break;
-		    }
-		}
-	}
-
-    /**
-     * Create a system shell folder
-     */
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    Win32ShellFolder2(Win32ShellFolder2 parent, cli.System.Object pIShellFolder, cli.System.IntPtr relativePIDL, String path) {
-        super(parent, (path != null) ? path : "ShellFolder: ");
-        this.disposer.pIShellFolder = pIShellFolder;
-        this.disposer.relativePIDL = relativePIDL;
-        sun.java2d.Disposer.addRecord(this, disposer);
-    }
-
-    /**
-     * Creates a shell folder with a parent and relative PIDL
-     */
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    Win32ShellFolder2(Win32ShellFolder2 parent, cli.System.IntPtr relativePIDL) {
-        super (parent, getFileSystemPath(parent.getIShellFolder(), relativePIDL));
-        this .disposer.relativePIDL = relativePIDL;
-        getAbsolutePath();
-        sun.java2d.Disposer.addRecord(this , disposer);
-    }
-
-    // Initializes the desktop shell folder
-    /**
-     * Returns the pIDL of the Desktop folder (pIDL root)
-     * @return the pIDL of the Desktop folder (pIDL root)
-     */
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    private static native cli.System.IntPtr initDesktopPIDL();
-    /**
-     * Returns the IShellFolder pointer of the Desktop folder (pIDL root)
-     * @return the IShellFolder pointer of the Desktop folder (pIDL root)
-     */
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    private static native cli.System.Object initDesktopFolder();
-
-    // Initializes a special, non-file system shell folder
-    // from one of the above constants
-    /**
-     * initializes a special folder
-     * @param desktopIShellFolder the IShellFolder reference of the desktop folder
-     * @param csidl the CSIDL of the requested special folder
-     * @return the pIDL of the special folder relative to the desktop root
-     */
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    private static native cli.System.IntPtr initSpecialPIDL(cli.System.Object desktopIShellFolder, int csidl);
-    /**
-     * initializes a special folder
-     * @param desktopIShellFolder the IShellFolder reference of the desktop folder
-     * @param pidl the pIDL of the requested folder relative to the desktopIShellFolder
-     * @return the IShellFolder reference for the requested folder
-     */
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    private static native cli.System.Object initSpecialFolder(cli.System.Object desktopIShellFolder, cli.System.IntPtr pidl);
-
-    /** Marks this folder as being the My Documents (Personal) folder */
-    public void setIsPersonal() {
-        isPersonal = true;
-    }
-
-    /**
-     * This method is implemented to make sure that no instances
-     * of <code>ShellFolder</code> are ever serialized. If <code>isFileSystem()</code> returns
-     * <code>true</code>, then the object is representable with an instance of
-     * <code>java.io.File</code> instead. If not, then the object depends
-     * on native PIDL state and should not be serialized.
-     *
-     * @returns a <code>java.io.File</code> replacement object. If the folder
-     * is a not a normal directory, then returns the first non-removable
-     * drive (normally "C:\").
-     */
-    protected Object writeReplace()
-            throws java.io.ObjectStreamException {
-        if (isFileSystem()) {
-            return new File(getPath());
-        } else {
-            Win32ShellFolder2 drives = Win32ShellFolderManager2.getDrives();
-            if (drives != null) {
-                File[] driveRoots = drives.listFiles();
-                if (driveRoots != null) {
-                    for (int i = 0; i < driveRoots.length; i++) {
-                        if (driveRoots[i] instanceof  Win32ShellFolder2) {
-                            Win32ShellFolder2 sf = (Win32ShellFolder2) driveRoots[i];
-                            if (sf.isFileSystem() && !sf.hasAttribute(ATTRIB_REMOVABLE)) {
-                                return new File(sf.getPath());
-                            }
-                        }
-                    }
-                }
-            }
-            // Ouch, we have no hard drives. Return something "valid" anyway.
-            return new File("C:\\");
-        }
-    }
-
-    /**
-     * Finalizer to clean up any COM objects or PIDLs used by this object.
-     */
-    protected void dispose() {
-        disposer.dispose();
-    }
-
-    // Given a (possibly multi-level) relative PIDL (with respect to
-    // the desktop, at least in all of the usage cases in this code),
-    // return a pointer to the next entry. Does not mutate the PIDL in
-    // any way. Returns 0 if the null terminator is reached.
-    // Needs to be accessible to Win32ShellFolderManager2
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static native cli.System.IntPtr getNextPIDLEntry(cli.System.IntPtr pIDL);
-
-    // Given a (possibly multi-level) relative PIDL (with respect to
-    // the desktop, at least in all of the usage cases in this code),
-    // copy the first entry into a newly-allocated PIDL. Returns 0 if
-    // the PIDL is at the end of the list.
-    // Needs to be accessible to Win32ShellFolderManager2
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static native cli.System.IntPtr copyFirstPIDLEntry(cli.System.IntPtr pIDL);
-
-    // Given a parent's absolute PIDL and our relative PIDL, build an absolute PIDL
-    /**
-     * Combines a parent pIDL with a descendant pIDL. It doesn't matter whether the parent pIDL
-     * is relative or absolute since this is only a concatenation of the IDLs
-     * @param ppIDL the parent pIDL
-     * @param pIDL the pIDL relative to the ppIDL
-     * @return a pIDL for the item referenced by the original pIDL but relative to the parent of ppIDL 
-     */
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    private static native cli.System.IntPtr combinePIDLs(cli.System.IntPtr ppIDL, cli.System.IntPtr pIDL);
-
-    // Release a PIDL object
-    // Needs to be accessible to Win32ShellFolderManager2
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static native void releasePIDL(cli.System.IntPtr pIDL);
-
-    // Release an IShellFolder object
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static native void releaseIShellFolder( cli.System.Object iShellFolder );
-
-    /**
-     * Accessor for IShellFolder
-     */
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    public cli.System.Object getIShellFolder() {
-        if (disposer.pIShellFolder == null ) {
-            assert (isDirectory());
-            assert (parent != null);
-            cli.System.Object parentIShellFolder = getParentIShellFolder();
-            if (parentIShellFolder == null) {
-                throw new InternalError( "Parent IShellFolder was null for " + getAbsolutePath() );
-            }
-            // We are a directory with a parent and a relative PIDL.
-            // We want to bind to the parent so we get an IShellFolder instance associated with us.
-            disposer.pIShellFolder = bindToObject(parentIShellFolder, disposer.relativePIDL);
-            if (disposer.pIShellFolder == null ) {
-                throw new InternalError("Unable to bind " + getAbsolutePath() + " to parent");
-            }
-        }
-        return disposer.pIShellFolder;
-    }
-
-    /**
-     * Get the parent ShellFolder's IShellFolder interface
-     */
-    public cli.System.Object getParentIShellFolder() {
-        Win32ShellFolder2 parent = (Win32ShellFolder2) getParentFile();
-        cli.System.Object parentFolder;
-        if (parent == null) {
-            // Parent should only be null if this is the desktop, whose
-            // relativePIDL is relative to its own IShellFolder.
-        	parentFolder = getIShellFolder();
-        } else {
-        	parentFolder = parent.getIShellFolder();
-        }
-        return parentFolder;
-    }
-
-    /**
-     * Accessor for relative PIDL
-     */
-    public cli.System.IntPtr getRelativePIDL() {
-        if (disposer.relativePIDL == null) {
-            throw new InternalError( "Should always have a relative PIDL" );
-        }
-        return disposer.relativePIDL;
-    }
-
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    private cli.System.IntPtr getAbsolutePIDL() {
-        if (parent == null) {
-            // This is the desktop
-            return getRelativePIDL();
-        } else {
-            if (disposer.absolutePIDL == null || disposer.absolutePIDL.Equals( IntPtr.Zero )) {
-                disposer.absolutePIDL = combinePIDLs( ((Win32ShellFolder2) parent).getAbsolutePIDL(), getRelativePIDL());
-            }
-
-            return disposer.absolutePIDL;
-        }
-    }
-
-    /**
-     * Helper function to return the desktop
-     */
-    public Win32ShellFolder2 getDesktop() {
-        return Win32ShellFolderManager2.getDesktop();
-    }
-
-    /**
-     * Helper function to return the desktop IShellFolder interface
-     */
-    public cli.System.Object getDesktopIShellFolder() {
-        return getDesktop().getIShellFolder();
-    }
-
-    private static boolean pathsEqual(String path1, String path2) {
-        // Same effective implementation as Win32FileSystem
-        return path1.equalsIgnoreCase(path2);
-    }
-
-    /**
-     * Check to see if two ShellFolder objects are the same
-     */
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    public boolean equals(Object o) {
-        if (o == null || !(o instanceof Win32ShellFolder2)) {
-            // Short-circuit circuitous delegation path
-            if (!(o instanceof File)) {
-                return super.equals(o);
-            }
-            return pathsEqual(getPath(), ((File) o).getPath());
-        }
-        Win32ShellFolder2 rhs = (Win32ShellFolder2) o;
-        if ((parent == null && rhs.parent != null) ||
-            (parent != null && rhs.parent == null)) {
-            return false;
-        }
-
-        if (isFileSystem() && rhs.isFileSystem()) {
-            // Only folders with identical parents can be equal
-            return (pathsEqual(getPath(), rhs.getPath()) &&
-                    (parent == rhs.parent || parent.equals(rhs.parent)));
-        }
-
-        if (parent == rhs.parent || parent.equals(rhs.parent)) {
-            try {
-                return pidlsEqual(getParentIShellFolder(), disposer.relativePIDL, rhs.disposer.relativePIDL);
-            } catch (InterruptedException e) {
-                return false;
-            }
-        }
-
-        return false;
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static boolean pidlsEqual(final cli.System.Object pIShellFolder, final cli.System.IntPtr pidl1, final cli.System.IntPtr pidl2)
-            throws InterruptedException {
-        return invoke(new Callable<Boolean>() {
-            @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-            public Boolean call() {
-                return compareIDs(pIShellFolder, pidl1, pidl2) == 0;
-            }
-        }, RuntimeException.class);
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static native int compareIDs(cli.System.Object pParentIShellFolder, cli.System.IntPtr pidl1, cli.System.IntPtr pidl2);
-
-    private volatile Boolean cachedIsFileSystem;
-
-    /**
-     * @return Whether this is a file system shell folder
-     */
-    public boolean isFileSystem() {
-        if (cachedIsFileSystem == null) {
-            cachedIsFileSystem = hasAttribute(ATTRIB_FILESYSTEM);
-        }
-
-        return cachedIsFileSystem;
-    }
-
-    /**
-     * Return whether the given attribute flag is set for this object
-     */
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    public boolean hasAttribute(int attribute) {
-        // Caching at this point doesn't seem to be cost efficient
-        return (getAttributes0(getParentIShellFolder(), getRelativePIDL(), attribute) & attribute) != 0;
-    }
-
-    /**
-     * Returns the queried attributes specified in attrsMask.
-     *
-     * Could plausibly be used for attribute caching but have to be
-     * very careful not to touch network drives and file system roots
-     * with a full attrsMask
-     */
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static native int getAttributes0(cli.System.Object pParentIShellFolder, cli.System.IntPtr pIDL, int attrsMask);
-
-    // Return the path to the underlying file system object
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    private static String getFileSystemPath(cli.System.Object parentIShellFolder, cli.System.IntPtr relativePIDL) {
-        int linkedFolder = ATTRIB_LINK | ATTRIB_FOLDER;
-        if (parentIShellFolder == Win32ShellFolderManager2.getNetwork().getIShellFolder() &&
-                getAttributes0(parentIShellFolder, relativePIDL, linkedFolder) == linkedFolder) {
-
-        	cli.System.Object desktopIShellFolder = Win32ShellFolderManager2.getDesktop().getIShellFolder();
-            String path = getDisplayNameOf(parentIShellFolder, relativePIDL, SHGDN_FORPARSING );
-			String s = getFileSystemPath(desktopIShellFolder, getLinkLocation( path, false));
-            if (s != null && s.startsWith("\\\\")) {
-                return s;
-            }
-        }
-        return getDisplayNameOf(parentIShellFolder, relativePIDL, SHGDN_NORMAL | SHGDN_FORPARSING);
-    }
-
-    // Needs to be accessible to Win32ShellFolderManager2
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static native String getFileSystemPath(int csidl) throws IOException, InterruptedException;
-
-    // Return whether the path is a network root.
-    // Path is assumed to be non-null
-    private static boolean isNetworkRoot(String path) {
-        return (path.equals("\\\\") || path.equals("\\") || path.equals("//") || path.equals("/"));
-    }
-
-    /**
-     * @return The parent shell folder of this shell folder, null if
-     * there is no parent
-     */
-    public File getParentFile() {
-        return parent;
-    }
-
-    public boolean isDirectory() {
-        if (isDir == null) {
-            // Folders with SFGAO_BROWSABLE have "shell extension" handlers and are
-            // not traversable in JFileChooser.
-            if (hasAttribute(ATTRIB_FOLDER) && !hasAttribute(ATTRIB_BROWSABLE)) {
-                isDir = Boolean.TRUE;
-            } else if (isLink()) {
-                ShellFolder linkLocation = getLinkLocation(false);
-                isDir = Boolean.valueOf(linkLocation != null && linkLocation.isDirectory());
-            } else {
-                isDir = Boolean.FALSE;
-            }
-        }
-        return isDir.booleanValue();
-    }
-
-    /*
-     * Functions for enumerating an IShellFolder's children
-     */
-    // Returns an IEnumIDList interface for an IShellFolder.  The value
-    // returned must be released using releaseEnumObjects().
-    /**
-     * Returns an IEnumIDList interface for an IShellFolder.  The value 
-     * returned must be released using releaseEnumObjects().
-     * @param pIShellFolder the IShellFolder instance of the parent shell folder
-     * @param includeHiddenFiles if true, hidden files will be included in the enumeration
-     * @return an instance of IEnumIDList 
-     */
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    cli.System.Object getEnumObjects(cli.System.Object pIShellFolder, boolean includeHiddenFiles) {
-        boolean isDesktop = (disposer.pIShellFolder == getDesktopIShellFolder());
-        return getEnumObjects(disposer.pIShellFolder, isDesktop, includeHiddenFiles);
-    }
-
-    /**
-     * Returns an IEnumIDList interface for an IShellFolder.  The value 
-     * returned must be released using releaseEnumObjects().
-     * @param pIShellFolder the IShellFolder instance of the parent shell folder
-     * @param isDesktop must be set to true, if the pIShellFolder is the desktop shell folder
-     * @param includeHiddenFiles if true, hidden files will be included in the enumeration
-     * @return an instance of IEnumIDList 
-     */
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    private static native cli.System.Object getEnumObjects(cli.System.Object pIShellFolder, boolean isDesktop, boolean includeHiddenFiles);
-
-    /**
-     * Returns the next sequential child as a relative PIDL
-     * from an IEnumIDList interface.  The value returned must
-     * be released using releasePIDL().
-     * @param pEnumObjects the IEnumIDList instance to get the next child from
-     * @return the next child or {@link IntPtr#Zero} if the end of the enumeration is reached 
-     */
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static native cli.System.IntPtr getNextChild(cli.System.Object pEnumObjects);
-
-    /**
-     * Releases the IEnumIDList interface
-     * @param pEnumObjects an IEnumIDList instance 
-     */
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static native void releaseEnumObjects(cli.System.Object pEnumObjects);
-
-    /**
-     * Returns the IShellFolder of a child from a parent IShellFolder and a relative pIDL. The pIDL
-     * may as well be any other  descendant of the shell folder - at least this is, what the windows API 
-     * documentation says.  
-     * The value returned must be released using releaseIShellFolder().
-     * @param parentIShellFolder an IShellFolder instance as root for the pIDL 
-     * @param pIDL a pIDL relative to the parent shell folder
-     * @return a NEW instance of an IShellFolder for the path given by the pIDL, may be null if the path is invalid
-     */
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    private static native cli.System.Object bindToObject(cli.System.Object parentIShellFolder, cli.System.IntPtr pIDL);
-
-    /**
-     * @return An array of shell folders that are children of this shell folder
-     *         object. The array will be empty if the folder is empty.  Returns
-     *         <code>null</code> if this shellfolder does not denote a directory.
-     */
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    public File[] listFiles(final boolean includeHiddenFiles) {
-        SecurityManager security = System.getSecurityManager();
-        if (security != null) {
-            security.checkRead(getPath());
-        }
-
-        try {
-            return invoke(new Callable<File[]>() {
-                @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-                public File[] call() throws InterruptedException {
-                    if (!isDirectory()) {
-                        return null;
-                    }
-                    // Links to directories are not directories and cannot be parents.
-                    // This does not apply to folders in My Network Places (NetHood)
-                    // because they are both links and real directories!
-                    if (isLink() && !hasAttribute(ATTRIB_FOLDER)) {
-                        return new File[0];
-                    }
-
-                    Win32ShellFolder2 desktop = Win32ShellFolderManager2.getDesktop();
-                    Win32ShellFolder2 personal = Win32ShellFolderManager2.getPersonal();
-
-                    // If we are a directory, we have a parent and (at least) a
-                    // relative PIDL. We must first ensure we are bound to the
-                    // parent so we have an IShellFolder to query.
-                    cli.System.Object pIShellFolder = getIShellFolder();
-                    // Now we can enumerate the objects in this folder.
-                    ArrayList<Win32ShellFolder2> list = new ArrayList<Win32ShellFolder2>();
-                    cli.System.Object pEnumObjects = getEnumObjects(pIShellFolder, includeHiddenFiles);
-                    if (pEnumObjects != null) {
-                        cli.System.IntPtr childPIDL = null;
-                        int testedAttrs = ATTRIB_FILESYSTEM | ATTRIB_FILESYSANCESTOR;
-                        do {
-                            if (Thread.currentThread().isInterrupted()) {
-                                return new File[0];
-                            }
-                            childPIDL = getNextChild(pEnumObjects);
-                            boolean releasePIDL = true;
-                            if ( childPIDL != null && !cli.System.IntPtr.Zero.Equals( childPIDL ) && (getAttributes0(pIShellFolder, childPIDL, testedAttrs) & testedAttrs) != 0) {
-                                Win32ShellFolder2 childFolder = null;
-                                if (this .equals(desktop) && personal != null
-                                        && pidlsEqual(pIShellFolder, childPIDL, personal.disposer.relativePIDL) ) {
-                                    childFolder = personal;
-                                } else {
-                                    childFolder = new Win32ShellFolder2(Win32ShellFolder2.this , childPIDL);
-                                    releasePIDL = false;
-                                }
-                                list.add(childFolder);
-                            }
-                            if (releasePIDL) {
-                                releasePIDL(childPIDL);
-                            }
-                        } while (childPIDL != null && !childPIDL.Equals( cli.System.IntPtr.Zero ));
-                        releaseEnumObjects(pEnumObjects);
-                    }
-                    return Thread.currentThread().isInterrupted()
-                        ? new File[0]
-                        : list.toArray(new ShellFolder[list.size()]);
-                }
-            }, InterruptedException.class);
-        } catch (InterruptedException e) {
-            return new File[0];
-        }
-    }
-
-
-    /**
-     * Look for (possibly special) child folder by it's path. Note: this will not work an an ancestor(not child)
-     * of the current folder. 
-     * @return The child shell folder, or null if not found.
-     */
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    Win32ShellFolder2 getChildByPath(String filePath) {
-    	cli.System.Object pIShellFolder = getIShellFolder();
-    	cli.System.Object pEnumObjects = getEnumObjects(pIShellFolder, true);
-        Win32ShellFolder2 child = null;
-        cli.System.IntPtr childPIDL = null;
-        
-        childPIDL = getNextChild(pEnumObjects);
-        while ( childPIDL != null && !cli.System.IntPtr.Zero.Equals( childPIDL ) ) {
-            if (getAttributes0(pIShellFolder, childPIDL, ATTRIB_FILESYSTEM) != 0) {
-                String path = getFileSystemPath(pIShellFolder, childPIDL);
-                if (path != null && path.equalsIgnoreCase(filePath)) {
-                	cli.System.Object childIShellFolder = bindToObject( pIShellFolder, childPIDL);
-                    child = new Win32ShellFolder2(this, childIShellFolder, childPIDL, path);
-                    break;
-                }
-            }
-            releasePIDL(childPIDL);
-            childPIDL = getNextChild(pEnumObjects);
-        }
-        releaseEnumObjects(pEnumObjects);
-        return child;
-    }
-
-    private volatile Boolean cachedIsLink;
-
-    /**
-     * @return Whether this shell folder is a link
-     */
-    public boolean isLink() {
-        if (cachedIsLink == null) {
-            cachedIsLink = hasAttribute(ATTRIB_LINK);
-        }
-
-        return cachedIsLink;
-    }
-
-    /**
-     * @return Whether this shell folder is marked as hidden
-     */
-    public boolean isHidden() {
-        return hasAttribute(ATTRIB_HIDDEN);
-    }
-
-    // Return the link location of a shell folder
-    /**
-     * Resolves the link location of an item to an ABSOLUTE pIDL
-     * @param parentIShellFolder the pointer to the parent IShellFolder of the item
-     * @param relativePIDL a single-level pIDL to the item
-     * @param resolve 
-     */
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static native cli.System.IntPtr getLinkLocation( String path, boolean resolve);
-
-    /**
-     * @return The shell folder linked to by this shell folder, or null
-     * if this shell folder is not a link or is a broken or invalid link
-     */
-    public ShellFolder getLinkLocation()  {
-        return getLinkLocation(true);
-    }
-
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    private ShellFolder getLinkLocation(final boolean resolve) {
-        return invoke(new Callable<ShellFolder>() {
-            @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-            public ShellFolder call() {
-                if (!isLink()) {
-                    return null;
-                }
-
-                ShellFolder location = null;
-                cli.System.IntPtr linkLocationPIDL = getLinkLocation( getAbsolutePath(), resolve);
-                if (linkLocationPIDL != null && !cli.System.IntPtr.Zero.Equals( linkLocationPIDL ) ) {
-                    try {
-                        location =
-                                Win32ShellFolderManager2.createShellFolderFromRelativePIDL(getDesktop(),
-                                        linkLocationPIDL);
-                    } catch (InterruptedException e) {
-                        // Return null
-                    } catch (InternalError e) {
-                        // Could be a link to a non-bindable object, such as a network connection
-                        // TODO: getIShellFolder() should throw FileNotFoundException instead
-                    }
-                }
-                return location;
-            }
-        });
-    }
-
-    /**
-     * Parse a display name into a PIDL relative to the current IShellFolder.
-     * @param name the name or relative path
-     * @return a pIDL for the path, may be {@link IntPtr#Zero} if not found
-     * @throws FileNotFoundException
-     */
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    cli.System.IntPtr parseDisplayName(String name) throws FileNotFoundException {
-        try {
-            return parseDisplayName0(getIShellFolder(), name);
-        } catch (IOException e) {
-            throw new FileNotFoundException("Could not find file " + name);
-        }
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    private static native cli.System.IntPtr parseDisplayName0(cli.System.Object pIShellFolder, String name) throws IOException;
-
-    /**
-     * Returns the display name of an item in a folder
-     * @param parentIShellFolder the pointer to the IShellFolder interface of the parent folder
-     * @param relativePIDL single-level pIDL to the requested item within the parent folder
-     * @param attrs formatting attributes for the display name, refer to SHGDN in MSDN
-     * @return
-     */
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    private static native String getDisplayNameOf( cli.System.Object parentIShellFolder, cli.System.IntPtr relativePIDL, int attrs);
-
-    /**
-     * @return The name used to display this shell folder
-     */
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    public String getDisplayName() {
-        if (displayName == null) {
-            displayName = getDisplayNameOf(getParentIShellFolder(), getRelativePIDL(), SHGDN_NORMAL);
-        }
-        return displayName;
-    }
-
-    // Return the folder type of a shell folder
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    private static native String getFolderType(cli.System.IntPtr pIDL);
-
-    /**
-     * @return The type of shell folder as a string
-     */
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    public String getFolderType() {
-        if (folderType == null) {
-            folderType = getFolderType(getAbsolutePIDL());
-        }
-        return folderType;
-    }
-
-    // Return the executable type of a file system shell folder
-    private static native String getExecutableType(String path);
-
-    /**
-     * @return The executable type as a string
-     */
-    public String getExecutableType() {
-        if (!isFileSystem()) {
-            return null;
-        }
-        return getExecutableType(getAbsolutePath());
-    }
-
-    // Icons
-
-    private static Map smallSystemImages = new HashMap();
-    private static Map largeSystemImages = new HashMap();
-    private static Map smallLinkedSystemImages = new HashMap();
-    private static Map largeLinkedSystemImages = new HashMap();
-
-    /**
-     * Returns the icon index in the system image list  
-     * @param parentIShellIcon the the pointer to the IShellIcon instance of the parent folder 
-     * @param relativePIDL the relative pIDL to the requested item
-     * @return the system image list index for the icon of the item or zero, if there is no entry
-     */
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    private static native int getIconIndex(cli.System.Object parentIShellFolder, cli.System.IntPtr relativePIDL);
-
-    // Return the icon of a file system shell folder in the form of an HICON
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    private static native cli.System.IntPtr getIcon(String absolutePath, boolean getLargeIcon);
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    private static native cli.System.IntPtr extractIcon(cli.System.Object parentIShellFolder, cli.System.IntPtr relativePIDL,
-                                           boolean getLargeIcon);
-
-    /**
-     * Returns the {@link Bitmap} for a HICON.
-     */
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    private static native Bitmap getIconBits(cli.System.IntPtr hIcon, int size);
-
-    /**
-     * Disposes a icon handle
-     * @param hIcon the handle to be disposed
-     */
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    private static native void disposeIcon(cli.System.IntPtr hIcon);
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static native Bitmap getStandardViewButton0(int iconIndex);
-
-    /**
-     * Creates a Java icon for a HICON pointer
-     * @param hIcon the handle for the icon
-     * @param getLargeIcon true for a large icon, false for a small icon
-     * @return the created image or null, if the handle is invalid
-     */
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    private static Image makeIcon(cli.System.IntPtr hIcon, boolean getLargeIcon) {
-        if (hIcon != null ) {
-            // Get the bits.  This has the side effect of setting the imageHash value for this object.
-            Bitmap bitmap = getIconBits(hIcon, getLargeIcon ? 32 : 16 );
-            if (bitmap == null) {
-                return null;
-            }            
-            return new BufferedImage(bitmap);
-        }
-        return null;
-    }
-
-
-    /**
-     * @return The icon image used to display this shell folder
-     */
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    public Image getIcon(boolean getLargeIcon) {
-        Image icon = getLargeIcon ? largeIcon : smallIcon;
-        if (icon == null) {
-            cli.System.IntPtr relativePIDL = getRelativePIDL();
-
-            if (isFileSystem() && parent != null) {
-                // These are cached per type (using the index in the system image list)
-                int index = getIconIndex( ((Win32ShellFolder2)parent).getIShellFolder(), relativePIDL);
-                if (index > 0) {
-                    Map imageCache;
-                    if (isLink()) {
-                        imageCache = getLargeIcon ? largeLinkedSystemImages : smallLinkedSystemImages;
-                    } else {
-                        imageCache = getLargeIcon ? largeSystemImages : smallSystemImages;
-                    }
-                    icon = (Image) imageCache.get(Integer.valueOf(index));
-                    if (icon == null) {
-                    	cli.System.IntPtr hIcon = getIcon(getAbsolutePath(), getLargeIcon);
-                        icon = makeIcon(hIcon, getLargeIcon);
-                        disposeIcon(hIcon);
-                        if (icon != null) {
-                            imageCache.put(Integer.valueOf(index), icon);
-                        }
-                    }
-                }
-            }
-
-            if (icon == null) {
-                // These are only cached per object
-            	cli.System.IntPtr hIcon = extractIcon(getParentIShellFolder(), getRelativePIDL(), getLargeIcon);
-                icon = makeIcon(hIcon, getLargeIcon);
-                disposeIcon(hIcon);
-            }
-
-            if (getLargeIcon) {
-                largeIcon = icon;
-            } else {
-                smallIcon = icon;
-            }
-        }
-        if (icon == null) {
-            icon = super .getIcon(getLargeIcon);
-        }
-        return icon;
-    }
-
-    /**
-     * Gets an icon from the Windows system icon list as an <code>Image</code>
-     */
-    static Image getShell32Icon(int iconID, boolean getLargeIcon) {
-        Bitmap bitmap = getShell32IconResourceAsBitmap(iconID, getLargeIcon);
-        if (bitmap == null) {
-            return null;
-        }
-        return new BufferedImage(bitmap);
-    }
-    
-    private static native Bitmap getShell32IconResourceAsBitmap(int iconID, boolean getLargeIcon);
-
-    /**
-     * Returns the canonical form of this abstract pathname.  Equivalent to
-     * <code>new&nbsp;Win32ShellFolder2(getParentFile(), this.{@link java.io.File#getCanonicalPath}())</code>.
-     *
-     * @see java.io.File#getCanonicalFile
-     */
-    public File getCanonicalFile() throws IOException {
-        return this;
-    }
-
-    /*
-     * Indicates whether this is a special folder (includes My Documents)
-     */
-    public boolean isSpecial() {
-        return isPersonal || !isFileSystem() || (this == getDesktop());
-    }
-
-    /**
-     * Compares this object with the specified object for order.
-     *
-     * @see sun.awt.shell.ShellFolder#compareTo(File)
-     */
-    public int compareTo(File file2) {
-        if (!(file2 instanceof Win32ShellFolder2)) {
-            if (isFileSystem() && !isSpecial()) {
-                return super.compareTo(file2);
-            } else {
-                return -1; // Non-file shellfolders sort before files
-            }
-        }
-        return Win32ShellFolderManager2.compareShellFolders(this, (Win32ShellFolder2) file2);
-    }
-
-    // native constants from commctrl.h
-    private static final int LVCFMT_LEFT = 0;
-    private static final int LVCFMT_RIGHT = 1;
-    private static final int LVCFMT_CENTER = 2;
-
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    public ShellFolderColumnInfo[] getFolderColumns() {
-    	Object o = doGetColumnInfo(getIShellFolder());
-        ShellFolderColumnInfo[] columns = (ShellFolderColumnInfo[]) o;
-
-        if (columns != null) {
-            List<ShellFolderColumnInfo> notNullColumns = new ArrayList<ShellFolderColumnInfo>();
-            for (int i = 0; i < columns.length; i++) {
-                ShellFolderColumnInfo column = columns[i];
-                if (column != null) {
-                    column.setAlignment(column.getAlignment() == LVCFMT_RIGHT ? SwingConstants.RIGHT
-                                    : column.getAlignment() == LVCFMT_CENTER ? SwingConstants.CENTER
-                                            : SwingConstants.LEADING);
-
-                    column.setComparator(new ColumnComparator(i));
-
-                    notNullColumns.add(column);
-                }
-            }
-            columns = new ShellFolderColumnInfo[notNullColumns.size()];
-            notNullColumns.toArray(columns);
-        }
-        return columns;
-    }
-
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    public Object getFolderColumnValue(int column) {
-        return doGetColumnValue(getParentIShellFolder(), getRelativePIDL(), column);
-    }
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    private static native cli.System.Object /*ShellFolderColumnInfo[]*/ doGetColumnInfo( cli.System.Object iShellFolder2 );
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    private static native Object doGetColumnValue(cli.System.Object parentIShellFolder2, cli.System.IntPtr childPIDL, int columnIdx);
-
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static native int compareIDsByColumn(cli.System.Object pParentIShellFolder, cli.System.IntPtr pidl1, cli.System.IntPtr pidl2, int columnIdx);
-
-    private class ColumnComparator implements Comparator {
-        private final int columnIdx;
-
-        public ColumnComparator(int columnIdx) {
-            this.columnIdx = columnIdx;
-        }
-
-        // compares 2 objects within this folder by the specified column
-        @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-        public int compare(Object o, Object o1) {
-            if (o instanceof  Win32ShellFolder2 && o1 instanceof  Win32ShellFolder2) {
-                // delegates comparison to native method
-                return compareIDsByColumn(getIShellFolder(),
-                        ((Win32ShellFolder2) o).getRelativePIDL(),
-                        ((Win32ShellFolder2) o1).getRelativePIDL(),
-                        columnIdx);
-            }
-            return 0;
-        }
-    }
-}
\ No newline at end of file
diff --git a/openjdk/sun/awt/shell/Win32ShellFolderManager2.java b/openjdk/sun/awt/shell/Win32ShellFolderManager2.java
deleted file mode 100644
index d688b6a0..00000000
--- a/openjdk/sun/awt/shell/Win32ShellFolderManager2.java
+++ /dev/null
@@ -1,468 +0,0 @@
-/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.awt.shell;
-
-import java.awt.*;
-import java.awt.image.BufferedImage;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.*;
-import java.util.List;
-import java.util.concurrent.*;
-
-import cli.System.IntPtr;
-import cli.System.Drawing.Bitmap;
-import cli.System.Drawing.SystemIcons;
-import sun.security.action.LoadLibraryAction;
-
-import static sun.awt.shell.Win32ShellFolder2.*;
-import sun.awt.OSInfo;
-
-// NOTE: This class supersedes Win32ShellFolderManager, which was removed
-//       from distribution after version 1.4.2.
-
-/**
- * @author Michael Martak
- * @author Leif Samuelsson
- * @author Kenneth Russell
- * @since 1.4
- */
-
-public class Win32ShellFolderManager2 extends ShellFolderManager {
-
-
-    public ShellFolder createShellFolder(File file) throws FileNotFoundException {
-        try {
-            return createShellFolder(getDesktop(), file);
-        } catch (InterruptedException e) {
-            throw new FileNotFoundException("Execution was interrupted");
-        }
-    }
-
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    static Win32ShellFolder2 createShellFolder(Win32ShellFolder2 parent, File file)
-            throws FileNotFoundException, InterruptedException {
-        cli.System.IntPtr pIDL = null;
-        try {
-            pIDL = parent.parseDisplayName(file.getCanonicalPath());
-        } catch (IOException ex) {
-            pIDL = null;
-        }
-        if (pIDL == null || cli.System.IntPtr.Zero.Equals(pIDL) ) {
-            // Shouldn't happen but watch for it anyway
-            throw new FileNotFoundException("File " + file.getAbsolutePath() + " not found");
-        }
-
-        try {
-            return createShellFolderFromRelativePIDL(parent, pIDL);
-        } finally {
-            Win32ShellFolder2.releasePIDL(pIDL);
-        }
-    }
-    
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    static Win32ShellFolder2 createShellFolderFromRelativePIDL(Win32ShellFolder2 parent, cli.System.IntPtr pIDL)
-            throws InterruptedException {
-        // Walk down this relative pIDL, creating new nodes for each of the entries
-        while (pIDL != null && !cli.System.IntPtr.Zero.Equals( pIDL ) ) {
-        	cli.System.IntPtr curPIDL = Win32ShellFolder2.copyFirstPIDLEntry(pIDL);
-            if (curPIDL != null && !cli.System.IntPtr.Zero.Equals( curPIDL )) {
-                parent = new Win32ShellFolder2(parent, curPIDL);
-                pIDL = Win32ShellFolder2.getNextPIDLEntry(pIDL);
-            } else {
-                // The list is empty if the parent is Desktop and pIDL is a shortcut to Desktop
-                break;
-            }
-        }
-        return parent;
-    }
-
-    private static final int VIEW_LIST = 2;
-    private static final int VIEW_DETAILS = 3;
-    private static final int VIEW_PARENTFOLDER = 8;
-    private static final int VIEW_NEWFOLDER = 11;
-
-    private static final Image[] STANDARD_VIEW_BUTTONS = new Image[12];
-
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    private static Image getStandardViewButton(int iconIndex) {
-        Image result = STANDARD_VIEW_BUTTONS[iconIndex];
-
-        if (result != null) {
-            return result;
-        }
-
-        Bitmap bitmap = Win32ShellFolder2.getStandardViewButton0(iconIndex);
-        if( bitmap != null ) {
-        	result = new BufferedImage(bitmap);
-        	STANDARD_VIEW_BUTTONS[iconIndex] = result;
-        }
-
-        return result;
-    }
-
-    // Special folders
-    private static Win32ShellFolder2 desktop;
-    private static Win32ShellFolder2 drives;
-    private static Win32ShellFolder2 recent;
-    private static Win32ShellFolder2 network;
-    private static Win32ShellFolder2 personal;
-
-    static Win32ShellFolder2 getDesktop() {
-        if (desktop == null) {
-            try {
-                desktop = new Win32ShellFolder2(DESKTOP);
-            } catch (IOException e) {
-                // Ignore error
-            } catch (InterruptedException e) {
-                // Ignore error
-            }
-        }
-        return desktop;
-    }
-
-    static Win32ShellFolder2 getDrives() {
-        if (drives == null) {
-            try {
-                drives = new Win32ShellFolder2(DRIVES);
-            } catch (IOException e) {
-                // Ignore error
-            } catch (InterruptedException e) {
-                // Ignore error
-            }
-        }
-        return drives;
-    }
-
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    static Win32ShellFolder2 getRecent() {
-        if (recent == null) {
-            try {
-                String path = Win32ShellFolder2.getFileSystemPath(RECENT);
-                if (path != null) {
-                    recent = createShellFolder(getDesktop(), new File(path));
-                }
-            } catch (InterruptedException e) {
-                // Ignore error
-            } catch (IOException e) {
-                // Ignore error
-            }
-        }
-        return recent;
-    }
-
-    static Win32ShellFolder2 getNetwork() {
-        if (network == null) {
-            try {
-                network = new Win32ShellFolder2(NETWORK);
-            } catch (IOException e) {
-                // Ignore error
-            } catch (InterruptedException e) {
-                // Ignore error
-            }
-        }
-        return network;
-    }
-
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    static Win32ShellFolder2 getPersonal() {
-        if (personal == null) {
-            try {
-                String path = Win32ShellFolder2.getFileSystemPath(PERSONAL);
-                if (path != null) {
-                    Win32ShellFolder2 desktop = getDesktop();
-                    personal = desktop.getChildByPath(path);
-                    if (personal == null) {
-                        personal = createShellFolder(getDesktop(), new File(path));
-                    }
-                    if (personal != null) {
-                        personal.setIsPersonal();
-                    }
-                }
-            } catch (InterruptedException e) {
-                // Ignore error
-            } catch (IOException e) {
-                // Ignore error
-            }
-        }
-        return personal;
-    }
-
-
-    private static File[] roots;
-
-    /**
-     * @param key a <code>String</code>
-     *  "fileChooserDefaultFolder":
-     *    Returns a <code>File</code> - the default shellfolder for a new filechooser
-     *  "roots":
-     *    Returns a <code>File[]</code> - containing the root(s) of the displayable hierarchy
-     *  "fileChooserComboBoxFolders":
-     *    Returns a <code>File[]</code> - an array of shellfolders representing the list to
-     *    show by default in the file chooser's combobox
-     *   "fileChooserShortcutPanelFolders":
-     *    Returns a <code>File[]</code> - an array of shellfolders representing well-known
-     *    folders, such as Desktop, Documents, History, Network, Home, etc.
-     *    This is used in the shortcut panel of the filechooser on Windows 2000
-     *    and Windows Me.
-     *  "fileChooserIcon <icon>":
-     *    Returns an <code>Image</code> - icon can be ListView, DetailsView, UpFolder, NewFolder or
-     *    ViewMenu (Windows only).
-     *  "optionPaneIcon iconName":
-     *    Returns an <code>Image</code> - icon from the system icon list
-     *
-     * @return An Object matching the key string.
-     */
-    public Object get(String key) {
-        if (key.equals("fileChooserDefaultFolder")) {
-            File file = getPersonal();
-            if (file == null) {
-                file = getDesktop();
-            }
-            return file;
-        } else if (key.equals("roots")) {
-            // Should be "History" and "Desktop" ?
-            if (roots == null) {
-                File desktop = getDesktop();
-                if (desktop != null) {
-                    roots = new File[] { desktop };
-                } else {
-                    roots = (File[])super.get(key);
-                }
-            }
-            return roots;
-        } else if (key.equals("fileChooserComboBoxFolders")) {
-            Win32ShellFolder2 desktop = getDesktop();
-
-            if (desktop != null) {
-                ArrayList<File> folders = new ArrayList<File>();
-                Win32ShellFolder2 drives = getDrives();
-
-                Win32ShellFolder2 recentFolder = getRecent();
-                if (recentFolder != null && OSInfo.getWindowsVersion().compareTo(OSInfo.WINDOWS_2000) >= 0) {
-                    folders.add(recentFolder);
-                }
-
-                folders.add(desktop);
-                // Add all second level folders
-                File[] secondLevelFolders = desktop.listFiles();
-                Arrays.sort(secondLevelFolders);
-                for (File secondLevelFolder : secondLevelFolders) {
-                    Win32ShellFolder2 folder = (Win32ShellFolder2) secondLevelFolder;
-                    if (!folder.isFileSystem() || (folder.isDirectory() && !folder.isLink()) ) {
-                        folders.add(folder);
-                        // Add third level for "My Computer"
-                        if (folder.equals(drives)) {
-                            File[] thirdLevelFolders = folder.listFiles();
-                            if (thirdLevelFolders != null && thirdLevelFolders.length > 0) {
-                                List<File> thirdLevelFoldersList = Arrays.asList(thirdLevelFolders);
-
-                                folder.sortChildren(thirdLevelFoldersList);
-                                folders.addAll(thirdLevelFoldersList);
-                            }
-                        }
-                    }
-                }
-                return folders.toArray(new File[folders.size()]);
-            } else {
-                return super.get(key);
-            }
-        } else if (key.equals("fileChooserShortcutPanelFolders")) {
-            Toolkit toolkit = Toolkit.getDefaultToolkit();
-            ArrayList<File> folders = new ArrayList<File>();
-            int i = 0;
-            Object value;
-            do {
-                value = toolkit.getDesktopProperty("win.comdlg.placesBarPlace" + i++);
-                try {
-                    if (value instanceof Integer) {
-                        // A CSIDL
-                        folders.add(new Win32ShellFolder2((Integer)value));
-                    } else if (value instanceof String) {
-                        // A path
-                        folders.add(createShellFolder(new File((String)value)));
-                    }
-                } catch (IOException e) {
-                    // Skip this value
-                } catch (InterruptedException e) {
-                    // Return empty result
-                    return new File[0];
-                }
-            } while (value != null);
-
-            if (folders.size() == 0) {
-                // Use default list of places
-                for (File f : new File[] {
-                    getRecent(), getDesktop(), getPersonal(), getDrives(), getNetwork()
-                }) {
-                    if (f != null) {
-                        folders.add(f);
-                    }
-                }
-            }
-            return folders.toArray(new File[folders.size()]);
-        } else if (key.startsWith("fileChooserIcon ")) {
-            String name = key.substring(key.indexOf(" ") + 1);
-
-            int iconIndex;
-
-            if (name.equals("ListView") || name.equals("ViewMenu")) {
-                iconIndex = VIEW_LIST;
-            } else if (name.equals("DetailsView")) {
-                iconIndex = VIEW_DETAILS;
-            } else if (name.equals("UpFolder")) {
-                iconIndex = VIEW_PARENTFOLDER;
-            } else if (name.equals("NewFolder")) {
-                iconIndex = VIEW_NEWFOLDER;
-            } else {
-                return null;
-            }
-
-            return getStandardViewButton(iconIndex);
-        } else if (key.startsWith("optionPaneIcon ")) {
-            cli.System.Drawing.Icon icon;
-            if (key == "optionPaneIcon Error") {
-                icon = SystemIcons.get_Error();
-            } else if (key == "optionPaneIcon Information") {
-                icon = SystemIcons.get_Information();
-            } else if (key == "optionPaneIcon Question") {
-                icon = SystemIcons.get_Question();
-            } else if (key == "optionPaneIcon Warning") {
-                icon = SystemIcons.get_Warning();
-            } else {
-                return null;
-            }
-            return new BufferedImage(icon.ToBitmap());
-        } else if (key.startsWith("shell32Icon ") || key.startsWith("shell32LargeIcon ")) {
-            String name = key.substring(key.indexOf(" ") + 1);
-            try {
-                int i = Integer.parseInt(name);
-                if (i >= 0) {
-                    return Win32ShellFolder2.getShell32Icon(i, key.startsWith("shell32LargeIcon "));
-                }
-            } catch (NumberFormatException ex) {
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Does <code>dir</code> represent a "computer" such as a node on the network, or
-     * "My Computer" on the desktop.
-     */
-    public boolean isComputerNode(final File dir) {
-        if (dir != null && dir == getDrives()) {
-            return true;
-        } else {
-            String path = AccessController.doPrivileged(new PrivilegedAction<String>() {
-                public String run() {
-                    return dir.getAbsolutePath();
-                }
-            });
-
-            return (path.startsWith("\\\\") && path.indexOf("\\", 2) < 0);      //Network path
-        }
-    }
-
-    public boolean isFileSystemRoot(File dir) {
-        //Note: Removable drives don't "exist" but are listed in "My Computer"
-        if (dir != null) {
-            Win32ShellFolder2 drives = getDrives();
-            if (dir instanceof Win32ShellFolder2) {
-                Win32ShellFolder2 sf = (Win32ShellFolder2)dir;
-                if (sf.isFileSystem()) {
-                    if (sf.parent != null) {
-                        return sf.parent.equals(drives);
-                    }
-                    // else fall through ...
-                } else {
-                    return false;
-                }
-            }
-            String path = dir.getPath();
-
-            if (path.length() != 3 || path.charAt(1) != ':') {
-                return false;
-            }
-
-            File[] files = drives.listFiles();
-
-            return files != null && Arrays.asList(files).contains(dir);
-        }
-        return false;
-    }
-
-    private static List topFolderList = null;
-    static int compareShellFolders(Win32ShellFolder2 sf1, Win32ShellFolder2 sf2) {
-        boolean special1 = sf1.isSpecial();
-        boolean special2 = sf2.isSpecial();
-
-        if (special1 || special2) {
-            if (topFolderList == null) {
-                ArrayList tmpTopFolderList = new ArrayList();
-                tmpTopFolderList.add(Win32ShellFolderManager2.getPersonal());
-                tmpTopFolderList.add(Win32ShellFolderManager2.getDesktop());
-                tmpTopFolderList.add(Win32ShellFolderManager2.getDrives());
-                tmpTopFolderList.add(Win32ShellFolderManager2.getNetwork());
-                topFolderList = tmpTopFolderList;
-            }
-            int i1 = topFolderList.indexOf(sf1);
-            int i2 = topFolderList.indexOf(sf2);
-            if (i1 >= 0 && i2 >= 0) {
-                return (i1 - i2);
-            } else if (i1 >= 0) {
-                return -1;
-            } else if (i2 >= 0) {
-                return 1;
-            }
-        }
-
-        // Non-file shellfolders sort before files
-        if (special1 && !special2) {
-            return -1;
-        } else if (special2 && !special1) {
-            return  1;
-        }
-
-        return compareNames(sf1.getAbsolutePath(), sf2.getAbsolutePath());
-    }
-
-    static int compareNames(String name1, String name2) {
-        // First ignore case when comparing
-        int diff = name1.compareToIgnoreCase(name2);
-        if (diff != 0) {
-            return diff;
-        } else {
-            // May differ in case (e.g. "mail" vs. "Mail")
-            // We need this test for consistent sorting
-            return name1.compareTo(name2);
-        }
-    }
-}
diff --git a/openjdk/sun/awt/windows/WPrinterJob.java b/openjdk/sun/awt/windows/WPrinterJob.java
deleted file mode 100644
index 08756efd..00000000
--- a/openjdk/sun/awt/windows/WPrinterJob.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-  Copyright (C) 2009 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.awt.windows;
-
-import ikvm.awt.IkvmToolkit;
-
-import java.awt.Graphics;
-import java.awt.HeadlessException;
-import java.awt.Toolkit;
-import java.awt.image.BufferedImage;
-import java.awt.print.PageFormat;
-import java.awt.print.Pageable;
-import java.awt.print.Paper;
-import java.awt.print.Printable;
-import java.awt.print.PrinterException;
-import java.awt.print.PrinterJob;
-
-import javax.print.PrintService;
-import javax.print.attribute.PrintRequestAttributeSet;
-
-import cli.System.Drawing.Printing.*;
-
-import sun.print.PeekGraphics;
-import sun.print.PrintPeer;
-import sun.print.RasterPrinterJob;
-import sun.print.Win32PrintService;
-
-import ikvm.internal.NotYetImplementedError;
-
-/**
- * @author Volker Berlin
- */
-public class WPrinterJob extends RasterPrinterJob{
-
-    @Override
-    protected void abortDoc(){
-        throw new NotYetImplementedError();
-    }
-
-    @Override
-    protected void endDoc() throws PrinterException{
-        throw new NotYetImplementedError();
-    }
-
-    @Override
-    protected void endPage(PageFormat format, Printable painter, int index) throws PrinterException{
-        throw new NotYetImplementedError();
-    }
-
-    @Override
-    protected double getPhysicalPageHeight(Paper p){
-        throw new NotYetImplementedError();
-    }
-
-    @Override
-    protected double getPhysicalPageWidth(Paper p){
-        throw new NotYetImplementedError();
-    }
-
-    @Override
-    protected double getPhysicalPrintableHeight(Paper p){
-        throw new NotYetImplementedError();
-    }
-
-    @Override
-    protected double getPhysicalPrintableWidth(Paper p){
-        throw new NotYetImplementedError();
-    }
-
-    @Override
-    protected double getPhysicalPrintableX(Paper p){
-        throw new NotYetImplementedError();
-    }
-
-    @Override
-    protected double getPhysicalPrintableY(Paper p){
-        throw new NotYetImplementedError();
-    }
-
-    @Override
-    protected double getXRes(){
-        throw new NotYetImplementedError();
-    }
-
-    @Override
-    protected double getYRes(){
-        throw new NotYetImplementedError();
-    }
-
-    @Override
-    protected void printBand(byte[] data, int x, int y, int width, int height) throws PrinterException{
-        throw new NotYetImplementedError();
-    }
-
-    @Override
-    protected void startDoc() throws PrinterException{
-        throw new NotYetImplementedError();
-    }
-
-    @Override
-    protected void startPage(PageFormat format, Printable painter, int index, boolean paperChanged)
-            throws PrinterException{
-        throw new NotYetImplementedError();
-    }
-}
diff --git a/openjdk/sun/font/CompositeFont.java b/openjdk/sun/font/CompositeFont.java
deleted file mode 100644
index ba4c59ff..00000000
--- a/openjdk/sun/font/CompositeFont.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
-  Copyright (C) 2009, 2011 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.font;
-
-import java.awt.font.FontRenderContext;
-import java.awt.geom.AffineTransform;
-import java.util.Locale;
-
-import cli.System.Drawing.Font;
-import ikvm.internal.NotYetImplementedError;
-
-
-/**
- * 
- */
-public class CompositeFont extends Font2D{
-	
-	private final PhysicalFont delegate;
-	
-
-    public CompositeFont(PhysicalFont physicalFont, CompositeFont dialog2d) {
-    	delegate = physicalFont;
-	}
-
-	public CompositeFont(Font2D font2d){
-		delegate = (PhysicalFont)font2d;
-	}
-
-    public int getNumSlots() {
-    	throw new NotYetImplementedError();
-    }
-    
-    public PhysicalFont getSlotFont(int slot) {
-    	if( slot == 0){
-    		return delegate;
-    	}
-        throw new NotYetImplementedError();
-    }
-
-	public boolean isStdComposite() {
-		throw new NotYetImplementedError();
-	}
-	
-	@Override
-    public int getStyle(){
-		return delegate.getStyle();
-    }
-
-    @Override
-    public Font createNetFont(java.awt.Font font){
-        return delegate.createNetFont(font);
-    }
-
-	public FontStrike getStrike(java.awt.Font font, AffineTransform devTx,
-			int aa, int fm) {
-		return delegate.getStrike(font, devTx, aa, fm);
-	}
-
-	public FontStrike getStrike(java.awt.Font font, FontRenderContext frc) {
-		return delegate.getStrike(font, frc);
-	}
-
-	public void removeFromCache(FontStrikeDesc desc) {
-		delegate.removeFromCache(desc);
-	}
-
-	public void getFontMetrics(java.awt.Font font, AffineTransform identityTx,
-			Object antiAliasingHint, Object fractionalMetricsHint,
-			float[] metrics) {
-		delegate.getFontMetrics(font, identityTx, antiAliasingHint,
-				fractionalMetricsHint, metrics);
-	}
-
-	public void getStyleMetrics(float pointSize, float[] metrics, int offset) {
-		delegate.getStyleMetrics(pointSize, metrics, offset);
-	}
-
-	public void getFontMetrics(java.awt.Font font, FontRenderContext frc,
-			float[] metrics) {
-		delegate.getFontMetrics(font, frc, metrics);
-	}
-
-	public boolean useAAForPtSize(int ptsize) {
-		return delegate.useAAForPtSize(ptsize);
-	}
-
-	public boolean hasSupplementaryChars() {
-		return delegate.hasSupplementaryChars();
-	}
-
-	public String getPostscriptName() {
-		return delegate.getPostscriptName();
-	}
-
-	public String getFontName(Locale l) {
-		return delegate.getFontName(l);
-	}
-
-	public String getFamilyName(Locale l) {
-		return delegate.getFamilyName(l);
-	}
-
-	public int getNumGlyphs() {
-		return delegate.getNumGlyphs();
-	}
-
-	public int charToGlyph(int wchar) {
-		return delegate.charToGlyph(wchar);
-	}
-
-	public int getMissingGlyphCode() {
-		return delegate.getMissingGlyphCode();
-	}
-
-	public boolean canDisplay(char c) {
-		return delegate.canDisplay(c);
-	}
-
-	public boolean canDisplay(int cp) {
-		return delegate.canDisplay(cp);
-	}
-
-	public byte getBaselineFor(char c) {
-		return delegate.getBaselineFor(c);
-	}
-
-	public float getItalicAngle(java.awt.Font font, AffineTransform at,
-			Object aaHint, Object fmHint) {
-		return delegate.getItalicAngle(font, at, aaHint, fmHint);
-	}
-}
diff --git a/openjdk/sun/font/Font2D.java b/openjdk/sun/font/Font2D.java
deleted file mode 100644
index 7fc9eda0..00000000
--- a/openjdk/sun/font/Font2D.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
-  Copyright (C) 2009 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.font;
-
-import java.awt.Font;
-import java.awt.font.FontRenderContext;
-import java.awt.geom.AffineTransform;
-import java.util.Locale;
-
-import sun.awt.SunHints;
-
-
-
-/**
- * 
- */
-public abstract class Font2D{
-
-    public Font2DHandle handle = new Font2DHandle(this);
-
-    /* SunGraphics2D has font, tx, aa and fm. From this info
-     * can get a Strike object from the cache, creating it if necessary.
-     * This code is designed for multi-threaded access.
-     * For that reason it creates a local FontStrikeDesc rather than filling
-     * in a shared one. Up to two AffineTransforms and one FontStrikeDesc will
-     * be created by every lookup. This appears to perform more than
-     * adequately. But it may make sense to expose FontStrikeDesc
-     * as a parameter so a caller can use its own.
-     * In such a case if a FontStrikeDesc is stored as a key then
-     * we would need to use a private copy.
-     *
-     * Note that this code doesn't prevent two threads from creating
-     * two different FontStrike instances and having one of the threads
-     * overwrite the other in the map. This is likely to be a rare
-     * occurrence and the only consequence is that these callers will have
-     * different instances of the strike, and there'd be some duplication of
-     * population of the strikes. However since users of these strikes are
-     * transient, then the one that was overwritten would soon be freed.
-     * If there is any problem then a small synchronized block would be
-     * required with its attendant consequences for MP scalability.
-     */
-    public FontStrike getStrike(Font font, AffineTransform devTx, int aa, int fm){
-        return getStrike(font, new FontRenderContext(devTx, aa == SunHints.INTVAL_TEXT_ANTIALIAS_ON,
-                fm == SunHints.INTVAL_FRACTIONALMETRICS_ON));
-    }
-    
-    public FontStrike getStrike(Font font, FontRenderContext frc) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public void removeFromCache(FontStrikeDesc desc){
-        // TODO Auto-generated method stub
-
-    }
-
-    /**
-     * The length of the metrics array must be >= 8.  This method will
-     * store the following elements in that array before returning:
-     *    metrics[0]: ascent
-     *    metrics[1]: descent
-     *    metrics[2]: leading
-     *    metrics[3]: max advance
-     *    metrics[4]: strikethrough offset
-     *    metrics[5]: strikethrough thickness
-     *    metrics[6]: underline offset
-     *    metrics[7]: underline thickness
-     */
-    public void getFontMetrics(Font font, AffineTransform identityTx, Object antiAliasingHint,
-            Object fractionalMetricsHint, float[] metrics){
-        FontRenderContext frc = new FontRenderContext(identityTx, antiAliasingHint, fractionalMetricsHint);
-        StrikeMetrics strikeMetrics = getStrike(font, frc).getFontMetrics();
-        metrics[0] = strikeMetrics.getAscent();
-        metrics[1] = strikeMetrics.getDescent();
-        metrics[2] = strikeMetrics.getLeading();
-        metrics[3] = strikeMetrics.getMaxAdvance();    
-        
-        getStyleMetrics(font.getSize2D(), metrics, 4);
-    }
-
-    /**
-     * The length of the metrics array must be >= offset+4, and offset must be
-     * >= 0.  Typically offset is 4.  This method will
-     * store the following elements in that array before returning:
-     *    metrics[off+0]: strikethrough offset
-     *    metrics[off+1]: strikethrough thickness
-     *    metrics[off+2]: underline offset
-     *    metrics[off+3]: underline thickness
-     *
-     * Note that this implementation simply returns default values;
-     * subclasses can override this method to provide more accurate values.
-     */
-    public void getStyleMetrics(float pointSize, float[] metrics, int offset) {
-        metrics[offset] = -metrics[0] / 2.5f;
-        metrics[offset+1] = pointSize / 12;
-        metrics[offset+2] = metrics[offset+1] / 1.5f;
-        metrics[offset+3] = metrics[offset+1];
-    }
-    
-    /**
-     * The length of the metrics array must be >= 4.  This method will
-     * store the following elements in that array before returning:
-     *    metrics[0]: ascent
-     *    metrics[1]: descent
-     *    metrics[2]: leading
-     *    metrics[3]: max advance
-     */
-    public void getFontMetrics(Font font, FontRenderContext frc,
-                               float metrics[]) {
-        StrikeMetrics strikeMetrics = getStrike(font, frc).getFontMetrics();
-        metrics[0] = strikeMetrics.getAscent();
-        metrics[1] = strikeMetrics.getDescent();
-        metrics[2] = strikeMetrics.getLeading();
-        metrics[3] = strikeMetrics.getMaxAdvance();    
-    }
-
-    /*
-     * All the important subclasses override this which is principally for
-     * the TrueType 'gasp' table.
-     */
-    public boolean useAAForPtSize(int ptsize) {
-        return true;
-    }
-
-    public boolean hasSupplementaryChars() {
-        return false;
-    }
-
-    /* The following methods implement public methods on java.awt.Font */
-    public String getPostscriptName(){
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public String getFontName(Locale l){
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public String getFamilyName(Locale l){
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public int getNumGlyphs(){
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    public int charToGlyph(int wchar) {
-        return wchar;
-    }
-
-    public int getMissingGlyphCode(){
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    public boolean canDisplay(char c){
-        //HACK There is no equivalent in C# http://msdn2.microsoft.com/en-us/library/sf4dhbw8(VS.80).aspx
-        return true;
-    }
-
-    public boolean canDisplay(int cp){
-        //HACK There is no equivalent in C# http://msdn2.microsoft.com/en-us/library/sf4dhbw8(VS.80).aspx
-        return true;
-    }
-
-    public byte getBaselineFor(char c) {
-        return Font.ROMAN_BASELINE;
-    }
-
-    public float getItalicAngle(Font font, AffineTransform at,
-                                Object aaHint, Object fmHint) {
-        /* hardwire psz=12 as that's typical and AA vs non-AA for 'gasp' mode
-         * isn't important for the caret slope of this rarely used API.
-         */
-        int aa = FontStrikeDesc.getAAHintIntVal(aaHint, this, 12);
-        int fm = FontStrikeDesc.getFMHintIntVal(fmHint);
-        FontStrike strike = getStrike(font, at, aa, fm);
-        StrikeMetrics metrics = strike.getFontMetrics();
-        if (metrics.ascentY == 0 || metrics.ascentX == 0) {
-            return 0f;
-        } else {
-            /* ascent is "up" from the baseline so its typically
-             * a negative value, so we need to compensate
-             */
-            return metrics.ascentX/-metrics.ascentY;
-        }
-    }
-
-    /** Returns the "real" style of this Font2D. Eg the font face
-     * Lucida Sans Bold" has a real style of Font.BOLD, even though
-     * it may be able to used to simulate bold italic
-     */
-    public abstract int getStyle();
-
-    public abstract cli.System.Drawing.Font createNetFont(Font font);
-
-}
diff --git a/openjdk/sun/font/FontManager.java b/openjdk/sun/font/FontManager.java
deleted file mode 100644
index 3f02cf06..00000000
--- a/openjdk/sun/font/FontManager.java
+++ /dev/null
@@ -1,415 +0,0 @@
-/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (C) 2009 - 2011 Volker Berlin (i-net software)
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.font;
-
-import java.awt.Font;
-import java.lang.reflect.Method;
-import java.util.Locale;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.swing.plaf.FontUIResource;
-
-import cli.System.Drawing.FontFamily;
-import ikvm.internal.NotYetImplementedError;
-
-/*
- * Interface between Java Fonts (java.awt.Font) and the underlying
- * font files/native font resources and the Java and native font scalers.
- */
-public final class FontManager {
-
-    public static final int NO_FALLBACK         = 0;
-    public static final int PHYSICAL_FALLBACK   = 1;
-    public static final int LOGICAL_FALLBACK    = 2;
-    
-    /* deprecated, unsupported hack - actually invokes a bug! */
-    private static boolean usePlatformFontMetrics = false;
-
-    private static ConcurrentHashMap<String, Font2D> fontNameCache =  new ConcurrentHashMap<String, Font2D>();
-
-    private static final Method getFont2D;
-    static{
-        try{
-            getFont2D = Font.class.getDeclaredMethod("getFont2D");
-            getFont2D.setAccessible(true);
-        }catch(NoSuchMethodException ex){
-            NoClassDefFoundError error = new NoClassDefFoundError(ex.toString());
-            error.initCause(ex);
-            throw error;
-        }
-    }
-
-    /* Revise the implementation to in fact mean "font is a composite font.
-     * This ensures that Swing components will always benefit from the
-     * fall back fonts
-     */
-    public static boolean fontSupportsDefaultEncoding(Font font) {
-        // In Java the font must be a instanceof CompositeFont
-        // because .NET fonts are all already Composite Fonts (I think) that we can return true
-        // and does not need to implements CompositeFont
-        return true;
-    }
-
-    /**
-     * This method is provided for internal and exclusive use by Swing.
-     *
-     * It may be used in conjunction with fontSupportsDefaultEncoding(Font)
-     * In the event that a desktop properties font doesn't directly
-     * support the default encoding, (ie because the host OS supports
-     * adding support for the current locale automatically for native apps),
-     * then Swing calls this method to get a font which  uses the specified
-     * font for the code points it covers, but also supports this locale
-     * just as the standard composite fonts do.
-     * Note: this will over-ride any setting where an application
-     * specifies it prefers locale specific composite fonts.
-     * The logic for this, is that this method is used only where the user or
-     * application has specified that the native L&F be used, and that
-     * we should honour that request to use the same font as native apps use.
-     *
-     * The behaviour of this method is to construct a new composite
-     * Font object that uses the specified physical font as its first
-     * component, and adds all the components of "dialog" as fall back
-     * components.
-     * The method currently assumes that only the size and style attributes
-     * are set on the specified font. It doesn't copy the font transform or
-     * other attributes because they aren't set on a font created from
-     * the desktop. This will need to be fixed if use is broadened.
-     *
-     * Operations such as Font.deriveFont will work properly on the
-     * font returned by this method for deriving a different point size.
-     * Additionally it tries to support a different style by calling
-     * getNewComposite() below. That also supports replacing slot zero
-     * with a different physical font but that is expected to be "rare".
-     * Deriving with a different style is needed because its been shown
-     * that some applications try to do this for Swing FontUIResources.
-     * Also operations such as new Font(font.getFontName(..), Font.PLAIN, 14);
-     * will NOT yield the same result, as the new underlying CompositeFont
-     * cannot be "looked up" in the font registry.
-     * This returns a FontUIResource as that is the Font sub-class needed
-     * by Swing.
-     * Suggested usage is something like :
-     * FontUIResource fuir;
-     * Font desktopFont = getDesktopFont(..);
-     * // NOTE even if fontSupportsDefaultEncoding returns true because
-     * // you get Tahoma and are running in an English locale, you may
-     * // still want to just call getCompositeFontUIResource() anyway
-     * // as only then will you get fallback fonts - eg for CJK.
-     * if (FontManager.fontSupportsDefaultEncoding(desktopFont)) {
-     *   fuir = new FontUIResource(..);
-     * } else {
-     *   fuir = FontManager.getCompositeFontUIResource(desktopFont);
-     * }
-     * return fuir;
-     */
-    public static FontUIResource getCompositeFontUIResource(Font font) {
-        throw new NotYetImplementedError();
-    }
-
-    public static Font2D getNewComposite(String family, int style, Font2D handle) {
-        throw new NotYetImplementedError();
-    }
-
-    /*
-     * return String representation of style prepended with "."
-     * This is useful for performance to avoid unnecessary string operations.
-     */
-    private static String dotStyleStr(int num) {
-        switch(num){
-          case Font.BOLD:
-            return ".bold";
-          case Font.ITALIC:
-            return ".italic";
-          case Font.ITALIC | Font.BOLD:
-            return ".bolditalic";
-          default:
-            return ".plain";
-        }
-    }
-
-    /*
-     * The client supplies a name and a style.
-     * The name could be a family name, or a full name.
-     * A font may exist with the specified style, or it may
-     * exist only in some other style. For non-native fonts the scaler
-     * may be able to emulate the required style.
-     */
-    public static Font2D findFont2D(String name, int style, int fallback){
-        String lowerCaseName = name.toLowerCase(Locale.ENGLISH);
-        String mapName = lowerCaseName + dotStyleStr(style);
-        Font2D font2D = fontNameCache.get(mapName);
-
-        if(font2D != null){
-            return font2D;
-        }
-        font2D = new PhysicalFont(name,style);
-        fontNameCache.put(mapName, font2D);
-        return font2D;
-    }
-    
-    /**
-     * Create a new Font2D without caching. This is used from createFont
-     * 
-     * @param family
-     *            .NET FontFamily
-     * @param style
-     *            the style
-     * @return a Font2D
-     */
-    public static Font2D createFont2D( FontFamily family, int style ) {
-        return new PhysicalFont( family, style );
-    }
-    
-    /* This method can be more efficient as it will only need to
-     * do the lookup once, and subsequent calls on the java.awt.Font
-     * instance can utilise the cached Font2D on that object.
-     * Its unfortunate it needs to be a native method, but the font2D
-     * variable has to be private.
-     */
-    public static Font2D getFont2D(Font font){
-        try{
-            return (Font2D)getFont2D.invoke(font);
-        }catch(Exception ex){
-            throw new RuntimeException(ex);
-        }
-    }
-
-    /* Stuff below was in NativeFontWrapper and needed a new home */
-
-    /*
-     * Workaround for apps which are dependent on a font metrics bug
-     * in JDK 1.1. This is an unsupported win32 private setting.
-     */
-    public static boolean usePlatformFontMetrics() {
-        return usePlatformFontMetrics;
-    }
-
-    /* This method doesn't check if alternates are selected in this app
-     * context. Its used by the FontMetrics caching code which in such
-     * a case cannot retrieve a cached metrics solely on the basis of
-     * the Font.equals() method since it needs to also check if the Font2D
-     * is the same.
-     * We also use non-standard composites for Swing native L&F fonts on
-     * Windows. In that case the policy is that the metrics reported are
-     * based solely on the physical font in the first slot which is the
-     * visible java.awt.Font. So in that case the metrics cache which tests
-     * the Font does what we want. In the near future when we expand the GTK
-     * logical font definitions we may need to revisit this if GTK reports
-     * combined metrics instead. For now though this test can be simple.
-     */
-    static boolean maybeUsingAlternateCompositeFonts() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    public static synchronized void preferLocaleFonts() {
-        // TODO Auto-generated method stub
-        
-    }
-
-    public static synchronized void preferProportionalFonts() {
-        // TODO Auto-generated method stub
-    }
-
-    public static boolean registerFont(Font font) {
-        /* This method should not be called with "null".
-         * It is the caller's responsibility to ensure that.
-         */
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    /* This is called by Swing passing in a fontconfig family name
-     * such as "sans". In return Swing gets a FontUIResource instance
-     * that has queried fontconfig to resolve the font(s) used for this.
-     * Fontconfig will if asked return a list of fonts to give the largest
-     * possible code point coverage.
-     * For now we use only the first font returned by fontconfig, and
-     * back it up with the most closely matching JDK logical font.
-     * Essentially this means pre-pending what we return now with fontconfig's
-     * preferred physical font. This could lead to some duplication in cases,
-     * if we already included that font later. We probably should remove such
-     * duplicates, but it is not a significant problem. It can be addressed
-     * later as part of creating a Composite which uses more of the
-     * same fonts as fontconfig. At that time we also should pay more
-     * attention to the special rendering instructions fontconfig returns,
-     * such as whether we should prefer embedded bitmaps over antialiasing.
-     * There's no way to express that via a Font at present.
-     */
-    public static FontUIResource getFontConfigFUIR( String fcFamily, int style, int size ) {
-        return new FontUIResource( fcFamily, style, size );
-    }
-
-    /* The following fields and methods which relate to layout
-     * perhaps belong in some other class but FontManager is already
-     * widely used as an entry point for other JDK code that needs
-     * access to the font system internals.
-     */
-
-    /**
-     * Referenced by code in the JDK which wants to test for the
-     * minimum char code for which layout may be required.
-     * Note that even basic latin text can benefit from ligatures,
-     * eg "ffi" but we presently apply those only if explicitly
-     * requested with TextAttribute.LIGATURES_ON.
-     * The value here indicates the lowest char code for which failing
-     * to invoke layout would prevent acceptable rendering.
-     */
-    public static final int MIN_LAYOUT_CHARCODE = 0x0300;
-
-    /**
-     * Referenced by code in the JDK which wants to test for the
-     * maximum char code for which layout may be required.
-     * Note this does not account for supplementary characters
-     * where the caller interprets 'layout' to mean any case where
-     * one 'char' (ie the java type char) does not map to one glyph
-     */
-    public static final int MAX_LAYOUT_CHARCODE = 0x206F;
-
-    /* If the character code falls into any of a number of unicode ranges
-     * where we know that simple left->right layout mapping chars to glyphs
-     * 1:1 and accumulating advances is going to produce incorrect results,
-     * we want to know this so the caller can use a more intelligent layout
-     * approach. A caller who cares about optimum performance may want to
-     * check the first case and skip the method call if its in that range.
-     * Although there's a lot of tests in here, knowing you can skip
-     * CTL saves a great deal more. The rest of the checks are ordered
-     * so that rather than checking explicitly if (>= start & <= end)
-     * which would mean all ranges would need to be checked so be sure
-     * CTL is not needed, the method returns as soon as it recognises
-     * the code point is outside of a CTL ranges.
-     * NOTE: Since this method accepts an 'int' it is asssumed to properly
-     * represent a CHARACTER. ie it assumes the caller has already
-     * converted surrogate pairs into supplementary characters, and so
-     * can handle this case and doesn't need to be told such a case is
-     * 'complex'.
-     */
-    static boolean isComplexCharCode(int code) {
-
-        if (code < MIN_LAYOUT_CHARCODE || code > MAX_LAYOUT_CHARCODE) {
-            return false;
-        }
-        else if (code <= 0x036f) {
-            // Trigger layout for combining diacriticals 0x0300->0x036f
-            return true;
-        }
-        else if (code < 0x0590) {
-            // No automatic layout for Greek, Cyrillic, Armenian.
-             return false;
-        }
-        else if (code <= 0x06ff) {
-            // Hebrew 0590 - 05ff
-            // Arabic 0600 - 06ff
-            return true;
-        }
-        else if (code < 0x0900) {
-            return false; // Syriac and Thaana
-        }
-        else if (code <= 0x0e7f) {
-            // if Indic, assume shaping for conjuncts, reordering:
-            // 0900 - 097F Devanagari
-            // 0980 - 09FF Bengali
-            // 0A00 - 0A7F Gurmukhi
-            // 0A80 - 0AFF Gujarati
-            // 0B00 - 0B7F Oriya
-            // 0B80 - 0BFF Tamil
-            // 0C00 - 0C7F Telugu
-            // 0C80 - 0CFF Kannada
-            // 0D00 - 0D7F Malayalam
-            // 0D80 - 0DFF Sinhala
-            // 0E00 - 0E7F if Thai, assume shaping for vowel, tone marks
-            return true;
-        }
-        else if (code < 0x1780) {
-            return false;
-        }
-        else if (code <= 0x17ff) { // 1780 - 17FF Khmer
-            return true;
-        }
-        else if (code < 0x200c) {
-            return false;
-        }
-        else if (code <= 0x200d) { //  zwj or zwnj
-            return true;
-        }
-        else if (code >= 0x202a && code <= 0x202e) { // directional control
-            return true;
-        }
-        else if (code >= 0x206a && code <= 0x206f) { // directional control
-            return true;
-        }
-        return false;
-    }
-
-    /* This is almost the same as the method above, except it takes a
-     * char which means it may include undecoded surrogate pairs.
-     * The distinction is made so that code which needs to identify all
-     * cases in which we do not have a simple mapping from
-     * char->unicode character->glyph can be be identified.
-     * For example measurement cannot simply sum advances of 'chars',
-     * the caret in editable text cannot advance one 'char' at a time, etc.
-     * These callers really are asking for more than whether 'layout'
-     * needs to be run, they need to know if they can assume 1->1
-     * char->glyph mapping.
-     */
-    static boolean isNonSimpleChar(char ch) {
-        return
-            isComplexCharCode(ch) ||
-            (ch >= CharToGlyphMapper.HI_SURROGATE_START &&
-             ch <= CharToGlyphMapper.LO_SURROGATE_END);
-    }
-
-    /**
-     * If there is anything in the text which triggers a case
-     * where char->glyph does not map 1:1 in straightforward
-     * left->right ordering, then this method returns true.
-     * Scripts which might require it but are not treated as such
-     * due to JDK implementations will not return true.
-     * ie a 'true' return is an indication of the treatment by
-     * the implementation.
-     * Whether supplementary characters should be considered is dependent
-     * on the needs of the caller. Since this method accepts the 'char' type
-     * then such chars are always represented by a pair. From a rendering
-     * perspective these will all (in the cases I know of) still be one
-     * unicode character -> one glyph. But if a caller is using this to
-     * discover any case where it cannot make naive assumptions about
-     * the number of chars, and how to index through them, then it may
-     * need the option to have a 'true' return in such a case.
-     */
-    public static boolean isComplexText(char [] chs, int start, int limit) {
-
-        for (int i = start; i < limit; i++) {
-            if (chs[i] < MIN_LAYOUT_CHARCODE) {
-                continue;
-            }
-            else if (isNonSimpleChar(chs[i])) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-}
diff --git a/openjdk/sun/font/GlyphLayout.java b/openjdk/sun/font/GlyphLayout.java
deleted file mode 100644
index 3d6ed7a9..00000000
--- a/openjdk/sun/font/GlyphLayout.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-  Copyright (C) 2009, 2011 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.font;
-
-import java.awt.Font;
-import java.awt.font.FontRenderContext;
-
-
-
-/**
- * 
- */
-public class GlyphLayout{
-	
-	private static GlyphLayout glyphLayout = new GlyphLayout();
-
-    /**
-     * Return a new instance of GlyphLayout, using the provided layout engine factory.
-     * If null, the system layout engine factory will be used.
-     */
-    public static GlyphLayout get(Object lef) {
-        return glyphLayout; //current this class has no state
-    }
-
-    /**
-     * Return the old instance of GlyphLayout when you are done.  This enables reuse
-     * of GlyphLayout objects.
-     */
-    public static void done(GlyphLayout gl) {
-    }
-
-    /**
-     * Create a glyph vector.
-     * @param font the font to use
-     * @param frc the font render context
-     * @param text the text, including optional context before start and after start + count
-     * @param offset the start of the text to lay out
-     * @param count the length of the text to lay out
-     * @param flags bidi and context flags {@see #java.awt.Font}
-     * @param result a StandardGlyphVector to modify, can be null
-     * @return the layed out glyphvector, if result was passed in, it is returned
-     */
-    public StandardGlyphVector layout(Font font, FontRenderContext frc,
-                                      char[] text, int offset, int count,
-                                      int flags, StandardGlyphVector result)
-    {
-        if (text == null || offset < 0 || count < 0 || (count > text.length - offset)) {
-            throw new IllegalArgumentException();
-        }
-
-		return new StandardGlyphVector(font, text, offset, count, frc);
-    }
-
-
-}
diff --git a/openjdk/sun/font/PhysicalFont.java b/openjdk/sun/font/PhysicalFont.java
deleted file mode 100644
index ad9499bd..00000000
--- a/openjdk/sun/font/PhysicalFont.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
-  Copyright (C) 2009, 2010 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.font;
-
-import java.awt.Font;
-import java.awt.font.FontRenderContext;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.Locale;
-
-import cli.System.Drawing.FontFamily;
-import cli.System.Drawing.FontStyle;
-import cli.System.Globalization.CultureInfo;
-
-/**
- * A Font2D implementation that based on .NET fonts. It replace the equals naming Sun class.
- * A Font2D is define with the font name and the font style but it is independent of the size;
- */
-class PhysicalFont extends Font2D{
-
-    private final FontFamily family;
-    
-    private String familyName; // family name for logical fonts
-
-    private final FontStyle style;
-
-    private static final FontStyle REGULAR = FontStyle.wrap(FontStyle.Regular);
-
-    private static final FontStyle BOLD = FontStyle.wrap(FontStyle.Bold);
-
-    private static final FontStyle ITALIC = FontStyle.wrap(FontStyle.Italic);
-
-    private static final FontStyle BOLD_ITALIC = FontStyle.wrap(FontStyle.Bold + FontStyle.Italic);
-
-    private static final cli.System.Drawing.GraphicsUnit PIXEL = cli.System.Drawing.GraphicsUnit
-            .wrap(cli.System.Drawing.GraphicsUnit.Pixel);
-
-    //for method getStyleMetrics
-    //for Reflection to the .NET 3.0 API in namespace System.Windows.Media of PresentationCore
-    //If we switch to .NET 3.0 then we can access it directly
-    private static boolean isMediaLoaded;
-    private static Class classMediaFontFamily;
-    private static Constructor ctorMediaFontFamily;
-    private static Method getFamilyTypefaces;
-    private static Method getItem;
-    private static Method getStrikethroughPosition;
-    private static Method getStrikethroughThickness;
-    private static Method getUnderlinePosition;
-    private static Method getUnderlineThickness;
-    private float strikethroughPosition;
-    private float strikethroughThickness;
-    private float underlinePosition;
-    private float underlineThickness;
-    
-    
-    PhysicalFont(String name, int style){
-        this.family = createFontFamily(name);
-        this.style = createFontStyle(family, style);
-    }
-
-    PhysicalFont(FontFamily family, int style){
-        this.family = family;
-        this.style = createFontStyle(family, style);
-    }
-
-
-    
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public cli.System.Drawing.Font createNetFont(Font font){
-        float size2D = font.getSize2D();
-        if(size2D <= 0){
-            size2D = 1;
-        }
-        return new cli.System.Drawing.Font(family, size2D, style, PIXEL);
-    }
-
-    /**
-     * Search for .NET FamilyName. For logical fonts it set the variable familyName
-     * @param name the name of the font.
-     * @return ever a FontFamily
-     */
-    private FontFamily createFontFamily(String name){
-        if(Font.MONOSPACED.equalsIgnoreCase(name)){
-        	familyName = Font.MONOSPACED;
-            return FontFamily.get_GenericMonospace();
-        }
-        if(Font.SERIF.equalsIgnoreCase(name)){
-        	familyName = Font.SERIF;
-            return FontFamily.get_GenericSerif();
-        }
-        if(name == null || Font.SANS_SERIF.equalsIgnoreCase(name)){
-        	familyName = Font.SANS_SERIF;
-            return FontFamily.get_GenericSansSerif();
-        }
-        if(Font.DIALOG.equalsIgnoreCase(name)){
-        	familyName = Font.DIALOG;
-            return FontFamily.get_GenericSansSerif();
-        }
-        if(Font.DIALOG_INPUT.equalsIgnoreCase(name)){
-        	familyName = Font.DIALOG_INPUT;
-            return FontFamily.get_GenericSansSerif();
-        }
-        try{
-            if(false) throw new cli.System.ArgumentException();
-            return new FontFamily(name);
-        }catch(cli.System.ArgumentException ex){ 
-        	// continue
-        }
-        
-        //now we want map specific Name to a shorter Family Name like "Arial Bold" --> "Arial"
-        String shortName = name;
-        int spaceIdx = shortName.lastIndexOf(' ');
-        while(spaceIdx > 0){
-        	shortName = shortName.substring(0, spaceIdx).trim();
-            try{
-                if(false) throw new cli.System.ArgumentException();
-                return new FontFamily(shortName);
-            }catch(cli.System.ArgumentException ex){ 
-            	// continue
-            }
-        	spaceIdx = shortName.lastIndexOf(' ');
-        }
-        
-        //now we want map generic names to specific families like "courier" --> "Courier New"
-        FontFamily[] fontFanilies = FontFamily.get_Families();
-        name = name.toLowerCase();
-        for (int i = 0; i < fontFanilies.length; i++) {
-			FontFamily fontFamily = fontFanilies[i];
-			if(fontFamily.get_Name().toLowerCase().startsWith(name)){
-				return fontFamily;
-			}
-		}
-        
-        //we have not find a valid font, we use the default font
-        familyName = Font.DIALOG;
-        return FontFamily.get_GenericSansSerif();
-    }
-
-
-    private static FontStyle createFontStyle(FontFamily family, int style){
-        int fs = FontStyle.Regular;
-        if((style & java.awt.Font.BOLD) != 0){
-            fs |= FontStyle.Bold;
-        }
-        if((style & java.awt.Font.ITALIC) != 0){
-            fs |= FontStyle.Italic;
-        }
-        FontStyle fontStyle = FontStyle.wrap(fs);
-        if(!family.IsStyleAvailable(fontStyle)){
-            // Some Fonts (for example Aharoni) does not support Regular style. This throw an exception else it is not
-            // documented.
-            if(family.IsStyleAvailable(REGULAR)){
-                fontStyle = REGULAR;
-            }else if(family.IsStyleAvailable(BOLD)){
-                fontStyle = BOLD;
-            }else if(family.IsStyleAvailable(ITALIC)){
-                fontStyle = ITALIC;
-            }else if(family.IsStyleAvailable(BOLD_ITALIC)){
-                fontStyle = BOLD_ITALIC;
-            }
-        }
-        return fontStyle;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public FontStrike getStrike(Font font, FontRenderContext frc){
-        return new PhysicalStrike(font, family, style, frc);
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int getStyle(){
-        return style.Value;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getPostscriptName(){
-        return family.get_Name();
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getFontName(Locale locale){
-        return family.GetName(getLanguage(locale));
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getFamilyName(Locale locale){
-    	if(familyName != null){
-    		return familyName;
-    	}
-        return family.GetName(getLanguage(locale));
-    }
-    
-    /**
-     * Convert the Java locale to a language ID
-     */
-    private int getLanguage(Locale locale){
-        int language = 0;
-        try{
-            language = CultureInfo.GetCultureInfo(locale.toString().replace("_", "-")).get_LCID();
-        }catch(Throwable th){
-            try{
-                language = CultureInfo.GetCultureInfo(locale.getLanguage()).get_LCID();
-            }catch(Throwable th2){}
-        }
-        return language;
-    }
-    
-    
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void getStyleMetrics(float pointSize, float[] metrics, int offset) {
-        try{
-            try{
-                if(!isMediaLoaded){
-                    classMediaFontFamily = Class.forName("System.Windows.Media.FontFamily, PresentationCore, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35");
-                    ctorMediaFontFamily = classMediaFontFamily.getConstructor(String.class);
-                    getFamilyTypefaces = classMediaFontFamily.getMethod("get_FamilyTypefaces");
-                }
-                if(classMediaFontFamily != null){
-                    if(strikethroughPosition == 0.0){
-                        Object mediaFontFamily = ctorMediaFontFamily.newInstance(family.get_Name());
-                        Object familyTypefaces = getFamilyTypefaces.invoke(mediaFontFamily);
-                        if(getItem == null){
-                            getItem = familyTypefaces.getClass().getMethod("get_Item", Integer.TYPE);
-                        }
-                        Object familyTypeface = getItem.invoke(familyTypefaces, 0);
-                        if(getStrikethroughPosition == null){
-                            getStrikethroughPosition = familyTypeface.getClass().getMethod("get_StrikethroughPosition");
-                            getStrikethroughThickness = familyTypeface.getClass().getMethod(
-                                    "get_StrikethroughThickness");
-                            getUnderlinePosition = familyTypeface.getClass().getMethod("get_UnderlinePosition");
-                            getUnderlineThickness = familyTypeface.getClass().getMethod("get_UnderlineThickness");
-                        }
-                        strikethroughPosition = ((Number)getStrikethroughPosition.invoke(familyTypeface)).floatValue();
-                        strikethroughThickness = ((Number)getStrikethroughThickness.invoke(familyTypeface))
-                                .floatValue();
-                        underlinePosition = ((Number)getUnderlinePosition.invoke(familyTypeface)).floatValue();
-                        underlineThickness = ((Number)getUnderlineThickness.invoke(familyTypeface)).floatValue();
-                    }
-                }
-                metrics[offset++] = -strikethroughPosition * pointSize;  
-                metrics[offset++] = strikethroughThickness * pointSize;  
-                metrics[offset++] = -underlinePosition * pointSize;  
-                metrics[offset] = underlineThickness * pointSize;  
-            }catch(Throwable ex){
-                // ignore it, NET 3.0 is not available, use the default implementation
-                super.getStyleMetrics(pointSize, metrics, offset);
-            }
-        }finally{
-            isMediaLoaded = true;
-        }
-    }
-}
diff --git a/openjdk/sun/font/PhysicalStrike.java b/openjdk/sun/font/PhysicalStrike.java
deleted file mode 100644
index cf22d94e..00000000
--- a/openjdk/sun/font/PhysicalStrike.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
-  Copyright (C) 2009 - 2011 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.font;
-
-import java.awt.Font;
-import java.awt.Rectangle;
-import java.awt.font.FontRenderContext;
-import java.awt.geom.GeneralPath;
-import java.awt.geom.Point2D.Float;
-
-import cli.System.Drawing.Bitmap;
-import cli.System.Drawing.CharacterRange;
-import cli.System.Drawing.FontFamily;
-import cli.System.Drawing.FontStyle;
-import cli.System.Drawing.Graphics;
-import cli.System.Drawing.RectangleF;
-import cli.System.Drawing.Region;
-import cli.System.Drawing.SizeF;
-import cli.System.Drawing.StringFormat;
-import cli.System.Drawing.StringFormatFlags;
-import cli.System.Drawing.StringTrimming;
-import cli.System.Drawing.Drawing2D.PixelOffsetMode;
-import cli.System.Drawing.Drawing2D.SmoothingMode;
-import cli.System.Drawing.Text.TextRenderingHint;
-
-import ikvm.internal.NotYetImplementedError;
-
-/**
- * A FontStrike implementation that based on .NET fonts. 
- * It replace the equals naming Sun class
- */
-public class PhysicalStrike extends FontStrike{
-
-    private static final Bitmap BITMAP = new Bitmap( 1, 1 );
-    private static Graphics FRACT_GRAPHICS = createGraphics(true);
-    private static Graphics FIXED_GRAPHICS = createGraphics(false);
-
-    private final Font font;
-    private final FontFamily family;
-    private final FontStyle style;
-    private final FontRenderContext frc;
-    private final float size2D;
-    private final float factor;
-    
-    private StrikeMetrics strike;
-    
-    public PhysicalStrike(Font font, FontFamily family, FontStyle style, FontRenderContext frc){
-        this.font = font;
-        this.family = family;
-        this.style = style;
-        this.frc = frc;
-        this.size2D = font.getNetFont().get_Size();
-        this.factor = size2D / family.GetEmHeight(style);
-    }
-    
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    Float getCharMetrics(char ch){
-        return new Float(getCodePointAdvance(ch), 0);
-    }
-
-
-    /**
-     * Create a Graphics with the settings for fractional or fixed FontRenderContext
-     * 
-     * @return
-     */
-    private static Graphics createGraphics(boolean fractional){
-        Graphics g = Graphics.FromImage(BITMAP);
-        g.set_SmoothingMode(SmoothingMode.wrap(fractional ? SmoothingMode.None : SmoothingMode.AntiAlias));
-        g.set_PixelOffsetMode(PixelOffsetMode.wrap(fractional ? PixelOffsetMode.None : PixelOffsetMode.HighQuality));
-        g.set_TextRenderingHint(TextRenderingHint.wrap(fractional ? TextRenderingHint.SingleBitPerPixelGridFit : TextRenderingHint.AntiAliasGridFit));
-        return g;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    float getCodePointAdvance( int cp ) {
-        StringFormat format = new StringFormat(StringFormat.get_GenericTypographic());
-
-        format.set_FormatFlags( StringFormatFlags.wrap( StringFormatFlags.MeasureTrailingSpaces | StringFormatFlags.NoWrap |
-                             StringFormatFlags.FitBlackBox ));
-        format.set_Trimming( StringTrimming.wrap( StringTrimming.None ) );
-        format.SetMeasurableCharacterRanges(new CharacterRange[] {new CharacterRange(0, 1)});
-        boolean fractional = frc.usesFractionalMetrics();
-        Graphics g = fractional ? FRACT_GRAPHICS : FIXED_GRAPHICS;
-        SizeF size;
-        synchronized (g) {
-        	Region[] regions = g.MeasureCharacterRanges(String.valueOf((char)cp), font.getNetFont(),
-        			new RectangleF(0, 0, Integer.MAX_VALUE, Integer.MAX_VALUE), format);
-        	size = regions[0].GetBounds(g).get_Size();
-        	regions[0].Dispose();
-		}
-        return frc.usesFractionalMetrics() ? size.get_Width() :  Math.round(size.get_Width());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    StrikeMetrics getFontMetrics(){
-        if(strike == null){
-            float ascent = family.GetCellAscent(style) * factor;
-            float descent = family.GetCellDescent(style) * factor;
-            float height = family.GetLineSpacing(style) * factor;
-            float leading = height - ascent - descent;
-            strike = new StrikeMetrics(
-                    0, -ascent - leading/2, 
-                    0, descent - leading/2, 
-                    0.25f, 0, 
-                    0, leading, 
-                    size2D * 2, 0);
-        }
-        return strike;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    float getGlyphAdvance(int glyphCode){
-        return getCodePointAdvance( glyphCode );
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    void getGlyphImageBounds(int glyphcode, Float pt, Rectangle result){
-        throw new NotYetImplementedError();
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    long getGlyphImagePtr(int glyphcode){
-        throw new NotYetImplementedError();
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    void getGlyphImagePtrs(int[] glyphCodes, long[] images, int len){
-        throw new NotYetImplementedError();
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    Float getGlyphMetrics(int glyphcode){
-        return getCharMetrics((char)glyphcode);
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    GeneralPath getGlyphOutline(int glyphCode, float x, float y){
-        throw new NotYetImplementedError();
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    java.awt.geom.Rectangle2D.Float getGlyphOutlineBounds(int glyphCode){
-        throw new NotYetImplementedError();
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    GeneralPath getGlyphVectorOutline(int[] glyphs, float x, float y){
-        throw new NotYetImplementedError();
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int getNumGlyphs(){
-        throw new NotYetImplementedError();
-    }
-
-}
diff --git a/openjdk/sun/font/StandardGlyphVector.java b/openjdk/sun/font/StandardGlyphVector.java
deleted file mode 100644
index fb3de314..00000000
--- a/openjdk/sun/font/StandardGlyphVector.java
+++ /dev/null
@@ -1,511 +0,0 @@
-/*
-  Copyright (C) 2009 - 2013 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.font;
-
-import ikvm.awt.IkvmToolkit;
-
-import java.awt.Font;
-import java.awt.Shape;
-import java.awt.font.FontRenderContext;
-import java.awt.font.GlyphMetrics;
-import java.awt.font.GlyphJustificationInfo;
-import java.awt.font.GlyphVector;
-import java.awt.font.LineMetrics;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.text.CharacterIterator;
-
-import ikvm.internal.NotYetImplementedError;
-
-/**
- * Standard implementation of GlyphVector used by Font, GlyphList, and SunGraphics2D.
- * 
- */
-public class StandardGlyphVector extends GlyphVector{
-    private Font font;
-    private FontRenderContext frc;
-    private final String glyphs; // always
-    private float[] positions; // only if not default advances
-
-
-
-    private Font2D font2D;
-    private FontStrike strike;
-    
-    
-    /////////////////////////////
-    // Constructors and Factory methods
-    /////////////////////////////
-
-    public StandardGlyphVector(Font font, String str, FontRenderContext frc) {
-        if(str == null){
-            throw new NullPointerException("Glyphs are null");
-        }
-        this.font = font;
-        if( frc == null ){
-            frc = new FontRenderContext( null, false, false );
-        }
-        this.frc = frc;
-        this.glyphs = str;
-        this.font2D = FontUtilities.getFont2D(font);
-        this.strike = font2D.getStrike(font, frc);
-    }
-
-    public StandardGlyphVector(Font font, char[] text, FontRenderContext frc) {
-        this(font, text, 0, text.length, frc);
-    }
-
-    public StandardGlyphVector(Font font, char[] text, int start, int count,
-                               FontRenderContext frc) {
-        this(font, new String(text, start, count), frc);
-    }
-
-    private float getTracking(Font font) {
-        if (font.hasLayoutAttributes()) {
-            AttributeValues values = ((AttributeMap)font.getAttributes()).getValues();
-            return values.getTracking();
-        }
-        return 0;
-    }
-
-    public StandardGlyphVector(Font font, CharacterIterator iter, FontRenderContext frc) {
-        this(font, getString(iter), frc);
-    }
-
-    public StandardGlyphVector( Font font, int[] glyphs, FontRenderContext frc ) {
-        this( font, glyphs2chars(glyphs), frc );
-    }
-    
-    /**
-     * Symmetric to {@link #getGlyphCodes(int, int, int[])}
-     * Currently there is no real mapping possible between the chars and the glyph IDs in the TTF file
-     */
-    private static char[] glyphs2chars( int[] glyphs ) {
-        int count = glyphs.length;
-        char[] text = new char[count];
-        for( int i = 0; i < count; ++i ) {
-            text[i] = (char)glyphs[i];
-        }
-        return text;
-    }
-
-    /////////////////////////////
-    // GlyphVector API
-    /////////////////////////////
-
-    @Override
-    public Font getFont() {
-        return this.font;
-    }
-
-    @Override
-    public FontRenderContext getFontRenderContext() {
-        return this.frc;
-    }
-
-    @Override
-    public void performDefaultLayout() {
-        positions = null;
-    }
-
-    @Override
-    public int getNumGlyphs() {
-        return glyphs.length();
-    }
-
-    @Override
-    public int getGlyphCode(int glyphIndex) {
-        return glyphs.charAt(glyphIndex);
-    }
-
-    @Override
-    public int[] getGlyphCodes(int start, int count, int[] result) {
-        if (count < 0) {
-            throw new IllegalArgumentException("count = " + count);
-        }
-        if (start < 0) {
-            throw new IndexOutOfBoundsException("start = " + start);
-        }        
-        if (start > glyphs.length() - count) { // watch out for overflow if index + count overlarge
-            throw new IndexOutOfBoundsException("start + count = " + (start + count));
-        }
-
-        if (result == null) {
-            result = new int[count];
-        }
-        for (int i = 0; i < count; ++i) {
-            result[i] = glyphs.charAt(i + start);
-        }
-        return result;
-    }
-
-    // !!! not cached, assume TextLayout will cache if necessary
-    // !!! reexamine for per-glyph-transforms
-    // !!! revisit for text-on-a-path, vertical
-    @Override
-    public Rectangle2D getLogicalBounds() {
-        initPositions();
-
-        LineMetrics lm = font.getLineMetrics("", frc);
-
-        float minX, minY, maxX, maxY;
-        // horiz only for now...
-        minX = 0;
-        minY = -lm.getAscent();
-        maxX = 0;
-        maxY = lm.getDescent() + lm.getLeading();
-        if (glyphs.length() > 0) {
-            maxX = positions[positions.length - 2];
-        }
-
-        return new Rectangle2D.Float(minX, minY, maxX - minX, maxY - minY);
-    }
-
-    // !!! not cached, assume TextLayout will cache if necessary
-    @Override
-    public Rectangle2D getVisualBounds() {
-        return getOutline().getBounds2D();
-    }
-
-    @Override
-    public Shape getOutline() {
-        return getOutline( 0, 0 );
-    }
-
-    @Override
-    public Shape getOutline(float x, float y) {
-        return IkvmToolkit.DefaultToolkit.get().outline( font, frc, glyphs, x, y );
-    }
-
-    @Override
-    public Shape getGlyphOutline( int glyphIndex ) {
-        return getGlyphOutline( glyphIndex, 0, 0 );
-    }
-
-    @Override
-    public Shape getGlyphOutline( int glyphIndex, float x, float y ) {
-        initPositions();
-        
-        return IkvmToolkit.DefaultToolkit.get().outline( font, frc, glyphs.substring( glyphIndex, glyphIndex + 1 ), x + positions[glyphIndex * 2], y );
-    }
-    
-    @Override
-    public Point2D getGlyphPosition(int ix) {
-        initPositions();
-
-        ix *= 2;
-        return new Point2D.Float(positions[ix], positions[ix + 1]);
-    }
-
-    @Override
-    public void setGlyphPosition(int ix, Point2D pos) {
-        initPositions();
-
-        int ix2 = ix << 1;
-        positions[ix2] = (float)pos.getX();
-        positions[ix2 + 1] = (float)pos.getY();
-    }
-
-    @Override
-    public AffineTransform getGlyphTransform(int ix) {
-        throw new NotYetImplementedError();
-    }
-
-    @Override
-    public float[] getGlyphPositions(int start, int count, float[] result) {
-        if (count < 0) {
-            throw new IllegalArgumentException("count = " + count);
-        }
-        if (start < 0) {
-            throw new IndexOutOfBoundsException("start = " + start);
-        }
-        if (start > this.glyphs.length() + 1 - count) {
-            throw new IndexOutOfBoundsException("start + count = " + (start + count));
-        }
-        int count2 = count * 2;
-        if( result == null ) {
-            result = new float[count2];
-        }
-        initPositions();
-        System.arraycopy( positions, start * 2, result, 0, count2 );
-        return result;
-    }
-
-    @Override
-    public Shape getGlyphLogicalBounds(int ix) {
-        if (ix < 0 || ix >= glyphs.length()) {
-            throw new IndexOutOfBoundsException("ix = " + ix);
-        }
-
-        initPositions();
-        StrikeMetrics metrics = strike.getFontMetrics();
-        float x = positions[ix * 2];
-        return new Rectangle2D.Float( x, -metrics.getAscent(), positions[(ix + 1) * 2] - x, metrics.getAscent()
-                        + metrics.getDescent() + metrics.getLeading() );
-    }
-    
-    @Override
-    public Shape getGlyphVisualBounds(int ix) {
-        if (ix < 0 || ix >= glyphs.length()) {
-            throw new IndexOutOfBoundsException("ix = " + ix);
-        }
-
-        initPositions();
-        return IkvmToolkit.DefaultToolkit.get().outline( font, frc, glyphs.substring( ix, ix + 1 ), positions[ix * 2], 0 );
-    }
-
-    @Override
-    public GlyphMetrics getGlyphMetrics(int ix) {
-        if (ix < 0 || ix >= glyphs.length()) {
-            throw new IndexOutOfBoundsException("ix = " + ix);
-        }
-
-        Rectangle2D vb = getGlyphVisualBounds(ix).getBounds2D();
-        Point2D pt = getGlyphPosition(ix);
-        vb.setRect(vb.getMinX() - pt.getX(),
-                   vb.getMinY() - pt.getY(),
-                   vb.getWidth(),
-                   vb.getHeight());
-        Point2D.Float adv =
-        		strike.getGlyphMetrics( glyphs.charAt( ix ) );
-        GlyphMetrics gm = new GlyphMetrics(true, adv.x, adv.y,
-                                           vb,
-                                          (byte)0);
-        return gm;
-    }
-
-    @Override
-    public GlyphJustificationInfo getGlyphJustificationInfo(int ix) {
-        if (ix < 0 || ix >= glyphs.length()) {
-            throw new IndexOutOfBoundsException("ix = " + ix);
-        }
-
-        // currently we don't have enough information to do this right.  should
-        // get info from the font and use real OT/GX justification.  Right now
-        // sun/font/ExtendedTextSourceLabel assigns one of three infos
-        // based on whether the char is kanji, space, or other.
-
-        return null;
-    }
-
-    @Override
-    public boolean equals(GlyphVector rhs) {
-        if(!(rhs instanceof StandardGlyphVector)){
-            return false;
-        }
-        StandardGlyphVector sgv = (StandardGlyphVector)rhs;
-        if(!glyphs.equals(sgv.glyphs)){
-            return false;
-        }
-        if(equals(font, sgv.font)){
-            return false;
-        }
-        if(equals(frc, sgv.frc)){
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Compare 2 objects via equals where both can be null
-     */
-    private static boolean equals(Object obj1, Object obj2){
-        if(obj1 != null){
-            if(!obj1.equals(obj2)){
-                return false;
-            }
-        }else{
-            if(obj2 != null){
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * As a concrete subclass of GlyphVector, this must implement clone.
-     */
-    @Override
-    public Object clone() {
-        // positions, gti are mutable so we have to clone them
-        // font2d can be shared
-        // fsref is a cache and can be shared
-        try {
-            StandardGlyphVector result = (StandardGlyphVector)super.clone();
-
-            if (positions != null) {
-                result.positions = (float[])positions.clone();
-            }
-
-            return result;
-        }
-        catch (CloneNotSupportedException e) {
-        }
-
-        return this;
-    }
-
-    //////////////////////
-    // StandardGlyphVector new public methods
-    /////////////////////
-
-    /**
-     * Set all the glyph positions, including the 'after last glyph' position.
-     * The srcPositions array must be of length (numGlyphs + 1) * 2.
-     */
-    public void setGlyphPositions(float[] srcPositions) {
-        int requiredLength = glyphs.length() * 2 + 2;
-        if (srcPositions.length != requiredLength) {
-            throw new IllegalArgumentException("srcPositions.length != " + requiredLength);
-        }
-
-        positions = (float[])srcPositions.clone();
-
-    }
-
-    /**
-     * This is a convenience overload that gets all the glyph positions, which
-     * is what you usually want to do if you're getting more than one.
-     * !!! should I bother taking result parameter?
-     */
-    public float[] getGlyphPositions(float[] result) {
-        initPositions();
-        return positions;
-    }
-
-    /**
-     * For each glyph return posx, posy, advx, advy, visx, visy, visw, vish.
-     */
-    public float[] getGlyphInfo() {
-        initPositions();
-        float[] result = new float[glyphs.length() * 8];
-        for (int i = 0, n = 0; i < glyphs.length(); ++i, n += 8) {
-            float x = positions[i*2];
-            float y = positions[i*2+1];
-            result[n] = x;
-            result[n+1] = y;
-
-            int glyphID = glyphs.charAt(i);
-            Point2D.Float adv = strike.getGlyphMetrics(glyphID);
-            result[n+2] = adv.x;
-            result[n+3] = adv.y;
-
-            Rectangle2D vb = getGlyphVisualBounds(i).getBounds2D();
-            result[n+4] = (float)(vb.getMinX());
-            result[n+5] = (float)(vb.getMinY());
-            result[n+6] = (float)(vb.getWidth());
-            result[n+7] = (float)(vb.getHeight());
-        }
-        return result;
-    }
-
-    @Override
-    public void setGlyphTransform(int glyphIndex, AffineTransform newTX){
-        throw new NotYetImplementedError();
-    }
-
-
-    /**
-     * Convert a CharacterIterator to a string
-     * @param iterator the iterator
-     * @return the string
-     */
-    private static String getString(java.text.CharacterIterator iterator){
-        iterator.first();
-        StringBuilder sb = new StringBuilder();
-
-        while(true){
-            char c = iterator.current();
-            if(c == CharacterIterator.DONE){
-                break;
-            }
-            sb.append(c);
-            iterator.next();
-        }
-
-        return sb.toString();
-    }
-
-    /**
-     * Ensure that the positions array exists and holds position data.
-     * If the array is null, this allocates it and sets default positions.
-     */
-    private void initPositions() {
-        if (positions == null) {
-            positions = new float[glyphs.length() * 2 + 2];
-
-            Point2D.Float trackPt = null;
-            float track = getTracking(font);
-            if (track != 0) {
-                track *= font.getSize2D();
-                trackPt = new Point2D.Float(track, 0); // advance delta
-            }
-
-            Point2D.Float pt = new Point2D.Float(0, 0);
-            if (font.isTransformed()) {
-                AffineTransform at = font.getTransform();
-                at.transform(pt, pt);
-                positions[0] = pt.x;
-                positions[1] = pt.y;
-
-                if (trackPt != null) {
-                    at.deltaTransform(trackPt, trackPt);
-                }
-            }
-            for (int i = 0, n = 2; i < glyphs.length(); ++i, n += 2) {
-                addDefaultGlyphAdvance(glyphs.charAt(i), pt);
-                if (trackPt != null) {
-                    pt.x += trackPt.x;
-                    pt.y += trackPt.y;
-                }
-                positions[n] = pt.x;
-                positions[n+1] = pt.y;
-            }
-        }
-    }
-
-    private void addDefaultGlyphAdvance(int glyphID, Point2D.Float result) {
-        Point2D.Float adv = strike.getGlyphMetrics(glyphID);
-        result.x += adv.x;
-        result.y += adv.y;
-    }
-    
-    /**
-     * If the text is a simple text and we can use FontDesignMetrics without a stackoverflow.
-     * @see FontDesignMetrics#stringWidth(String)
-     * @return true, if a simple text. false it is a complex text.
-     */
-	public static boolean isSimpleString(Font font, String str) {
-		if (font.hasLayoutAttributes()) {
-			return false;
-		}
-		for (int i = 0; i < str.length(); ++i) {
-			if (FontUtilities.isNonSimpleChar(str.charAt(i))) {
-				return false;
-			}
-		}
-		return true;
-	}
-}
diff --git a/openjdk/sun/font/StrikeCache.java b/openjdk/sun/font/StrikeCache.java
deleted file mode 100644
index 4bf2e75b..00000000
--- a/openjdk/sun/font/StrikeCache.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.font;
-
-import java.lang.ref.Reference;
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.SoftReference;
-import java.lang.ref.WeakReference;
-import java.awt.Font;
-import java.awt.FontFormatException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import sun.java2d.Disposer;
-import sun.misc.Unsafe;
-import ikvm.internal.NotYetImplementedError;
-
-/**
-
-A FontStrike is the keeper of scaled glyph image data which is expensive
-to compute so needs to be cached.
-So long as that data may be being used it cannot be invalidated.
-Yet we also need to limit the amount of native memory and number of
-strike objects in use.
-For scaleability and ease of use, a key goal is multi-threaded read
-access to a strike, so that it may be shared by multiple client objects,
-potentially executing on different threads, with no special reference
-counting or "check-out/check-in" requirements which would pass on the
-burden of keeping track of strike references to the SG2D and other clients.
-
-A cache of strikes is maintained via Reference objects.
-This helps in two ways :
-1. The VM will free references when memory is low or they have not been
-used in a long time.
-2. Reference queues provide a way to get notification of this so we can
-free native memory resources.
-
- */
-
-public final class StrikeCache {
-
-    static final Unsafe unsafe = Unsafe.getUnsafe();
-
-    static ReferenceQueue refQueue = Disposer.getQueue();
-
-    /* Reference objects may have their referents cleared when GC chooses.
-     * During application client start-up there is typically at least one
-     * GC which causes the hotspot VM to clear soft (not just weak) references
-     * Thus not only is there a GC pause, but the work done do rasterise
-     * glyphs that are fairly certain to be needed again almost immediately
-     * is thrown away. So for performance reasons a simple optimisation is to
-     * keep up to 8 strong references to strikes to reduce the chance of
-     * GC'ing strikes that have been used recently. Note that this may not
-     * suffice in Solaris UTF-8 locales where a single composite strike may be
-     * composed of 15 individual strikes, plus the composite strike.
-     * And this assumes the new architecture doesn't maintain strikes for
-     * natively accessed bitmaps. It may be worth "tuning" the number of
-     * strikes kept around for the platform or locale.
-     * Since no attempt is made to ensure uniqueness or ensure synchronized
-     * access there is no guarantee that this cache will ensure that unique
-     * strikes are cached. Every time a strike is looked up it is added
-     * to the current index in this cache. All this cache has to do to be
-     * worthwhile is prevent excessive cache flushing of strikes that are
-     * referenced frequently. The logic that adds references here could be
-     * tweaked to keep only strikes  that represent untransformed, screen
-     * sizes as that's the typical performance case.
-     */
-    static int MINSTRIKES = 8; // can be overridden by property
-    static int recentStrikeIndex = 0;
-    static FontStrike[] recentStrikes;
-    static boolean cacheRefTypeWeak;
-
-    /*
-     * Native sizes and offsets for glyph cache
-     * There are 10 values.
-     */
-    static int nativeAddressSize;
-    static int glyphInfoSize;
-    static int xAdvanceOffset;
-    static int yAdvanceOffset;
-    static int boundsOffset;
-    static int widthOffset;
-    static int heightOffset;
-    static int rowBytesOffset;
-    static int topLeftXOffset;
-    static int topLeftYOffset;
-    static int pixelDataOffset;
-    static long invisibleGlyphPtr;
-
-    /* Native method used to return information used for unsafe
-     * access to native data.
-     * return values as follows:-
-     * arr[0] = size of an address/pointer.
-     * arr[1] = size of a GlyphInfo
-     * arr[2] = offset of advanceX
-     * arr[3] = offset of advanceY
-     * arr[4] = offset of width
-     * arr[5] = offset of height
-     * arr[6] = offset of rowBytes
-     * arr[7] = offset of topLeftX
-     * arr[8] = offset of topLeftY
-     * arr[9] = offset of pixel data.
-     * arr[10] = address of a GlyphImageRef representing the invisible glyph
-     */
-    static void getGlyphCacheDescription(long[] infoArray){
-        throw new NotYetImplementedError();
-    }
-
-    static {
-
-        long[] nativeInfo = new long[11];
-        getGlyphCacheDescription(nativeInfo);
-        //Can also get address size from Unsafe class :-
-        //nativeAddressSize = unsafe.addressSize();
-        nativeAddressSize = (int)nativeInfo[0];
-        glyphInfoSize     = (int)nativeInfo[1];
-        xAdvanceOffset    = (int)nativeInfo[2];
-        yAdvanceOffset    = (int)nativeInfo[3];
-        widthOffset       = (int)nativeInfo[4];
-        heightOffset      = (int)nativeInfo[5];
-        rowBytesOffset    = (int)nativeInfo[6];
-        topLeftXOffset    = (int)nativeInfo[7];
-        topLeftYOffset    = (int)nativeInfo[8];
-        pixelDataOffset   = (int)nativeInfo[9];
-        invisibleGlyphPtr = nativeInfo[10];
-        if (nativeAddressSize < 4) {
-            throw new InternalError("Unexpected address size for font data: " +
-                                    nativeAddressSize);
-        }
-
-        java.security.AccessController.doPrivileged(
-                                    new java.security.PrivilegedAction() {
-            public Object run() {
-
-               /* Allow a client to override the reference type used to
-                * cache strikes. The default is "soft" which hints to keep
-                * the strikes around. This property allows the client to
-                * override this to "weak" which hint to the GC to free
-                * memory more agressively.
-                */
-               String refType =
-                   System.getProperty("sun.java2d.font.reftype", "soft");
-               cacheRefTypeWeak = refType.equals("weak");
-
-                String minStrikesStr =
-                    System.getProperty("sun.java2d.font.minstrikes");
-                if (minStrikesStr != null) {
-                    try {
-                        MINSTRIKES = Integer.parseInt(minStrikesStr);
-                        if (MINSTRIKES <= 0) {
-                            MINSTRIKES = 1;
-                        }
-                    } catch (NumberFormatException e) {
-                    }
-                }
-
-                recentStrikes = new FontStrike[MINSTRIKES];
-
-                return null;
-            }
-        });
-    }
-
-
-    static void refStrike(FontStrike strike) {
-        int index = recentStrikeIndex;
-        recentStrikes[index] = strike;
-        index++;
-        if (index == MINSTRIKES) {
-            index = 0;
-        }
-        recentStrikeIndex = index;
-    }
-
-    static void disposeStrike(FontStrikeDisposer disposer) {
-        if (disposer.intGlyphImages != null) {
-            freeIntMemory(disposer.intGlyphImages,
-                          disposer.pScalerContext);
-        } else if (disposer.longGlyphImages != null) {
-            freeLongMemory(disposer.longGlyphImages,
-                           disposer.pScalerContext);
-        } else if (disposer.segIntGlyphImages != null) {
-            /* NB Now making multiple JNI calls in this case.
-             * But assuming that there's a reasonable amount of locality
-             * rather than sparse references then it should be OK.
-             */
-            for (int i=0; i<disposer.segIntGlyphImages.length; i++) {
-                if (disposer.segIntGlyphImages[i] != null) {
-                    freeIntMemory(disposer.segIntGlyphImages[i],
-                                  disposer.pScalerContext);
-                    /* native will only free the scaler context once */
-                    disposer.pScalerContext = 0L;
-                    disposer.segIntGlyphImages[i] = null;
-                }
-            }
-            /* This may appear inefficient but it should only be invoked
-             * for a strike that never was asked to rasterise a glyph.
-             */
-            if (disposer.pScalerContext != 0L) {
-                freeIntMemory(new int[0], disposer.pScalerContext);
-            }
-        } else if (disposer.segLongGlyphImages != null) {
-            for (int i=0; i<disposer.segLongGlyphImages.length; i++) {
-                if (disposer.segLongGlyphImages[i] != null) {
-                    freeLongMemory(disposer.segLongGlyphImages[i],
-                                   disposer.pScalerContext);
-                    disposer.pScalerContext = 0L;
-                    disposer.segLongGlyphImages[i] = null;
-                }
-            }
-            if (disposer.pScalerContext != 0L) {
-                freeLongMemory(new long[0], disposer.pScalerContext);
-            }
-        }
-    }
-
-    static void freeIntPointer(int ptr){
-        throw new NotYetImplementedError();
-    }
-    static void freeLongPointer(long ptr){
-        throw new NotYetImplementedError();
-    }
-    private static void freeIntMemory(int[] glyphPtrs, long pContext){
-        throw new NotYetImplementedError();
-    }
-    private static void freeLongMemory(long[] glyphPtrs, long pContext){
-        throw new NotYetImplementedError();
-    }
-
-
-    public static Reference getStrikeRef(FontStrike strike) {
-        return getStrikeRef(strike, cacheRefTypeWeak);
-    }
-
-    public static Reference getStrikeRef(FontStrike strike, boolean weak) {
-        /* Some strikes may have no disposer as there's nothing
-         * for them to free, as they allocated no native resource
-         * eg, if they did not allocate resources because of a problem,
-         * or they never hold native resources. So they create no disposer.
-         * But any strike that reaches here that has a null disposer is
-         * a potential memory leak.
-         */
-        if (strike.disposer == null) {
-            if (weak) {
-                return new WeakReference(strike);
-            } else {
-                return new SoftReference(strike);
-            }
-        }
-
-        if (weak) {
-            return new WeakDisposerRef(strike);
-        } else {
-            return new SoftDisposerRef(strike);
-        }
-    }
-
-    static interface DisposableStrike {
-        FontStrikeDisposer getDisposer();
-    }
-
-    static class SoftDisposerRef
-        extends SoftReference implements DisposableStrike {
-
-        private FontStrikeDisposer disposer;
-
-        public FontStrikeDisposer getDisposer() {
-            return disposer;
-        }
-
-        SoftDisposerRef(FontStrike strike) {
-            super(strike, StrikeCache.refQueue);
-            disposer = strike.disposer;
-            Disposer.addReference(this, disposer);
-        }
-    }
-
-    static class WeakDisposerRef
-        extends WeakReference implements DisposableStrike {
-
-        private FontStrikeDisposer disposer;
-
-        public FontStrikeDisposer getDisposer() {
-            return disposer;
-        }
-
-        WeakDisposerRef(FontStrike strike) {
-            super(strike, StrikeCache.refQueue);
-            disposer = strike.disposer;
-            Disposer.addReference(this, disposer);
-        }
-    }
-
-}
diff --git a/openjdk/sun/font/SunFontManager.java b/openjdk/sun/font/SunFontManager.java
deleted file mode 100644
index 131784a8..00000000
--- a/openjdk/sun/font/SunFontManager.java
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
-  Copyright (C) 2011 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.font;
-
-import ikvm.internal.NotYetImplementedError;
-
-import java.awt.Font;
-import java.awt.FontFormatException;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.StringTokenizer;
-import java.util.TreeMap;
-import java.util.Vector;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.swing.plaf.FontUIResource;
-import sun.awt.AppContext;
-import sun.awt.FontConfiguration;
-import sun.awt.SunToolkit;
-import sun.java2d.FontSupport;
-import sun.util.logging.PlatformLogger;
-
-/**
- * The base implementation of the {@link FontManager} interface. It implements
- * the platform independent, shared parts of OpenJDK's FontManager
- * implementations. The platform specific parts are declared as abstract
- * methods that have to be implemented by specific implementations.
- */
-public class SunFontManager implements FontManager {
-
-    private static class TTFilter implements FilenameFilter {
-        public boolean accept(File dir,String name) {
-            /* all conveniently have the same suffix length */
-            int offset = name.length()-4;
-            if (offset <= 0) { /* must be at least A.ttf */
-                return false;
-            } else {
-                return(name.startsWith(".ttf", offset) ||
-                       name.startsWith(".TTF", offset) ||
-                       name.startsWith(".ttc", offset) ||
-                       name.startsWith(".TTC", offset) ||
-                       name.startsWith(".otf", offset) ||
-                       name.startsWith(".OTF", offset));
-            }
-        }
-    }
-
-    private static class T1Filter implements FilenameFilter {
-        public boolean accept(File dir,String name) {
-            if (noType1Font) {
-                return false;
-            }
-            /* all conveniently have the same suffix length */
-            int offset = name.length()-4;
-            if (offset <= 0) { /* must be at least A.pfa */
-                return false;
-            } else {
-                return(name.startsWith(".pfa", offset) ||
-                       name.startsWith(".pfb", offset) ||
-                       name.startsWith(".PFA", offset) ||
-                       name.startsWith(".PFB", offset));
-            }
-        }
-    }
-
-    /* No need to keep consing up new instances - reuse a singleton.
-     * The trade-off is that these objects don't get GC'd.
-     */
-    private static final FilenameFilter ttFilter = new TTFilter();
-    private static final FilenameFilter t1Filter = new T1Filter();
-
-    public static boolean noType1Font;
-
-    /**
-     * Deprecated, unsupported hack - actually invokes a bug!
-     * Left in for a customer, don't remove.
-     */
-    private boolean usePlatformFontMetrics = false;
-
-    /**
-     * Returns the global SunFontManager instance. This is similar to
-     * {@link FontManagerFactory#getInstance()} but it returns a
-     * SunFontManager instance instead. This is only used in internal classes
-     * where we can safely assume that a SunFontManager is to be used.
-     *
-     * @return the global SunFontManager instance
-     */
-    public static SunFontManager getInstance() {
-        FontManager fm = FontManagerFactory.getInstance();
-        return (SunFontManager) fm;
-    }
-
-    public FilenameFilter getTrueTypeFilter() {
-        return ttFilter;
-    }
-
-    public FilenameFilter getType1Filter() {
-        return t1Filter;
-    }
-
-    @Override
-    public boolean usingPerAppContextComposites() {
-        return _usingPerAppContextComposites;
-    }
-
-    public Font2DHandle getNewComposite(String family, int style,
-            Font2DHandle handle) {
-
-        if (!(handle.font2D instanceof CompositeFont)) {
-            return handle;
-        }
-
-        CompositeFont oldComp = (CompositeFont)handle.font2D;
-        PhysicalFont oldFont = oldComp.getSlotFont(0);
-
-        if (family == null) {
-            family = oldFont.getFamilyName(null);
-        }
-        if (style == -1) {
-            style = oldComp.getStyle();
-        }
-
-        Font2D newFont = findFont2D(family, style, NO_FALLBACK);
-        if (!(newFont instanceof PhysicalFont)) {
-            newFont = oldFont;
-        }
-        PhysicalFont physicalFont = (PhysicalFont)newFont;
-        CompositeFont dialog2D =
-            (CompositeFont)findFont2D("dialog", style, NO_FALLBACK);
-        if (dialog2D == null) { /* shouldn't happen */
-            return handle;
-        }
-        CompositeFont compFont = new CompositeFont(physicalFont, dialog2D);
-        Font2DHandle newHandle = compFont.handle;
-        return newHandle;
-	}
-    
-    /*
-     * return String representation of style prepended with "."
-     * This is useful for performance to avoid unnecessary string operations.
-     */
-    private static String dotStyleStr(int num) {
-        switch(num){
-          case Font.BOLD:
-            return ".bold";
-          case Font.ITALIC:
-            return ".italic";
-          case Font.ITALIC | Font.BOLD:
-            return ".bolditalic";
-          default:
-            return ".plain";
-        }
-    }
-    
-    private ConcurrentHashMap<String, Font2D> fontNameCache =
-            new ConcurrentHashMap<String, Font2D>();
-    /*
-     * The client supplies a name and a style.
-     * The name could be a family name, or a full name.
-     * A font may exist with the specified style, or it may
-     * exist only in some other style. For non-native fonts the scaler
-     * may be able to emulate the required style.
-     */
-    public Font2D findFont2D(String name, int style, int fallback) {
-        String lowerCaseName = name.toLowerCase(Locale.ENGLISH);
-        String mapName = lowerCaseName + dotStyleStr(style);
-        Font2D font;
-
-        /* If preferLocaleFonts() or preferProportionalFonts() has been
-         * called we may be using an alternate set of composite fonts in this
-         * app context. The presence of a pre-built name map indicates whether
-         * this is so, and gives access to the alternate composite for the
-         * name.
-         */
-        if (_usingPerAppContextComposites) {
-            ConcurrentHashMap<String, Font2D> altNameCache =
-                (ConcurrentHashMap<String, Font2D>)
-                AppContext.getAppContext().get(CompositeFont.class);
-            if (altNameCache != null) {
-                font = (Font2D)altNameCache.get(mapName);
-            } else {
-                font = null;
-            }
-        } else {
-            font = fontNameCache.get(mapName);
-        }
-        if (font != null) {
-            return font;
-        }
-
-        if (FontUtilities.isLogging()) {
-            FontUtilities.getLogger().info("Search for font: " + name);
-        }
-
-        // The check below is just so that the bitmap fonts being set by
-        // AWT and Swing thru the desktop properties do not trigger the
-        // the load fonts case. The two bitmap fonts are now mapped to
-        // appropriate equivalents for serif and sansserif.
-        // Note that the cost of this comparison is only for the first
-        // call until the map is filled.
-        if (FontUtilities.isWindows) {
-            if (lowerCaseName.equals("ms sans serif")) {
-                name = "sansserif";
-            } else if (lowerCaseName.equals("ms serif")) {
-                name = "serif";
-            }
-        }
-
-        /* This isn't intended to support a client passing in the
-         * string default, but if a client passes in null for the name
-         * the java.awt.Font class internally substitutes this name.
-         * So we need to recognise it here to prevent a loadFonts
-         * on the unrecognised name. The only potential problem with
-         * this is it would hide any real font called "default"!
-         * But that seems like a potential problem we can ignore for now.
-         */
-        if (lowerCaseName.equals("default")) {
-        	lowerCaseName = name = "dialog";
-        }
-
-        font = new PhysicalFont(name,style);
-        
-        switch (lowerCaseName){
-        case "dialog":
-        	font = new CompositeFont(font); //dialog must a CompositeFont, else there are ClassCastExceptions
-        	break;
-        }
-        fontNameCache.put(mapName, font);
-        return font;
-    }
-
-    /*
-     * Workaround for apps which are dependent on a font metrics bug
-     * in JDK 1.1. This is an unsupported win32 private setting.
-     * Left in for a customer - do not remove.
-     */
-	public boolean usePlatformFontMetrics() {
-		return usePlatformFontMetrics;
-	}
-
-    public Font2D createFont2D(File fontFile, int fontFormat,
-                               boolean isCopy, CreatedFontTracker tracker)
-    throws FontFormatException {
-    	throw new NotYetImplementedError();
-    }
-    /*
-     * This is called when font is determined to be invalid/bad.
-     * It designed to be called (for example) by the font scaler
-     * when in processing a font file it is discovered to be incorrect.
-     * This is different than the case where fonts are discovered to
-     * be incorrect during initial verification, as such fonts are
-     * never registered.
-     * Handles to this font held are re-directed to a default font.
-     * This default may not be an ideal substitute buts it better than
-     * crashing This code assumes a PhysicalFont parameter as it doesn't
-     * make sense for a Composite to be "bad".
-     */
-    public synchronized void deRegisterBadFont(Font2D font2D) {
-        if (!(font2D instanceof PhysicalFont)) {
-            /* We should never reach here, but just in case */
-            return;
-        } else {
-            if (FontUtilities.isLogging()) {
-                FontUtilities.getLogger()
-                                     .severe("Deregister bad font: " + font2D);
-            }
-            throw new NotYetImplementedError();
-        }
-    }
-    
-    /* Supporting "alternate" composite fonts on 2D graphics objects
-     * is accessed by the application by calling methods on the local
-     * GraphicsEnvironment. The overall implementation is described
-     * in one place, here, since otherwise the implementation is spread
-     * around it may be difficult to track.
-     * The methods below call into SunGraphicsEnvironment which creates a
-     * new FontConfiguration instance. The FontConfiguration class,
-     * and its platform sub-classes are updated to take parameters requesting
-     * these behaviours. This is then used to create new composite font
-     * instances. Since this calls the initCompositeFont method in
-     * SunGraphicsEnvironment it performs the same initialization as is
-     * performed normally. There may be some duplication of effort, but
-     * that code is already written to be able to perform properly if called
-     * to duplicate work. The main difference is that if we detect we are
-     * running in an applet/browser/Java plugin environment these new fonts
-     * are not placed in the "default" maps but into an AppContext instance.
-     * The font lookup mechanism in java.awt.Font.getFont2D() is also updated
-     * so that look-up for composite fonts will in that case always
-     * do a lookup rather than returning a cached result.
-     * This is inefficient but necessary else singleton java.awt.Font
-     * instances would not retrieve the correct Font2D for the appcontext.
-     * sun.font.FontManager.findFont2D is also updated to that it uses
-     * a name map cache specific to that appcontext.
-     *
-     * Getting an AppContext is expensive, so there is a global variable
-     * that records whether these methods have ever been called and can
-     * avoid the expense for almost all applications. Once the correct
-     * CompositeFont is associated with the Font, everything should work
-     * through existing mechanisms.
-     * A special case is that GraphicsEnvironment.getAllFonts() must
-     * return an AppContext specific list.
-     *
-     * Calling the methods below is "heavyweight" but it is expected that
-     * these methods will be called very rarely.
-     *
-     * If _usingPerAppContextComposites is true, we are in "applet"
-     * (eg browser) enviroment and at least one context has selected
-     * an alternate composite font behaviour.
-     * If _usingAlternateComposites is true, we are not in an "applet"
-     * environment and the (single) application has selected
-     * an alternate composite font behaviour.
-     *
-     * - Printing: The implementation delegates logical fonts to an AWT
-     * mechanism which cannot use these alternate configurations.
-     * We can detect that alternate fonts are in use and back-off to 2D, but
-     * that uses outlines. Much of this can be fixed with additional work
-     * but that may have to wait. The results should be correct, just not
-     * optimal.
-     */
-    private boolean _usingPerAppContextComposites = false;
-    private boolean _usingAlternateComposites = false;
-
-    /* This method doesn't check if alternates are selected in this app
-     * context. Its used by the FontMetrics caching code which in such
-     * a case cannot retrieve a cached metrics solely on the basis of
-     * the Font.equals() method since it needs to also check if the Font2D
-     * is the same.
-     * We also use non-standard composites for Swing native L&F fonts on
-     * Windows. In that case the policy is that the metrics reported are
-     * based solely on the physical font in the first slot which is the
-     * visible java.awt.Font. So in that case the metrics cache which tests
-     * the Font does what we want. In the near future when we expand the GTK
-     * logical font definitions we may need to revisit this if GTK reports
-     * combined metrics instead. For now though this test can be simple.
-     */
-    public boolean maybeUsingAlternateCompositeFonts() {
-       return false;
-    }
-
-	public boolean usingAlternateFontforJALocales() {
-		return false;
-	}
-	
-    public synchronized void preferLocaleFonts() {
-        if (FontUtilities.isLogging()) {
-            FontUtilities.getLogger().info("Entered preferLocaleFonts().");
-        }
-        /* Test if re-ordering will have any effect */
-        if (!FontConfiguration.willReorderForStartupLocale()) {
-            return;
-        }
-
-    }
-    
-    public synchronized void preferProportionalFonts() {
-    	throw new NotYetImplementedError();
-    }
-
-    public boolean registerFont(Font font) {
-        /* This method should not be called with "null".
-         * It is the caller's responsibility to ensure that.
-         */
-        if (font == null) {
-            return false;
-        }
-        throw new NotYetImplementedError();
-    }
-    
-    /* Called to register fall back fonts */
-	public void registerFontsInDir(String fallbackDirName) {
-	}
-
-    /**
-     * Returns file name for default font, either absolute
-     * or relative as needed by registerFontFile.
-     */
-    public synchronized String getDefaultFontFile() {
-    	return null;
-    }
-
-    /**
-     * Returns face name for default font, or null if
-     * no face names are used for CompositeFontDescriptors
-     * for this platform.
-     */
-    public synchronized String getDefaultFontFaceName() {
-		return null;
-	}
-
-    protected FontUIResource getFontConfigFUIR(String family, int style,
-            int size)
-	{
-    	return new FontUIResource(family, style, size);
-	}
-    
-    /**
-     * Create a new Font2D without caching. This is used from createFont
-     * 
-     * @param family
-     *            .NET FontFamily
-     * @param style
-     *            the style
-     * @return a Font2D
-     */
-    public static Font2D createFont2D( cli.System.Drawing.FontFamily family, int style ) {
-        return new PhysicalFont( family, style );
-    }  
-}
diff --git a/openjdk/sun/font/TrueTypeFont.java b/openjdk/sun/font/TrueTypeFont.java
deleted file mode 100644
index 83000327..00000000
--- a/openjdk/sun/font/TrueTypeFont.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-  Copyright (C) 2011 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.font;
-
-import cli.System.Drawing.FontFamily;
-
-public class TrueTypeFont extends PhysicalFont {
-
-    public static final int GPOSTag = 0x47504F53; // 'GPOS'
-    public static final int GSUBTag = 0x47535542; // 'GSUB'
-
-    public TrueTypeFont(String name, int style) {
-		super(name, style);
-	}
-
-	public TrueTypeFont(FontFamily family, int style) {
-		super(family, style);
-	}
-
-	Object getDirectoryEntry(int tag) {
-		return null;
-	}
-}
diff --git a/openjdk/sun/java2d/HeadlessGraphicsEnvironment.java b/openjdk/sun/java2d/HeadlessGraphicsEnvironment.java
deleted file mode 100644
index 29c05387..00000000
--- a/openjdk/sun/java2d/HeadlessGraphicsEnvironment.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
-  Copyright (C) 2009 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.java2d;
-
-import java.awt.Font;
-import java.awt.Graphics2D;
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
-import java.awt.HeadlessException;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.image.BufferedImage;
-import java.util.Locale;
-
-
-/**
- * Placeholder for not supported headless environment
- */
-public class HeadlessGraphicsEnvironment extends GraphicsEnvironment{
-
-    private final GraphicsEnvironment env;
-    
-
-    public HeadlessGraphicsEnvironment(GraphicsEnvironment env){
-        this.env = env;
-    }
-    
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Graphics2D createGraphics(BufferedImage img){
-        return env.createGraphics(img);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean equals(Object obj){
-        return env.equals(obj);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Font[] getAllFonts(){
-        return env.getAllFonts();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String[] getAvailableFontFamilyNames(){
-        return env.getAvailableFontFamilyNames();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String[] getAvailableFontFamilyNames(Locale l){
-        return env.getAvailableFontFamilyNames(l);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Point getCenterPoint() throws HeadlessException{
-        return env.getCenterPoint();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public GraphicsDevice getDefaultScreenDevice() throws HeadlessException{
-        return env.getDefaultScreenDevice();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Rectangle getMaximumWindowBounds() throws HeadlessException{
-        return env.getMaximumWindowBounds();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public GraphicsDevice[] getScreenDevices() throws HeadlessException{
-        return env.getScreenDevices();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int hashCode(){
-        return env.hashCode();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean isHeadlessInstance(){
-        return env.isHeadlessInstance();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void preferLocaleFonts(){
-        env.preferLocaleFonts();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void preferProportionalFonts(){
-        env.preferProportionalFonts();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean registerFont(Font font){
-        return env.registerFont(font);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String toString(){
-        return env.toString();
-    }    
-}
diff --git a/openjdk/sun/java2d/SunCompositeContext.java b/openjdk/sun/java2d/SunCompositeContext.java
deleted file mode 100644
index 25291c2f..00000000
--- a/openjdk/sun/java2d/SunCompositeContext.java
+++ /dev/null
@@ -1,316 +0,0 @@
-/* AlphaCompositeContext.java -- CompositeContext impl for AlphaComposite
-   Copyright (C) 2006 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If 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. */
-
-
-package sun.java2d;
-
-import java.awt.AWTError;
-import java.awt.AlphaComposite;
-import java.awt.CompositeContext;
-import java.awt.image.ColorModel;
-import java.awt.image.Raster;
-import java.awt.image.WritableRaster;
-
-/**
- * A CompositeContext implementation for {@link AlphaComposite}.
- *
- * @author Roman Kennke (kennke@aicas.com)
- */
-public class SunCompositeContext
-  implements CompositeContext
-{
-
-  /**
-   * The Composite object for which we perform compositing.
-   */
-  private AlphaComposite composite;
-
-  /**
-   * The source color model.
-   */
-  private ColorModel srcColorModel;
-
-  /**
-   * The destination color model.
-   */
-  private ColorModel dstColorModel;
-
-  /**
-   * The blending factor for the source.
-   */
-  private float fs;
-
-  /**
-   * The blending factor for the destination.
-   */
-  private float fd;
-
-  /**
-   * Creates a new AlphaCompositeContext.
-   *
-   * @param aComp the AlphaComposite object 
-   * @param srcCM the source color model
-   * @param dstCM the destination color model
-   */
-  public SunCompositeContext(AlphaComposite aComp, ColorModel srcCM,
-                               ColorModel dstCM)
-  {
-    composite = aComp;
-    srcColorModel = srcCM;
-    dstColorModel = dstCM;
-
-    
-    // Determine the blending factors according to the rule in the
-    // AlphaComposite. For some rules the factors must be determined
-    // dynamically because they depend on the actual pixel value.
-    switch (composite.getRule())
-    {
-      case AlphaComposite.CLEAR:
-        fs = 0.F;
-        fd= 0.F;
-        break;
-      case AlphaComposite.DST:
-        fs = 0.F;
-        fd= 1.F;
-        break;
-      case AlphaComposite.DST_ATOP:
-        fs = 1.F; // Determined later as 1 - alpha_dst;
-        fd = 1.F; // Determined later as alpha_src;
-        break;
-      case AlphaComposite.DST_IN:
-        fs = 0.F;
-        fd = 0.F; // Determined later as alpha_src;
-        break;
-      case AlphaComposite.DST_OUT:
-        fs = 0.F;
-        fd = 0.F; // Determined later as 1 - alpha_src;
-        break;
-      case AlphaComposite.DST_OVER:
-        fs = 1.F; // Determined later as 1 - alpha_dst.
-        fd= 1.F;
-        break;
-      case AlphaComposite.SRC:
-        fs = 1.F;
-        fd= 0.F;
-        break;
-      case AlphaComposite.SRC_ATOP:
-        fs = 1.F; // Determined later as alpha_dst;
-        fd = 1.F; // Determined later as 1 - alpha_src;
-        break;
-      case AlphaComposite.SRC_IN:
-        fs = 0.F; // Determined later as alpha_dst;
-        fd = 0.F;
-        break;
-      case AlphaComposite.SRC_OUT:
-        fs = 0.F; // Determined later as 1 - alpha_dst;
-        fd = 0.F;
-        break;
-      case AlphaComposite.SRC_OVER:
-        fs = 1.F;
-        fd= 1.F; // Determined later as 1 - alpha_src.
-        break;
-      case AlphaComposite.XOR:
-        fs = 1.F; // Determined later as 1 - alpha_dst.
-        fd= 1.F; // Determined later as 1 - alpha_src.
-        break;
-      default:
-        throw new AWTError("Illegal AlphaComposite rule");
-    }
-
-  }
-
-  /**
-   * Releases all resources held by this composite object.
-   */
-  public void dispose()
-  {
-    // Nothing to do here yet.
-  }
-
-  /**
-   * Performs compositing according to the rules specified in the
-   * AlphaComposite from the constructor.
-   */
-  public void compose(Raster src, Raster dstIn, WritableRaster dstOut)
-  {
-
-    // TODO: This implementation is very general and highly inefficient. There
-    // are two possible ways to optimize this:
-    // 1. Special cased implementations for common ColorModels and transfer
-    //    types.
-    // 2. Native implementation.
-
-    int x0 = src.getMinX();
-    int y0 = src.getMinY();
-    int width = src.getWidth();
-    int height = src.getHeight();
-    int x1 = x0 + width;
-    int y1 = y0 + height;
-
-    Object srcPixel = null;
-    Object dstPixel = null;
-
-    // Prepare the array that holds the color and alpha components of the
-    // source pixels.
-    float[] srcComponents;
-    int srcComponentsLength = srcColorModel.getNumComponents();
-    if (! srcColorModel.hasAlpha())
-      srcComponentsLength += 1;
-    srcComponents = new float[srcComponentsLength];
-
-    // Prepare the array that holds the color and alpha components of the
-    // destination pixels.
-    float[] dstComponents;
-    int dstComponentsLength = dstColorModel.getNumComponents();
-    if (! dstColorModel.hasAlpha())
-      dstComponentsLength += 1;
-    dstComponents = new float[dstComponentsLength];
-
-    if (srcComponentsLength != dstComponentsLength)
-      throw new AWTError("The color models of the source and destination have"
-                         + "incompatible number of color components");
-
-    int srcTransferType = srcColorModel.getTransferType();
-    int dstTransferType = dstColorModel.getTransferType();
-
-    for (int y = y0; y < y1; y++)
-      {
-        for (int x = x0; x < x1; x++)
-          {
-            // Fetch source pixel.
-            srcPixel = src.getDataElements(x, y, (int[]) srcPixel);
-            // Fetch destination pixel.
-            dstPixel = dstIn.getDataElements(x, y, dstPixel);
-            // Get normalized components. This is the only type that is
-            // guaranteed to be supported by all ColorModels.
-            srcComponents =
-              srcColorModel.getNormalizedComponents(srcPixel, srcComponents, 0);
-            if (! srcColorModel.hasAlpha())
-              srcComponents[srcComponentsLength - 1] = 1.0F;
-            dstComponents =
-              dstColorModel.getNormalizedComponents(dstPixel, dstComponents, 0);
-            if (! dstColorModel.hasAlpha())
-              dstComponents[dstComponentsLength - 1] = 1.0F;
-
-            // Prepare the input.
-            float compositeAlpha = composite.getAlpha();
-            srcComponents[srcComponentsLength - 1] *= compositeAlpha;
-            if (srcColorModel.isAlphaPremultiplied())
-              {
-                for (int i = srcComponentsLength - 2; i >= 0; i--)
-                  srcComponents[i] *= compositeAlpha;
-              }
-            else
-              {
-                for (int i = srcComponentsLength - 2; i >= 0; i--)
-                  srcComponents[i] *= srcComponents[srcComponentsLength - 1];
-              }
-            if (! dstColorModel.isAlphaPremultiplied())
-              {
-                for (int i = dstComponentsLength - 2; i >= 0; i--)
-                  dstComponents[i] *= dstComponents[dstComponents.length - 1];
-              }
-
-            // Determine the blending factors according to the rule in the
-            // AlphaComposite. For some rules the factors must be determined
-            // dynamically because they depend on the actual pixel value.
-            float srcAlpha = srcComponents[srcComponentsLength - 1];
-            float dstAlpha = dstComponents[dstComponentsLength - 1];
-            switch (composite.getRule())
-            {
-              case AlphaComposite.DST_ATOP:
-                fs = 1.F - dstAlpha;
-                fd = srcAlpha;
-                break;
-              case AlphaComposite.DST_IN:
-                fd = srcAlpha;
-                break;
-              case AlphaComposite.DST_OUT:
-                fd = 1.F - srcAlpha;
-                break;
-              case AlphaComposite.DST_OVER:
-                fs = 1.F - dstAlpha;
-                break;
-              case AlphaComposite.SRC_ATOP:
-                fs = srcAlpha;
-                fd = 1.F - srcAlpha;
-                break;
-              case AlphaComposite.SRC_IN:
-                fs = dstAlpha;
-                break;
-              case AlphaComposite.SRC_OUT:
-                fs = 1.F - dstAlpha;
-                break;
-              case AlphaComposite.SRC_OVER:
-                fd= 1.F - srcAlpha;
-                break;
-              case AlphaComposite.XOR:
-                fs = 1.F - dstAlpha;
-                fd= 1.F - srcAlpha;
-                break;
-              default:
-                // For the other cases the factors have already been determined
-                // in the constructor.
-            }
-
-            // Apply the blending equation to the pixels.
-            for (int i = 0; i < srcComponentsLength; i++)
-              {
-                dstComponents[i] = srcComponents[i] * fs
-                                   + dstComponents[i] * fd;
-              }
-
-            // Convert the result back when the destination is not
-            // alpha-premultiplied.
-            dstAlpha = dstComponents[dstComponentsLength - 1];
-            if (!dstColorModel.isAlphaPremultiplied() && dstAlpha != 0.F)
-              {
-                for (int i = 0; i < dstComponentsLength - 1; i++)
-                  {
-                    dstComponents[i] = dstComponents[i] / dstAlpha; 
-                  }
-              }
-
-            // Store the result in the destination raster.
-            dstPixel = dstColorModel.getDataElements(dstComponents, 0,
-                                                     dstPixel);
-            dstOut.setDataElements(x, y, dstPixel);
-          } // End X loop.
-      } // End Y loop.
-  }
-
-}
diff --git a/openjdk/sun/java2d/SunGraphics2D.java b/openjdk/sun/java2d/SunGraphics2D.java
deleted file mode 100644
index ef7dc57a..00000000
--- a/openjdk/sun/java2d/SunGraphics2D.java
+++ /dev/null
@@ -1,844 +0,0 @@
-/*
-  Copyright (C) 2009 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.java2d;
-
-import java.awt.*;
-import java.awt.RenderingHints.Key;
-import java.awt.font.FontRenderContext;
-import java.awt.font.GlyphVector;
-import java.awt.geom.AffineTransform;
-import java.awt.image.BufferedImage;
-import java.awt.image.BufferedImageOp;
-import java.awt.image.ImageObserver;
-import java.awt.image.RenderedImage;
-import java.awt.image.renderable.RenderableImage;
-import java.text.AttributedCharacterIterator;
-import java.util.Map;
-
-import sun.java2d.pipe.Region;
-import ikvm.internal.NotYetImplementedError;
-
-/**
- * A replacement of the Sun implementation that redirect to the NetGraphics
- */
-public class SunGraphics2D extends Graphics2D{
-    /*
-     * Attribute States
-     */
-    /* Paint */
-    public static final int PAINT_CUSTOM       = 6; /* Any other Paint object */
-    public static final int PAINT_TEXTURE      = 5; /* Tiled Image */
-    public static final int PAINT_RAD_GRADIENT = 4; /* Color RadialGradient */
-    public static final int PAINT_LIN_GRADIENT = 3; /* Color LinearGradient */
-    public static final int PAINT_GRADIENT     = 2; /* Color Gradient */
-    public static final int PAINT_ALPHACOLOR   = 1; /* Non-opaque Color */
-    public static final int PAINT_OPAQUECOLOR  = 0; /* Opaque Color */
-
-    /* Composite*/
-    public static final int COMP_CUSTOM = 3;/* Custom Composite */
-    public static final int COMP_XOR    = 2;/* XOR Mode Composite */
-    public static final int COMP_ALPHA  = 1;/* AlphaComposite */
-    public static final int COMP_ISCOPY = 0;/* simple stores into destination,
-                                             * i.e. Src, SrcOverNoEa, and other
-                                             * alpha modes which replace
-                                             * the destination.
-                                             */
-
-    /* Stroke */
-    public static final int STROKE_CUSTOM = 3; /* custom Stroke */
-    public static final int STROKE_WIDE   = 2; /* BasicStroke */
-    public static final int STROKE_THINDASHED   = 1; /* BasicStroke */
-    public static final int STROKE_THIN   = 0; /* BasicStroke */
-
-    /* Transform */
-    public static final int TRANSFORM_GENERIC = 4; /* any 3x2 */
-    public static final int TRANSFORM_TRANSLATESCALE = 3; /* scale XY */
-    public static final int TRANSFORM_ANY_TRANSLATE = 2; /* non-int translate */
-    public static final int TRANSFORM_INT_TRANSLATE = 1; /* int translate */
-    public static final int TRANSFORM_ISIDENT = 0; /* Identity */
-
-    /* Clipping */
-    public static final int CLIP_SHAPE       = 2; /* arbitrary clip */
-    public static final int CLIP_RECTANGULAR = 1; /* rectangular clip */
-    public static final int CLIP_DEVICE      = 0; /* no clipping set */
-
-    private static SurfaceData surfaceData = new SurfaceData();
-    
-    public int strokeState;
-
-    public Stroke stroke;
-    public int strokeHint;
-
-    public Region clipRegion;
-    public int constrainX;
-    public int constrainY;
-
-    public AffineTransform transform;
-
-    /** a instance of cli.ikvm.awt.NetGraphics */
-    private final Graphics2D graphics;
-    
-    /**
-     * TODO implement the real Constructor
-     */
-    private SunGraphics2D(){
-        graphics = null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void addRenderingHints(Map<?, ?> hints){
-        graphics.addRenderingHints(hints);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void clearRect(int x, int y, int width, int height){
-        graphics.clearRect(x, y, width, height);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void clip(Shape s){
-        graphics.clip(s);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void clipRect(int x, int y, int width, int height){
-        graphics.clipRect(x, y, width, height);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void copyArea(int x, int y, int width, int height, int dx, int dy){
-        graphics.copyArea(x, y, width, height, dx, dy);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Graphics create(){
-        return graphics.create();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Graphics create(int x, int y, int width, int height){
-        return graphics.create(x, y, width, height);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void dispose(){
-        graphics.dispose();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void draw(Shape s){
-        graphics.draw(s);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void draw3DRect(int x, int y, int width, int height, boolean raised){
-        graphics.draw3DRect(x, y, width, height, raised);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void drawArc(int x, int y, int width, int height, int arcStart, int arcAngle){
-        graphics.drawArc(x, y, width, height, arcStart, arcAngle);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void drawBytes(byte[] data, int offset, int length, int x, int y){
-        graphics.drawBytes(data, offset, length, x, y);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void drawChars(char[] data, int offset, int length, int x, int y){
-        graphics.drawChars(data, offset, length, x, y);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void drawGlyphVector(GlyphVector g, float x, float y){
-        graphics.drawGlyphVector(g, x, y);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void drawImage(BufferedImage img, BufferedImageOp op, int x, int y){
-        graphics.drawImage(img, op, x, y);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean drawImage(Image img, AffineTransform xform, ImageObserver obs){
-        return graphics.drawImage(img, xform, obs);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean drawImage(Image image, int x, int y, Color bgcolor, ImageObserver observer){
-        return graphics.drawImage(image, x, y, bgcolor, observer);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean drawImage(Image image, int x, int y, ImageObserver observer){
-        return graphics.drawImage(image, x, y, observer);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean drawImage(Image image, int x, int y, int width, int height, Color bgcolor, ImageObserver observer){
-        return graphics.drawImage(image, x, y, width, height, bgcolor, observer);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean drawImage(Image image, int x, int y, int width, int height, ImageObserver observer){
-        return graphics.drawImage(image, x, y, width, height, observer);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean drawImage(Image image, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2,
-            Color bgcolor, ImageObserver observer){
-        return graphics.drawImage(image, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, bgcolor, observer);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean drawImage(Image image, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2,
-            ImageObserver observer){
-        return graphics.drawImage(image, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, observer);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void drawLine(int x1, int y1, int x2, int y2){
-        graphics.drawLine(x1, y1, x2, y2);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void drawOval(int x, int y, int width, int height){
-        graphics.drawOval(x, y, width, height);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void drawPolygon(int[] points, int[] points2, int npoints){
-        graphics.drawPolygon(points, points2, npoints);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void drawPolygon(Polygon polygon){
-        graphics.drawPolygon(polygon);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void drawPolyline(int[] points, int[] points2, int npoints){
-        graphics.drawPolyline(points, points2, npoints);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void drawRect(int x, int y, int width, int height){
-        graphics.drawRect(x, y, width, height);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void drawRenderableImage(RenderableImage img, AffineTransform xform){
-        graphics.drawRenderableImage(img, xform);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void drawRenderedImage(RenderedImage img, AffineTransform xform){
-        graphics.drawRenderedImage(img, xform);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void drawRoundRect(int x, int y, int width, int height, int arcWidth, int arcHeight){
-        graphics.drawRoundRect(x, y, width, height, arcWidth, arcHeight);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void drawString(AttributedCharacterIterator iterator, float x, float y){
-        graphics.drawString(iterator, x, y);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void drawString(AttributedCharacterIterator iterator, int x, int y){
-        graphics.drawString(iterator, x, y);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void drawString(String str, float x, float y){
-        graphics.drawString(str, x, y);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void drawString(String str, int x, int y){
-        graphics.drawString(str, x, y);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean equals(Object obj){
-        return graphics.equals(obj);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void fill(Shape s){
-        graphics.fill(s);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void fill3DRect(int x, int y, int width, int height, boolean raised){
-        graphics.fill3DRect(x, y, width, height, raised);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void fillArc(int x, int y, int width, int height, int arcStart, int arcAngle){
-        graphics.fillArc(x, y, width, height, arcStart, arcAngle);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void fillOval(int x, int y, int width, int height){
-        graphics.fillOval(x, y, width, height);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void fillPolygon(int[] points, int[] points2, int npoints){
-        graphics.fillPolygon(points, points2, npoints);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void fillPolygon(Polygon polygon){
-        graphics.fillPolygon(polygon);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void fillRect(int x, int y, int width, int height){
-        graphics.fillRect(x, y, width, height);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void fillRoundRect(int x, int y, int width, int height, int arcWidth, int arcHeight){
-        graphics.fillRoundRect(x, y, width, height, arcWidth, arcHeight);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void finalize(){
-        graphics.finalize();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Color getBackground(){
-        return graphics.getBackground();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Shape getClip(){
-        return graphics.getClip();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Rectangle getClipBounds(){
-        return graphics.getClipBounds();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Rectangle getClipBounds(Rectangle r){
-        return graphics.getClipBounds(r);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Rectangle getClipRect(){
-        return graphics.getClipRect();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Color getColor(){
-        return graphics.getColor();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Composite getComposite(){
-        return graphics.getComposite();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public GraphicsConfiguration getDeviceConfiguration(){
-        return graphics.getDeviceConfiguration();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Font getFont(){
-        return graphics.getFont();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public FontMetrics getFontMetrics(){
-        return graphics.getFontMetrics();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public FontMetrics getFontMetrics(Font font){
-        return graphics.getFontMetrics(font);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public FontRenderContext getFontRenderContext(){
-        return graphics.getFontRenderContext();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Paint getPaint(){
-        return graphics.getPaint();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Object getRenderingHint(Key hintKey){
-        return graphics.getRenderingHint(hintKey);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public RenderingHints getRenderingHints(){
-        return graphics.getRenderingHints();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Stroke getStroke(){
-        return graphics.getStroke();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public AffineTransform getTransform(){
-        return graphics.getTransform();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int hashCode(){
-        return graphics.hashCode();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean hit(Rectangle rect, Shape s, boolean onStroke){
-        return graphics.hit(rect, s, onStroke);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean hitClip(int x, int y, int width, int height){
-        return graphics.hitClip(x, y, width, height);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void rotate(double theta, double x, double y){
-        graphics.rotate(theta, x, y);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void rotate(double theta){
-        graphics.rotate(theta);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void scale(double sx, double sy){
-        graphics.scale(sx, sy);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setBackground(Color color){
-        graphics.setBackground(color);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setClip(int x, int y, int width, int height){
-        graphics.setClip(x, y, width, height);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setClip(Shape clip){
-        graphics.setClip(clip);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setColor(Color color){
-        graphics.setColor(color);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setComposite(Composite comp){
-        graphics.setComposite(comp);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setFont(Font font){
-        graphics.setFont(font);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setPaint(Paint paint){
-        graphics.setPaint(paint);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setPaintMode(){
-        graphics.setPaintMode();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setRenderingHint(Key hintKey, Object hintValue){
-        graphics.setRenderingHint(hintKey, hintValue);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setRenderingHints(Map<?, ?> hints){
-        graphics.setRenderingHints(hints);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setStroke(Stroke s){
-        graphics.setStroke(s);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setTransform(AffineTransform Tx){
-        graphics.setTransform(Tx);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setXORMode(Color color){
-        graphics.setXORMode(color);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void shear(double shx, double shy){
-        graphics.shear(shx, shy);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String toString(){
-        return graphics.toString();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void transform(AffineTransform Tx){
-        graphics.transform(Tx);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void translate(double tx, double ty){
-        graphics.translate(tx, ty);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void translate(int x, int y){
-        graphics.translate(x, y);
-    }
-    
-    /*
-     * Special functions of the original SunGraphics2D
-     * 
-     */
-    
-    /*
-     * Intersect usrClip bounds and device bounds to determine the composite
-     * rendering boundaries.
-     */
-    public Region getCompClip() {
-        throw new NotYetImplementedError();
-    }
-
-    /**
-     * Constrain rendering for lightweight objects.
-     *
-     * REMIND: This method will back off to the "workaround"
-     * of using translate and clipRect if the Graphics
-     * to be constrained has a complex transform.  The
-     * drawback of the workaround is that the resulting
-     * clip and device origin cannot be "enforced".
-     *
-     * @exception IllegalStateException If the Graphics
-     * to be constrained has a complex transform.
-     */
-    public void constrain(int i, int j, int k, int l){
-        throw new NotYetImplementedError();
-    }
-    
-    /**
-     * Return the SurfaceData object assigned to manage the destination
-     * drawable surface of this Graphics2D.
-     */
-    public final SurfaceData getSurfaceData() {
-        return surfaceData;
-    }
-    
-    /**
-     * Returns destination that this Graphics renders to.  This could be
-     * either an Image or a Component; subclasses of SurfaceData are
-     * responsible for returning the appropriate object.
-     */
-    public Object getDestination() {
-        throw new NotYetImplementedError();
-    }
-}
diff --git a/openjdk/sun/java2d/SunGraphicsEnvironment.java b/openjdk/sun/java2d/SunGraphicsEnvironment.java
deleted file mode 100644
index 8f746145..00000000
--- a/openjdk/sun/java2d/SunGraphicsEnvironment.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-  Copyright (C) 2009, 2011 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.java2d;
-
-import java.awt.GraphicsConfiguration;
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
-import java.awt.Insets;
-import java.awt.peer.ComponentPeer;
-import java.awt.Rectangle;
-import java.awt.Toolkit;
-
-import sun.awt.DisplayChangedListener;
-import sun.awt.SunDisplayChanger;
-
-
-
-/**
- * A replacement of the Sun implementation that will extends from from NetGraphicsEnvironment
- */
-public abstract class SunGraphicsEnvironment extends GraphicsEnvironment{
-
-    /**
-     * Return the bounds of a GraphicsDevice, less its screen insets.
-     * See also java.awt.GraphicsEnvironment.getUsableBounds();
-     */
-    public static Rectangle getUsableBounds(GraphicsDevice gd) {
-        GraphicsConfiguration gc = gd.getDefaultConfiguration();
-        Insets insets = Toolkit.getDefaultToolkit().getScreenInsets(gc);
-        Rectangle usableBounds = gc.getBounds();
-
-        usableBounds.x += insets.left;
-        usableBounds.y += insets.top;
-        usableBounds.width -= (insets.left + insets.right);
-        usableBounds.height -= (insets.top + insets.bottom);
-
-        return usableBounds;
-    }
-
-    /**
-     * Returns true when the display is local, false for remote displays.
-     *
-     * @return true when the display is local, false for remote displays
-     */
-    public abstract boolean isDisplayLocal();
-
-    /*
-     * ----DISPLAY CHANGE SUPPORT----
-     */
-
-    protected SunDisplayChanger displayChanger = new SunDisplayChanger();
-
-    /**
-     * Add a DisplayChangeListener to be notified when the display settings
-     * are changed.
-     */
-    public void addDisplayChangedListener(DisplayChangedListener client) {
-        displayChanger.add(client);
-    }
-
-    /**
-     * Remove a DisplayChangeListener from Win32GraphicsEnvironment
-     */
-    public void removeDisplayChangedListener(DisplayChangedListener client) {
-        displayChanger.remove(client);
-    }
-
-    /*
-     * ----END DISPLAY CHANGE SUPPORT----
-     */
-
-    /**
-     * Returns true if FlipBufferStrategy with COPIED buffer contents
-     * is preferred for this peer's GraphicsConfiguration over
-     * BlitBufferStrategy, false otherwise.
-     *
-     * The reason FlipBS could be preferred is that in some configurations
-     * an accelerated copy to the screen is supported (like Direct3D 9)
-     *
-     * @return true if flip strategy should be used, false otherwise
-     */
-    public boolean isFlipStrategyPreferred(ComponentPeer peer) {
-        return false;
-    }
-}
diff --git a/openjdk/sun/java2d/SurfaceData.java b/openjdk/sun/java2d/SurfaceData.java
deleted file mode 100644
index 6972b301..00000000
--- a/openjdk/sun/java2d/SurfaceData.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-  Copyright (C) 2011 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.java2d;
-
-public class SurfaceData {
-
-	public boolean isSurfaceLost() {
-		return false;
-	}
-
-}
diff --git a/openjdk/sun/java2d/cmm/lcms/LCMS.java b/openjdk/sun/java2d/cmm/lcms/LCMS.java
deleted file mode 100644
index 06bff7bf..00000000
--- a/openjdk/sun/java2d/cmm/lcms/LCMS.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
-  Copyright (C) 2009 Jeroen Frijters
-  Copyright (C) 2010 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-package sun.java2d.cmm.lcms;
-
-import gnu.java.awt.color.TagEntry;
-
-import java.awt.color.CMMException;
-import java.awt.color.ColorSpace;
-import java.awt.color.ICC_Profile;
-import java.awt.color.ICC_ProfileGray;
-import java.awt.color.ICC_ProfileRGB;
-import java.awt.image.BufferedImage;
-import java.awt.image.Raster;
-import java.awt.image.WritableRaster;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-import sun.java2d.cmm.ColorTransform;
-import sun.java2d.cmm.PCMM;
-
-// dummy color management implementation
-public class LCMS implements PCMM {
-    
-    private static final int HEADER_SIZE = 128;
-    
-    private final ArrayList<ProfileData> profiles = new ArrayList<ProfileData>();
-
-    public synchronized long loadProfile( byte[] data ) {
-        int free = profiles.indexOf( null );
-        if( free != -1 ) {
-            profiles.set( free, new ProfileData( data.clone()) );
-            return free;
-        } else {
-            long id = profiles.size();
-            profiles.add( new ProfileData( data.clone()) );
-            return id;
-        }
-    }
-
-    public synchronized void freeProfile( long profileID ) {
-        profiles.set( (int)profileID, null );
-    }
-
-    public synchronized int getProfileSize( long profileID ) {
-        return profiles.get( (int)profileID ).data.length;
-    }
-
-    public synchronized void getProfileData( long profileID, byte[] data ) {
-        byte[] src = profiles.get( (int)profileID ).data;
-        System.arraycopy( src, 0, data, 0, src.length );
-    }
-
-    public void getTagData( long profileID, int tagSignature, byte[] data ) {
-        ProfileData profile = profiles.get( (int)profileID );
-        if( tagSignature == ICC_Profile.icSigHead ) {
-            byte[] src = profile.data;
-            System.arraycopy( src, 0, data, 0, HEADER_SIZE );
-        } else {
-            TagEntry entry = profile.tags.get( tagSignature );
-            if( entry == null ){
-                throw new CMMException( "tag does not exist: " + tagSignature );
-            }
-            byte[] src = entry.getData();
-            System.arraycopy( src, 0, data, 0, src.length );
-        }
-        
-    }
-
-    public int getTagSize( long profileID, int tagSignature ) {
-        if( tagSignature == ICC_Profile.icSigHead ) {
-            return HEADER_SIZE;
-        }
-        ProfileData profile = profiles.get( (int)profileID );
-        TagEntry entry = profile.tags.get( tagSignature );
-        if( entry == null ){
-            throw new CMMException( "tag does not exist: " + tagSignature );
-        }
-        return entry.getData().length;
-    }
-
-    public void setTagData(long profileID, int tagSignature, byte[] data)
-    {
-        throw new CMMException("Not implemented");
-    }
-
-    public ColorTransform createTransform(ICC_Profile profile, int renderType, int transformType)
-    {
-        return new DummyColorTransform();
-    }
-
-    public ColorTransform createTransform(ColorTransform[] transforms)
-    {
-        return new DummyColorTransform();
-    }
-    
-    private static class ProfileData{
-        
-        private final byte[] data;
-        private final Hashtable<Integer, TagEntry> tags;
-        
-        private ProfileData(byte[] data){
-            this.data = data;
-            this.tags = createTagTable( data );
-        }
-        
-        private static Hashtable<Integer, TagEntry> createTagTable( byte[] data ) throws IllegalArgumentException {
-            ByteBuffer buf = ByteBuffer.wrap( data );
-            int nTags = buf.getInt( HEADER_SIZE );
-
-            Hashtable<Integer, TagEntry> tagTable = new Hashtable<Integer, TagEntry>();
-            for( int i = 0; i < nTags; i++ ) {
-                int sig = buf.getInt( HEADER_SIZE + i * TagEntry.entrySize + 4 );
-                int offset = buf.getInt( HEADER_SIZE + i * TagEntry.entrySize + 8 );
-                int size = buf.getInt( HEADER_SIZE + i * TagEntry.entrySize + 12 );
-                TagEntry te = new TagEntry( sig, offset, size, data );
-
-                if( tagTable.put( sig, te ) != null )
-                    throw new IllegalArgumentException( "Duplicate tag in profile:" + te );
-            }
-            return tagTable;
-        }
-
-    }
-    
-    static class DummyColorTransform implements ColorTransform
-    {
-        public int getNumInComponents()
-        {
-            throw new CMMException("Not implemented");
-        }
-
-        public int getNumOutComponents()
-        {
-            throw new CMMException("Not implemented");
-        }
-
-        public void colorConvert(BufferedImage src, BufferedImage dst)
-        {
-            throw new CMMException("Not implemented");
-        }
-
-        public void colorConvert(Raster src, WritableRaster dst, float[] srcMinVal, float[] srcMaxVal, float[] dstMinVal, float[]dstMaxVal)
-        {
-            throw new CMMException("Not implemented");
-        }
-
-        public void colorConvert(Raster src, WritableRaster dst)
-        {
-            throw new CMMException("Not implemented");
-        }
-
-        public short[] colorConvert(short[] src, short[] dest)
-        {
-            throw new CMMException("Not implemented");
-        }
-
-        public byte[] colorConvert(byte[] src, byte[] dest)
-        {
-            throw new CMMException("Not implemented");
-        }
-    }
-}
diff --git a/openjdk/sun/java2d/pipe/ShapeSpanIterator.java b/openjdk/sun/java2d/pipe/ShapeSpanIterator.java
deleted file mode 100644
index f320ad1d..00000000
--- a/openjdk/sun/java2d/pipe/ShapeSpanIterator.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-  Copyright (C) 2009 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.java2d.pipe;
-
-import java.awt.geom.PathIterator;
-import ikvm.internal.NotYetImplementedError;
-
-/**
- * Replacement for compiling only 
- */
-public class ShapeSpanIterator implements SpanIterator{
-
-    public ShapeSpanIterator(boolean normalize){
-        throw new NotYetImplementedError();
-    }
-
-    public void setOutputArea(Region devBounds){
-        // TODO Auto-generated method stub
-        
-    }
-
-    public void appendPath(PathIterator pathIterator){
-        // TODO Auto-generated method stub
-        
-    }
-
-    public void getPathBox(int[] box){
-        // TODO Auto-generated method stub
-        
-    }
-
-    @Override
-    public long getNativeIterator(){
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    @Override
-    public void intersectClipBox(int lox, int loy, int hix, int hiy){
-        // TODO Auto-generated method stub
-        
-    }
-
-    @Override
-    public boolean nextSpan(int[] spanbox){
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public void skipDownTo(int y){
-        // TODO Auto-generated method stub
-        
-    }
-
-    public void dispose(){
-        // TODO Auto-generated method stub
-        
-    }
-
-}
diff --git a/openjdk/sun/jdbc/odbc/JdbcOdbcCallableStatement.java b/openjdk/sun/jdbc/odbc/JdbcOdbcCallableStatement.java
deleted file mode 100644
index 12a15ff3..00000000
--- a/openjdk/sun/jdbc/odbc/JdbcOdbcCallableStatement.java
+++ /dev/null
@@ -1,662 +0,0 @@
-/*
-  Copyright (C) 2009, 2011 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.jdbc.odbc;
-
-import java.io.InputStream;
-import java.io.Reader;
-import java.math.BigDecimal;
-import java.net.URL;
-import java.sql.*;
-import java.util.Calendar;
-import java.util.Map;
-
-import cli.System.Data.*;
-import cli.System.Data.Common.*;
-import cli.System.Data.Odbc.*;
-
-
-
-/**
- * @author Volker Berlin
- */
-public class JdbcOdbcCallableStatement extends JdbcOdbcPreparedStatement implements CallableStatement{
-
-    private final Parameters parameters = new Parameters();
-    
-    public JdbcOdbcCallableStatement(JdbcOdbcConnection jdbcConn, OdbcCommand command, String sql, int resultSetType, int resultSetConcurrency){
-        super(jdbcConn, command, sql, resultSetType, resultSetConcurrency);
-    }
-
-
-    public final Array getArray(int parameterIndex){
-        return parameters.getArray(parameterIndex);
-    }
-
-
-    public final Array getArray(String parameterName) throws SQLException{
-        return parameters.getArray(parameterName);
-    }
-
-
-    public final BigDecimal getBigDecimal(int parameterIndex, int scale) throws SQLException{
-        return parameters.getBigDecimal(parameterIndex, scale);
-    }
-
-
-    public final BigDecimal getBigDecimal(int parameterIndex) throws SQLException{
-        return parameters.getBigDecimal(parameterIndex);
-    }
-
-
-    public final BigDecimal getBigDecimal(String parameterName) throws SQLException{
-        return parameters.getBigDecimal(parameterName);
-    }
-
-
-    public final Blob getBlob(int parameterIndex){
-        return parameters.getBlob(parameterIndex);
-    }
-
-
-    public final Blob getBlob(String parameterName) throws SQLException{
-        return parameters.getBlob(parameterName);
-    }
-
-
-    public final boolean getBoolean(int parameterIndex) throws SQLException{
-        return parameters.getBoolean(parameterIndex);
-    }
-
-
-    public final boolean getBoolean(String parameterName) throws SQLException{
-        return parameters.getBoolean(parameterName);
-    }
-
-
-    public final byte getByte(int parameterIndex) throws SQLException{
-        return parameters.getByte(parameterIndex);
-    }
-
-
-    public final byte getByte(String parameterName) throws SQLException{
-        return parameters.getByte(parameterName);
-    }
-
-
-    public final byte[] getBytes(int parameterIndex) throws SQLException{
-        return parameters.getBytes(parameterIndex);
-    }
-
-
-    public final byte[] getBytes(String parameterName) throws SQLException{
-        return parameters.getBytes(parameterName);
-    }
-
-
-    public final Reader getCharacterStream(int parameterIndex) throws SQLException{
-        return parameters.getCharacterStream(parameterIndex);
-    }
-
-
-    public final Reader getCharacterStream(String parameterName) throws SQLException{
-        return parameters.getCharacterStream(parameterName);
-    }
-
-
-    public final Clob getClob(int parameterIndex){
-        return parameters.getClob(parameterIndex);
-    }
-
-
-    public final Clob getClob(String parameterName) throws SQLException{
-        return parameters.getClob(parameterName);
-    }
-
-
-    public final Date getDate(int parameterIndex, Calendar cal) throws SQLException{
-        return parameters.getDate(parameterIndex, cal);
-    }
-
-
-    public final Date getDate(int parameterIndex) throws SQLException{
-        return parameters.getDate(parameterIndex);
-    }
-
-
-    public final Date getDate(String parameterName, Calendar cal) throws SQLException{
-        return parameters.getDate(parameterName, cal);
-    }
-
-
-    public final Date getDate(String parameterName) throws SQLException{
-        return parameters.getDate(parameterName);
-    }
-
-
-    public final double getDouble(int parameterIndex) throws SQLException{
-        return parameters.getDouble(parameterIndex);
-    }
-
-
-    public final double getDouble(String parameterName) throws SQLException{
-        return parameters.getDouble(parameterName);
-    }
-
-
-    public final float getFloat(int parameterIndex) throws SQLException{
-        return parameters.getFloat(parameterIndex);
-    }
-
-
-    public final float getFloat(String parameterName) throws SQLException{
-        return parameters.getFloat(parameterName);
-    }
-
-
-    public final int getInt(int parameterIndex) throws SQLException{
-        return parameters.getInt(parameterIndex);
-    }
-
-
-    public final int getInt(String parameterName) throws SQLException{
-        return parameters.getInt(parameterName);
-    }
-
-
-    public final long getLong(int parameterIndex) throws SQLException{
-        return parameters.getLong(parameterIndex);
-    }
-
-
-    public final long getLong(String parameterName) throws SQLException{
-        return parameters.getLong(parameterName);
-    }
-
-
-    public final Reader getNCharacterStream(int parameterIndex) throws SQLException{
-        return parameters.getNCharacterStream(parameterIndex);
-    }
-
-
-    public final Reader getNCharacterStream(String parameterName) throws SQLException{
-        return parameters.getNCharacterStream(parameterName);
-    }
-
-
-    public final NClob getNClob(int parameterIndex){
-        return parameters.getNClob(parameterIndex);
-    }
-
-
-    public final NClob getNClob(String parameterName) throws SQLException{
-        return parameters.getNClob(parameterName);
-    }
-
-
-    public final String getNString(int parameterIndex) throws SQLException{
-        return parameters.getNString(parameterIndex);
-    }
-
-
-    public final String getNString(String parameterName) throws SQLException{
-        return parameters.getNString(parameterName);
-    }
-
-
-    public final Object getObject(int parameterIndex, Map<String, Class<?>> map){
-        return parameters.getObject(parameterIndex, map);
-    }
-
-
-    public final Object getObject(int parameterIndex) throws SQLException{
-        return parameters.getObject(parameterIndex);
-    }
-
-
-    public final Object getObject(String parameterName, Map<String, Class<?>> map) throws SQLException{
-        return parameters.getObject(parameterName, map);
-    }
-
-
-    public final Object getObject(String parameterName) throws SQLException{
-        return parameters.getObject(parameterName);
-    }
-
-
-    public final Ref getRef(int parameterIndex){
-        return parameters.getRef(parameterIndex);
-    }
-
-
-    public final Ref getRef(String parameterName) throws SQLException{
-        return parameters.getRef(parameterName);
-    }
-
-
-    public final RowId getRowId(int parameterIndex){
-        return parameters.getRowId(parameterIndex);
-    }
-
-
-    public final RowId getRowId(String parameterName) throws SQLException{
-        return parameters.getRowId(parameterName);
-    }
-
-
-    public final short getShort(int parameterIndex) throws SQLException{
-        return parameters.getShort(parameterIndex);
-    }
-
-
-    public final short getShort(String parameterName) throws SQLException{
-        return parameters.getShort(parameterName);
-    }
-
-
-    public final SQLXML getSQLXML(int parameterIndex){
-        return parameters.getSQLXML(parameterIndex);
-    }
-
-
-    public final SQLXML getSQLXML(String parameterName) throws SQLException{
-        return parameters.getSQLXML(parameterName);
-    }
-
-
-    public final String getString(int parameterIndex) throws SQLException{
-        return parameters.getString(parameterIndex);
-    }
-
-
-    public final String getString(String parameterName) throws SQLException{
-        return parameters.getString(parameterName);
-    }
-
-
-    public final Time getTime(int parameterIndex, Calendar cal) throws SQLException{
-        return parameters.getTime(parameterIndex, cal);
-    }
-
-
-    public final Time getTime(int parameterIndex) throws SQLException{
-        return parameters.getTime(parameterIndex);
-    }
-
-
-    public final Time getTime(String parameterName, Calendar cal) throws SQLException{
-        return parameters.getTime(parameterName, cal);
-    }
-
-
-    public final Time getTime(String parameterName) throws SQLException{
-        return parameters.getTime(parameterName);
-    }
-
-
-    public final Timestamp getTimestamp(int parameterIndex, Calendar cal) throws SQLException{
-        return parameters.getTimestamp(parameterIndex, cal);
-    }
-
-
-    public final Timestamp getTimestamp(int parameterIndex) throws SQLException{
-        return parameters.getTimestamp(parameterIndex);
-    }
-
-
-    public final Timestamp getTimestamp(String parameterName, Calendar cal) throws SQLException{
-        return parameters.getTimestamp(parameterName, cal);
-    }
-
-
-    public final Timestamp getTimestamp(String parameterName) throws SQLException{
-        return parameters.getTimestamp(parameterName);
-    }
-
-
-    public final URL getURL(int parameterIndex) throws SQLException{
-        return parameters.getURL(parameterIndex);
-    }
-
-
-    public final URL getURL(String parameterName) throws SQLException{
-        return parameters.getURL(parameterName);
-    }
-
-
-    public final boolean wasNull(){
-        return parameters.wasNull();
-    }
-
-
-    public void registerOutParameter(int parameterIndex, int sqlType) throws SQLException{
-        registerOutParameter(parameterIndex, sqlType, -1);
-    }
-
-
-    public void registerOutParameter(String parameterName, int sqlType) throws SQLException{
-        registerOutParameter(parameters.findColumn(parameterName), sqlType);
-    }
-
-
-    public void registerOutParameter(int parameterIndex, int sqlType, int scaleOrLength) throws SQLException{
-        DbParameter para = getPara(parameterIndex);
-        int direction = para.get_Value() == null ? ParameterDirection.Output : ParameterDirection.InputOutput;
-        para.set_Direction(ParameterDirection.wrap(direction));
-
-        if(sqlType != Types.OTHER){
-            para.set_DbType(DbType.wrap(JdbcOdbcUtils.convertJdbc2AdoNetType(sqlType)));
-        }
-        
-        if(scaleOrLength >= 0){
-            switch(sqlType){
-                case Types.DECIMAL:
-                case Types.NUMERIC:
-                    para.set_Scale((byte)scaleOrLength);
-            }
-        }
-    }
-
-
-    public void registerOutParameter(int parameterIndex, int sqlType, String typeName){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public void registerOutParameter(String parameterName, int sqlType, int scale) throws SQLException{
-        registerOutParameter(parameters.findColumn(parameterName), sqlType, scale);
-    }
-
-
-    public void registerOutParameter(String parameterName, int sqlType, String typeName) throws SQLException{
-        registerOutParameter(parameters.findColumn(parameterName), sqlType, typeName);
-    }
-
-
-    public void setAsciiStream(String parameterName, InputStream x) throws SQLException{
-        setAsciiStream(parameters.findColumn(parameterName), x);
-    }
-
-
-    public void setAsciiStream(String parameterName, InputStream x, int length) throws SQLException{
-        setAsciiStream(parameters.findColumn(parameterName), x, length);
-    }
-
-
-    public void setAsciiStream(String parameterName, InputStream x, long length) throws SQLException{
-        setAsciiStream(parameters.findColumn(parameterName), x, length);
-    }
-
-
-    public void setBigDecimal(String parameterName, BigDecimal x) throws SQLException{
-        setBigDecimal(parameters.findColumn(parameterName), x);
-    }
-
-
-    public void setBinaryStream(String parameterName, InputStream x) throws SQLException{
-        setBinaryStream(parameters.findColumn(parameterName), x);
-    }
-
-
-    public void setBinaryStream(String parameterName, InputStream x, int length) throws SQLException{
-        setBinaryStream(parameters.findColumn(parameterName), x, length);
-    }
-
-
-    public void setBinaryStream(String parameterName, InputStream x, long length) throws SQLException{
-        setBinaryStream(parameters.findColumn(parameterName), x, length);
-    }
-
-
-    public void setBlob(String parameterName, Blob x) throws SQLException{
-        setBlob(parameters.findColumn(parameterName), x);
-    }
-
-
-    public void setBlob(String parameterName, InputStream x) throws SQLException{
-        setBlob(parameters.findColumn(parameterName), x);
-    }
-
-
-    public void setBlob(String parameterName, InputStream x, long length) throws SQLException{
-        setBlob(parameters.findColumn(parameterName), x, length);
-    }
-
-
-    public void setBoolean(String parameterName, boolean x) throws SQLException{
-        setBoolean(parameters.findColumn(parameterName), x);
-    }
-
-
-    public void setByte(String parameterName, byte x) throws SQLException{
-        setByte(parameters.findColumn(parameterName), x);
-    }
-
-
-    public void setBytes(String parameterName, byte[] x) throws SQLException{
-        setBytes(parameters.findColumn(parameterName), x);
-    }
-
-
-    public void setCharacterStream(String parameterName, Reader x) throws SQLException{
-        setCharacterStream(parameters.findColumn(parameterName), x);
-    }
-
-
-    public void setCharacterStream(String parameterName, Reader x, int length) throws SQLException{
-        setCharacterStream(parameters.findColumn(parameterName), x, length);
-    }
-
-
-    public void setCharacterStream(String parameterName, Reader x, long length) throws SQLException{
-        setCharacterStream(parameters.findColumn(parameterName), x, length);
-    }
-
-
-    public void setClob(String parameterName, Clob x) throws SQLException{
-        setClob(parameters.findColumn(parameterName), x);
-    }
-
-
-    public void setClob(String parameterName, Reader x) throws SQLException{
-        setClob(parameters.findColumn(parameterName), x);
-    }
-
-
-    public void setClob(String parameterName, Reader x, long length) throws SQLException{
-        setClob(parameters.findColumn(parameterName), x, length);
-    }
-
-
-    public void setDate(String parameterName, Date x) throws SQLException{
-        setDate(parameters.findColumn(parameterName), x);
-    }
-
-
-    public void setDate(String parameterName, Date x, Calendar cal) throws SQLException{
-        setDate(parameters.findColumn(parameterName), x, cal);
-    }
-
-
-    public void setDouble(String parameterName, double x) throws SQLException{
-        setDouble(parameters.findColumn(parameterName), x);
-    }
-
-
-    public void setFloat(String parameterName, float x) throws SQLException{
-        setFloat(parameters.findColumn(parameterName), x);
-    }
-
-
-    public void setInt(String parameterName, int x) throws SQLException{
-        setInt(parameters.findColumn(parameterName), x);
-    }
-
-
-    public void setLong(String parameterName, long x) throws SQLException{
-        setLong(parameters.findColumn(parameterName), x);
-    }
-
-
-    public void setNCharacterStream(String parameterName, Reader x) throws SQLException{
-        setNCharacterStream(parameters.findColumn(parameterName), x);
-    }
-
-
-    public void setNCharacterStream(String parameterName, Reader x, long length) throws SQLException{
-        setNCharacterStream(parameters.findColumn(parameterName), x, length);
-    }
-
-
-    public void setNClob(String parameterName, NClob x) throws SQLException{
-        setNClob(parameters.findColumn(parameterName), x);
-    }
-
-
-    public void setNClob(String parameterName, Reader x) throws SQLException{
-        setNClob(parameters.findColumn(parameterName), x);
-    }
-
-
-    public void setNClob(String parameterName, Reader x, long length) throws SQLException{
-        setNClob(parameters.findColumn(parameterName), x, length);
-    }
-
-
-    public void setNString(String parameterName, String x) throws SQLException{
-        setNString(parameters.findColumn(parameterName), x);
-    }
-
-
-    public void setNull(String parameterName, int sqlType) throws SQLException{
-        setNull(parameters.findColumn(parameterName), sqlType);
-    }
-
-
-    public void setNull(String parameterName, int sqlType, String typeName) throws SQLException{
-        setNull(parameters.findColumn(parameterName), sqlType, typeName);
-    }
-
-
-    public void setObject(String parameterName, Object x) throws SQLException{
-        setObject(parameters.findColumn(parameterName), x);
-    }
-
-
-    public void setObject(String parameterName, Object x, int targetSqlType) throws SQLException{
-        setObject(parameters.findColumn(parameterName), x, targetSqlType);
-    }
-
-
-    public void setObject(String parameterName, Object x, int targetSqlType, int scaleOrLength) throws SQLException{
-        setObject(parameters.findColumn(parameterName), x, targetSqlType, scaleOrLength);
-    }
-
-
-    public void setRowId(String parameterName, RowId x) throws SQLException{
-        setRowId(parameters.findColumn(parameterName), x);
-    }
-
-
-    public void setSQLXML(String parameterName, SQLXML x) throws SQLException{
-        setSQLXML(parameters.findColumn(parameterName), x);
-    }
-
-
-    public void setShort(String parameterName, short x) throws SQLException{
-        setShort(parameters.findColumn(parameterName), x);
-    }
-
-
-    public void setString(String parameterName, String x) throws SQLException{
-        setString(parameters.findColumn(parameterName), x);
-    }
-
-
-    public void setTime(String parameterName, Time x) throws SQLException{
-        setTime(parameters.findColumn(parameterName), x);
-    }
-
-
-    public void setTime(String parameterName, Time x, Calendar cal) throws SQLException{
-        setTime(parameters.findColumn(parameterName), x, cal);
-    }
-
-
-    public void setTimestamp(String parameterName, Timestamp x) throws SQLException{
-        setTimestamp(parameters.findColumn(parameterName), x);
-    }
-
-
-    public void setTimestamp(String parameterName, Timestamp x, Calendar cal) throws SQLException{
-        setTimestamp(parameters.findColumn(parameterName), x, cal);
-    }
-
-
-    public void setURL(String parameterName, URL x) throws SQLException{
-        setURL(parameters.findColumn(parameterName), x);
-    }
-
-    private class Parameters extends JdbcOdbcObject{
-
-        @Override
-        public int findColumn(String parameterName) throws SQLException{
-            try{
-                DbParameterCollection params = command.get_Parameters();
-                for(int i=0; i<params.get_Count();i++){
-                    DbParameter param = params.get_Item(i);
-                    if(parameterName.equalsIgnoreCase(param.get_ParameterName())){
-                        return i+1;
-                    }
-                }
-                throw new SQLException( "Parameter '"+parameterName+"' not found.", "S0022");
-            }catch(Throwable th){
-                throw JdbcOdbcUtils.createSQLException(th);
-            }
-        }
-
-        @Override
-        protected Object getObjectImpl(int parameterIndex) throws SQLException{
-            return getPara(parameterIndex).get_Value();
-        }
-        
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-	public <T> T getObject(int parameterIndex, Class<T> type)
-			throws SQLException {
-		throw new SQLFeatureNotSupportedException();
-	}
-
-
-    /**
-     * {@inheritDoc}
-     */
-	public <T> T getObject(String parameterName, Class<T> type)
-			throws SQLException {
-		throw new SQLFeatureNotSupportedException();
-	}
-}
diff --git a/openjdk/sun/jdbc/odbc/JdbcOdbcConnection.java b/openjdk/sun/jdbc/odbc/JdbcOdbcConnection.java
deleted file mode 100644
index 5e075b2a..00000000
--- a/openjdk/sun/jdbc/odbc/JdbcOdbcConnection.java
+++ /dev/null
@@ -1,490 +0,0 @@
-/*
-  Copyright (C) 2009, 2011 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.jdbc.odbc;
-
-import cli.System.Data.*;
-import cli.System.Data.Common.*;
-import cli.System.Data.Odbc.*;
-
-import java.sql.*;
-import java.util.Map;
-import java.util.Properties;
-import java.util.concurrent.Executor;
-
-/**
- * This JDBC Driver is a wrapper to the ODBC.NET Data Provider
- */
-public class JdbcOdbcConnection implements Connection{
-
-    private final OdbcConnection netConn;
-
-    private DbTransaction transaction;
-
-    private int isolation = TRANSACTION_READ_COMMITTED;
-
-
-    JdbcOdbcConnection(String connectString, Properties info) throws SQLException{
-        try{
-            boolean isDSN = connectString.indexOf('=') < 0;
-            StringBuilder connStr = new StringBuilder();
-            if(isDSN){
-                connStr.append("DSN=");
-            }
-            connStr.append(connectString);
-
-            String uid = info.getProperty("user");
-            String pwd = info.getProperty("password");
-
-            if(uid != null){
-                connStr.append(";UID=").append(uid);
-            }
-            if(pwd != null){
-                connStr.append(";PWD=").append(pwd);
-            }
-
-            netConn = new OdbcConnection(connStr.toString());
-
-            netConn.Open();
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    @Override
-	public void clearWarnings() throws SQLException{
-        // TODO Auto-generated method stub
-
-    }
-
-
-    @Override
-	public void close() throws SQLException{
-        try{
-            netConn.Close();
-        }catch(Throwable ex){
-            throw JdbcOdbcUtils.createSQLException(ex);
-        }
-    }
-
-
-    @Override
-	public Array createArrayOf(String typeName, Object[] elements){
-        throw new UnsupportedOperationException();
-    }
-
-
-    @Override
-	public Blob createBlob(){
-        throw new UnsupportedOperationException();
-    }
-
-
-    @Override
-	public Clob createClob(){
-        throw new UnsupportedOperationException();
-    }
-
-
-    @Override
-	public NClob createNClob(){
-        throw new UnsupportedOperationException();
-    }
-
-
-    @Override
-	public SQLXML createSQLXML(){
-        throw new UnsupportedOperationException();
-    }
-
-
-    @Override
-	public Statement createStatement() throws SQLException{
-        return createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
-    }
-
-
-    @Override
-	public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException{
-        try{
-            return new JdbcOdbcStatement(this, netConn.CreateCommand(), resultSetType, resultSetConcurrency);
-        }catch(Throwable ex){
-            throw JdbcOdbcUtils.createSQLException(ex);
-        }
-    }
-
-
-    @Override
-	public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability){
-        throw new UnsupportedOperationException();
-    }
-
-
-    @Override
-	public Struct createStruct(String typeName, Object[] attributes){
-        throw new UnsupportedOperationException();
-    }
-
-
-    @Override
-	public void setAutoCommit(boolean autoCommit) throws SQLException{
-        try{
-            if(autoCommit && transaction != null){
-                return; // no change
-            }
-            if(!autoCommit && transaction == null){
-                return; // no change
-            }
-            int level;
-            switch(isolation){
-                case TRANSACTION_READ_COMMITTED:
-                    level = IsolationLevel.ReadUncommitted;
-                    break;
-                case TRANSACTION_READ_UNCOMMITTED:
-                    level = IsolationLevel.ReadCommitted;
-                    break;
-                case TRANSACTION_REPEATABLE_READ:
-                    level = IsolationLevel.RepeatableRead;
-                    break;
-                case TRANSACTION_SERIALIZABLE:
-                    level = IsolationLevel.Serializable;
-                    break;
-                default:
-                    level = IsolationLevel.ReadCommitted;
-            }
-            if(autoCommit){
-                transaction = netConn.BeginTransaction(IsolationLevel.wrap(level));
-            }else{
-                transaction.Commit();
-                transaction = null;
-            }
-        }catch(Throwable ex){
-            throw JdbcOdbcUtils.createSQLException(ex);
-        }
-    }
-
-
-    @Override
-	public boolean getAutoCommit(){
-        return transaction != null;
-    }
-
-
-    @Override
-	public void commit() throws SQLException{
-        try{
-            if(transaction == null){
-                // auto commit == true
-                return;
-            }
-            transaction.Commit();
-            transaction = netConn.BeginTransaction(transaction.get_IsolationLevel());
-        }catch(Throwable ex){
-            throw JdbcOdbcUtils.createSQLException(ex);
-        }
-    }
-
-
-    @Override
-	public void rollback() throws SQLException{
-        try{
-            if(transaction == null){
-                // auto commit == true
-                return;
-            }
-            transaction.Rollback();
-            transaction = netConn.BeginTransaction(transaction.get_IsolationLevel());
-        }catch(Throwable ex){
-            throw JdbcOdbcUtils.createSQLException(ex);
-        }
-    }
-
-
-    @Override
-	public void setTransactionIsolation(int level){
-        isolation = level;
-    }
-
-
-    @Override
-	public int getTransactionIsolation(){
-        return isolation;
-    }
-
-
-    @Override
-	public String getClientInfo(String name){
-        throw new UnsupportedOperationException();
-    }
-
-
-    @Override
-	public Properties getClientInfo(){
-        throw new UnsupportedOperationException();
-    }
-
-
-    @Override
-	public int getHoldability(){
-        throw new UnsupportedOperationException();
-    }
-
-
-    @Override
-	public DatabaseMetaData getMetaData(){
-        return new JdbcOdbcDatabaseMetaData(this, netConn);
-    }
-
-
-    @Override
-	public Map<String, Class<?>> getTypeMap(){
-        throw new UnsupportedOperationException();
-    }
-
-
-    @Override
-	public SQLWarning getWarnings() throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    @Override
-	public boolean isClosed() throws SQLException{
-        return netConn.get_State().Value == ConnectionState.Closed;
-    }
-
-
-    @Override
-	public boolean isReadOnly() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    @Override
-	public boolean isValid(int timeout) throws SQLException{
-        throw new UnsupportedOperationException();
-    }
-
-
-    @Override
-	public String nativeSQL(String sql) throws SQLException{
-        // TODO Auto-generated method stub
-        return sql;
-    }
-
-
-    @Override
-	public CallableStatement prepareCall(String sql) throws SQLException{
-        return prepareCall(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
-    }
-
-
-    @Override
-	public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException{
-        try{
-            return new JdbcOdbcCallableStatement(this, netConn.CreateCommand(), sql, resultSetType,
-                    resultSetConcurrency);
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    @Override
-	public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency,
-            int resultSetHoldability){
-        throw new UnsupportedOperationException();
-    }
-
-
-    @Override
-	public PreparedStatement prepareStatement(String sql) throws SQLException{
-        return prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
-    }
-
-
-    @Override
-	public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency)
-            throws SQLException{
-        try{
-            return new JdbcOdbcPreparedStatement(this, netConn.CreateCommand(), sql, resultSetType,
-                    resultSetConcurrency);
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    @Override
-	public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency,
-            int resultSetHoldability){
-        throw new UnsupportedOperationException();
-    }
-
-
-    @Override
-	public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys){
-        throw new UnsupportedOperationException();
-    }
-
-
-    @Override
-	public PreparedStatement prepareStatement(String sql, int[] columnIndexes){
-        throw new UnsupportedOperationException();
-    }
-
-
-    @Override
-	public PreparedStatement prepareStatement(String sql, String[] columnNames){
-        throw new UnsupportedOperationException();
-    }
-
-
-    @Override
-	public void releaseSavepoint(Savepoint savepoint){
-        throw new UnsupportedOperationException();
-    }
-
-
-    @Override
-	public void rollback(Savepoint savepoint){
-        throw new UnsupportedOperationException();
-    }
-
-
-    @Override
-	public void setCatalog(String catalog) throws SQLException{
-        try{
-            netConn.ChangeDatabase(catalog);
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    @Override
-	public String getCatalog(){
-        return netConn.get_Database();
-    }
-
-
-    @Override
-	public void setClientInfo(String name, String value){
-        throw new UnsupportedOperationException();
-    }
-
-
-    @Override
-	public void setClientInfo(Properties properties){
-        throw new UnsupportedOperationException();
-    }
-
-
-    @Override
-	public void setHoldability(int holdability){
-        throw new UnsupportedOperationException();
-    }
-
-
-    @Override
-	public void setReadOnly(boolean readOnly) throws SQLException{
-        // TODO Auto-generated method stub
-
-    }
-
-
-    @Override
-	public Savepoint setSavepoint(){
-        throw new UnsupportedOperationException();
-    }
-
-
-    @Override
-	public Savepoint setSavepoint(String name){
-        throw new UnsupportedOperationException();
-    }
-
-
-	@Override
-	public void setTypeMap(Map<String, Class<?>> map){
-        throw new UnsupportedOperationException();
-    }
-
-
-    @Override
-	public boolean isWrapperFor(Class<?> iface){
-        return iface.isAssignableFrom(this.getClass());
-    }
-
-
-    @Override
-	public <T>T unwrap(Class<T> iface) throws SQLException{
-        if(isWrapperFor(iface)){
-            return (T)this;
-        }
-        throw new SQLException(this.getClass().getName() + " does not implements " + iface.getName() + ".", "01000");
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-	public void setSchema(String schema) throws SQLException {
-	}
-
-
-    /**
-     * {@inheritDoc}
-     */
-	public String getSchema() throws SQLException {
-		return null;
-	}
-
-
-    /**
-     * {@inheritDoc}
-     */
-	public void abort(Executor executor) throws SQLException {
-		throw new SQLFeatureNotSupportedException();
-	}
-
-
-    /**
-     * {@inheritDoc}
-     */
-	public void setNetworkTimeout(Executor executor, int milliseconds)
-			throws SQLException {
-		throw new SQLFeatureNotSupportedException();
-	}
-
-
-    /**
-     * {@inheritDoc}
-     */
-	public int getNetworkTimeout() throws SQLException {
-		throw new SQLFeatureNotSupportedException();
-	}
-}
diff --git a/openjdk/sun/jdbc/odbc/JdbcOdbcDTResultSet.java b/openjdk/sun/jdbc/odbc/JdbcOdbcDTResultSet.java
deleted file mode 100644
index 9de750a4..00000000
--- a/openjdk/sun/jdbc/odbc/JdbcOdbcDTResultSet.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
-  Copyright (C) 2009 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.jdbc.odbc;
-
-import java.sql.*;
-
-import cli.System.Data.*;
-
-/**
- * This JDBC Driver is a wrapper to the ODBC.NET Data Provider. This ResultSet based on DataTable. It is read only and
- * scrollable.
- */
-public class JdbcOdbcDTResultSet extends JdbcOdbcResultSet{
-
-    private final DataTable data;
-
-    private DataRowCollection rows;
-
-    private int rowIndex; // row index starting with 0; -1 means beforeFirst
-
-    private cli.System.Data.DataRow row;
-
-
-    public JdbcOdbcDTResultSet(DataTable data){
-        this(data, CONCUR_READ_ONLY);
-    }
-    public JdbcOdbcDTResultSet(DataTable data, int concurrency){
-        super(null, TYPE_SCROLL_INSENSITIVE, concurrency);
-        this.data = data;
-        this.rows = data.get_Rows();
-        this.rowIndex = -1;
-    }
-
-
-    @Override
-    public boolean absolute(int rowPosition) throws SQLException{
-        if(rowPosition == 0){
-            return !isBeforeFirst() && !isAfterLast();
-        }
-        DataRowCollection dataRows = getRows();
-        int count = dataRows.get_Count();
-        if(rowPosition > 0){
-            if(rowPosition > count){
-                rowIndex = count;
-                setDataRow();
-                return false;
-            }
-            rowIndex = rowPosition - 1;
-            setDataRow();
-            return true;
-        }else{
-            if(-rowPosition > count){
-                rowIndex = -1;
-                setDataRow();
-                return false;
-            }
-            rowIndex = count + rowPosition;
-            setDataRow();
-            return true;
-        }
-    }
-
-
-    @Override
-    public void afterLast() throws SQLException{
-        rowIndex = getRows().get_Count();
-        setDataRow();
-    }
-
-
-    @Override
-    public void beforeFirst() throws SQLException{
-        rowIndex = -1;
-        setDataRow();
-    }
-
-
-    @Override
-    public void close(){
-        rows = null;
-    }
-
-
-    @Override
-    public int findColumn(String columnLabel) throws SQLException{
-        getRows(); // Check if ResultSet is closed
-        int idx = data.get_Columns().IndexOf(columnLabel);
-        if(idx < 0){
-            throw new SQLException("Column '" + columnLabel + "' not found.", "S0022");
-        }
-        return idx + 1;
-    }
-
-
-    @Override
-    public boolean first() throws SQLException{
-        beforeFirst();
-        return next();
-    }
-
-
-    @Override
-    public ResultSetMetaData getMetaData(){
-        return new JdbcOdbcDTResultSetMetaData(data);
-    }
-
-
-    @Override
-    public int getRow() throws SQLException{
-        return rowIndex < getRows().get_Count() ? rowIndex + 1 : 0;
-    }
-
-
-    @Override
-    public boolean isAfterLast() throws SQLException{
-        int count = getRows().get_Count();
-        return rowIndex >= count || count == 0;
-    }
-
-
-    @Override
-    public boolean isBeforeFirst() throws SQLException{
-        return rowIndex <= -1 || getRows().get_Count() == 0;
-    }
-
-
-    @Override
-    public boolean isClosed(){
-        return rows == null;
-    }
-
-
-    @Override
-    public boolean isFirst() throws SQLException{
-        return rowIndex == 0 && getRows().get_Count() > 0;
-    }
-
-
-    @Override
-    public boolean isLast() throws SQLException{
-        return rowIndex >= 0 && rowIndex == getRows().get_Count() - 1;
-    }
-
-
-    @Override
-    public boolean last() throws SQLException{
-        afterLast();
-        return previous();
-    }
-
-
-    @Override
-    public boolean next() throws SQLException{
-        DataRowCollection dataRows = getRows();
-        if(rowIndex + 1 < dataRows.get_Count()){
-            ++rowIndex;
-            setDataRow();
-            return true;
-        }else{
-            rowIndex = dataRows.get_Count();
-            setDataRow();
-            return false;
-        }
-    }
-
-
-    @Override
-    public boolean previous() throws SQLException{
-        if(rowIndex > 0){
-            --rowIndex;
-            setDataRow();
-            return true;
-        }else{
-            rowIndex = -1;
-            setDataRow();
-            return false;
-        }
-    }
-
-
-    @Override
-    public void refreshRow(){
-        // ignore it
-    }
-
-
-    @Override
-    public boolean relative(int rowPositions) throws SQLException{
-        DataRowCollection dataRows = getRows();
-        int newRowIndex = rowIndex + rowPositions;
-        if(newRowIndex < 0){
-            rowIndex = -1;
-            setDataRow();
-            return false;
-        }
-        int count = dataRows.get_Count();
-        if(newRowIndex >= dataRows.get_Count()){
-            rowIndex = count;
-            setDataRow();
-            return false;
-        }
-        rowIndex = newRowIndex;
-        setDataRow();
-        return true;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected Object getObjectImpl(int columnIndex) throws SQLException{
-        try{
-            return getDataRow().get_Item(columnIndex - 1);
-        }catch(ArrayIndexOutOfBoundsException ex){
-            throw new SQLException("Invalid column number (" + columnIndex + "). A number between 1 and "
-                    + data.get_Columns().get_Count() + " is valid.", "S1002");
-        }
-    }
-
-
-    /**
-     * Check if this ResultSet is closed before access to the DataRowCollection
-     * 
-     * @return the local rows object
-     * @throws SQLException
-     *             If the ResultSet is closed.
-     */
-    protected DataRowCollection getRows() throws SQLException{
-        if(rows == null){
-            throw new SQLException("ResultSet is closed.", "24000");
-        }
-        return rows;
-    }
-
-
-    /**
-     * Get the current DataRow
-     * 
-     * @return the DataRow
-     * @throws SQLException
-     *             if closed or no current Row
-     */
-    protected DataRow getDataRow() throws SQLException{
-        getRows(); // checks if ResultSet is closed
-        if(row == null){
-            throw new SQLException("No current row", "S1109");
-        }
-        return row;
-    }
-    
-    /**
-     * Set the current row from the current rowIndex. If the rowIndex was not change
-     * then the row variable will be new set.
-     * @throws SQLException If the ResultSet is closed.
-     */
-    protected void setDataRow() throws SQLException{
-        DataRowCollection dataRows = getRows();
-        if(rowIndex < 0 || rowIndex >= dataRows.get_Count()){
-            row = null;
-        }else{
-            row = dataRows.get_Item(rowIndex);
-        }
-    }
-
-}
diff --git a/openjdk/sun/jdbc/odbc/JdbcOdbcDTResultSetMetaData.java b/openjdk/sun/jdbc/odbc/JdbcOdbcDTResultSetMetaData.java
deleted file mode 100644
index 25c15fb9..00000000
--- a/openjdk/sun/jdbc/odbc/JdbcOdbcDTResultSetMetaData.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
-  Copyright (C) 2009 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.jdbc.odbc;
-
-import java.sql.*;
-
-import cli.System.Data.*;
-
-/**
- * This JDBC Driver is a wrapper to the ODBC.NET Data Provider
- */
-public class JdbcOdbcDTResultSetMetaData implements ResultSetMetaData{
-
-    private final DataTable table;
-
-
-    public JdbcOdbcDTResultSetMetaData(DataTable table){
-        this.table = table;
-    }
-
-
-    public String getCatalogName(int column){
-        return "";
-    }
-
-
-    public String getColumnClassName(int column){
-        String type = getDataColumn(column).get_DataType().toString();
-        return JdbcOdbcUtils.getJavaClassName(type);
-    }
-
-
-    public int getColumnCount(){
-        return table.get_Columns().get_Count();
-    }
-
-
-    public int getColumnDisplaySize(int column) throws SQLException{
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-
-    public String getColumnLabel(int column) throws SQLException{
-        return getDataColumn(column).get_Caption();
-    }
-
-
-    public String getColumnName(int column) throws SQLException{
-        return getDataColumn(column).get_ColumnName();
-    }
-
-
-    public int getColumnType(int column) throws SQLException{
-        cli.System.Type type = getDataColumn(column).get_DataType();
-        // TODO Auto-generated method stub
-        return Types.OTHER;
-    }
-
-
-    public String getColumnTypeName(int column) throws SQLException{
-        return "";
-    }
-
-
-    public int getPrecision(int column) throws SQLException{
-        return getDataColumn(column).get_MaxLength();
-    }
-
-
-    public int getScale(int column) throws SQLException{
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-
-    public String getSchemaName(int column) throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public String getTableName(int column) throws SQLException{
-        return table.get_TableName();
-    }
-
-
-    public boolean isAutoIncrement(int column) throws SQLException{
-        return getDataColumn(column).get_AutoIncrement();
-    }
-
-
-    public boolean isCaseSensitive(int column) throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean isCurrency(int column) throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean isDefinitelyWritable(int column) throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public int isNullable(int column) throws SQLException{
-        return getDataColumn(column).get_AllowDBNull() ? columnNullable : columnNoNulls;
-    }
-
-
-    public boolean isReadOnly(int column) throws SQLException{
-        return getDataColumn(column).get_ReadOnly();
-    }
-
-
-    public boolean isSearchable(int column) throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean isSigned(int column) throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean isWritable(int column) throws SQLException{
-        return !getDataColumn(column).get_ReadOnly();
-    }
-
-
-    public boolean isWrapperFor(Class<?> iface){
-        return iface.isAssignableFrom(this.getClass());
-    }
-
-
-    public <T>T unwrap(Class<T> iface) throws SQLException{
-        if(isWrapperFor(iface)){
-            return (T)this;
-        }
-        throw new SQLException(this.getClass().getName() + " does not implements " + iface.getName() + ".", "01000");
-    }
-
-
-    /**
-     * Get a DataColumn from the DataTable
-     * @param column the JDBC column index starting with 1
-     * @return the DataColumn
-     */
-    private DataColumn getDataColumn(int column){
-        return table.get_Columns().get_Item(column - 1);
-    }
-}
diff --git a/openjdk/sun/jdbc/odbc/JdbcOdbcDatabaseMetaData.java b/openjdk/sun/jdbc/odbc/JdbcOdbcDatabaseMetaData.java
deleted file mode 100644
index df631c5b..00000000
--- a/openjdk/sun/jdbc/odbc/JdbcOdbcDatabaseMetaData.java
+++ /dev/null
@@ -1,1211 +0,0 @@
-/*
-  Copyright (C) 2009, 2011 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.jdbc.odbc;
-
-import ikvm.lang.CIL;
-
-import java.sql.*;
-import java.util.HashSet;
-
-import cli.System.Data.*;
-import cli.System.Data.Common.*;
-import cli.System.Data.Odbc.*;
-
-/**
- * @author Volker Berlin
- */
-public class JdbcOdbcDatabaseMetaData implements DatabaseMetaData{
-
-    private JdbcOdbcConnection jdbcConn;
-
-    private final OdbcConnection netConn;
-
-    private DataRow dataSourceInfo;
-
-    public JdbcOdbcDatabaseMetaData(JdbcOdbcConnection jdbcConn, OdbcConnection netConn){
-        this.jdbcConn = jdbcConn;
-        this.netConn = netConn;
-    }
-
-
-    public boolean allProceduresAreCallable() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean allTablesAreSelectable() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean autoCommitFailureClosesAllResultSets(){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public boolean dataDefinitionCausesTransactionCommit() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean dataDefinitionIgnoredInTransactions() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean deletesAreDetected(int type) throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean doesMaxRowSizeIncludeBlobs() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public ResultSet getAttributes(String catalog, String schemaPattern, String typeNamePattern,
-            String attributeNamePattern){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public ResultSet getBestRowIdentifier(String catalog, String schema, String table, int scope, boolean nullable)
-            throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public String getCatalogSeparator() throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public String getCatalogTerm() throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public ResultSet getCatalogs() throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public ResultSet getClientInfoProperties(){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public ResultSet getColumnPrivileges(String catalog, String schema, String table, String columnNamePattern)
-            throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public ResultSet getColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern)
-            throws SQLException{
-        try{
-            // the description of the restrictions can you request with GetSchema("Restrictions")
-            String[] restrictions = new String[]{catalog, schemaPattern, tableNamePattern, columnNamePattern};
-            DataTable data = netConn.GetSchema(OdbcMetaDataCollectionNames.Columns, restrictions);
-            return new JdbcOdbcDTResultSet(data);
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    public Connection getConnection(){
-        return jdbcConn;
-    }
-
-
-    public ResultSet getCrossReference(String parentCatalog, String parentSchema, String parentTable,
-            String foreignCatalog, String foreignSchema, String foreignTable) throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public int getDatabaseMajorVersion(){
-        String version = netConn.get_ServerVersion().trim();
-        for(int i = 0; i < version.length(); i++){
-            char ch = version.charAt(i);
-            if(ch < '0' || ch > '9'){
-                return Integer.parseInt(version.substring(0, i));
-            }
-        }
-        return Integer.parseInt(version);
-    }
-
-
-    public int getDatabaseMinorVersion(){
-        String version = netConn.get_ServerVersion().trim();
-        int idx = version.indexOf('.');
-        if(idx < 0){
-            return 0;
-        }
-        version = version.substring(idx + 1);
-        for(int i = 0; i < version.length(); i++){
-            char ch = version.charAt(i);
-            if(ch < '0' || ch > '9'){
-                return Integer.parseInt(version.substring(0, i));
-            }
-        }
-        return Integer.parseInt(version);
-    }
-
-
-    public String getDatabaseProductName() throws SQLException{
-        return String.valueOf(getInfo(DbMetaDataColumnNames.DataSourceProductName));
-    }
-
-
-    public String getDatabaseProductVersion(){
-        return netConn.get_ServerVersion();
-    }
-
-
-    public int getDefaultTransactionIsolation(){
-        return Connection.TRANSACTION_READ_COMMITTED;
-    }
-
-
-    public int getDriverMajorVersion(){
-        return 2;
-    }
-
-
-    public int getDriverMinorVersion(){
-        return 1;
-    }
-
-
-    public String getDriverName(){
-        return "JDBC-ODBC Bridge (" + netConn.get_Driver() + ")";
-    }
-
-
-    public String getDriverVersion(){
-        return "2.0001";
-    }
-
-
-    public ResultSet getExportedKeys(String catalog, String schema, String table) throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public String getExtraNameCharacters(){
-        return "";
-    }
-
-
-    public ResultSet getFunctionColumns(String catalog, String schemaPattern, String functionNamePattern,
-            String columnNamePattern){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public ResultSet getFunctions(String catalog, String schemaPattern, String functionNamePattern){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public String getIdentifierQuoteString() throws SQLException{
-        String quote = (String)getInfo(DbMetaDataColumnNames.QuotedIdentifierPattern);
-        if(quote.length()>=2){
-            char ch1 = quote.charAt(0);
-            char ch2 = quote.charAt(quote.length()-1);
-            if(ch1 == ch2){
-                return quote.substring(0,1);
-            }
-        }
-        return "\""; // ANSI SQL and should work with the most DBMS
-    }
-
-
-    public ResultSet getImportedKeys(String catalog, String schema, String table) throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public ResultSet getIndexInfo(String catalog, String schema, String table, boolean unique, boolean approximate)
-            throws SQLException{
-        try{
-            // the description of the restrictions can you request with GetSchema("Restrictions")
-            String[] restrictions = new String[]{catalog, schema, table};
-            DataTable data = netConn.GetSchema(OdbcMetaDataCollectionNames.Indexes, restrictions);
-            return new JdbcOdbcDTResultSet(data);
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    public int getJDBCMajorVersion(){
-        return 2;
-    }
-
-
-    public int getJDBCMinorVersion(){
-        return 0;
-    }
-
-
-    public int getMaxBinaryLiteralLength() throws SQLException{
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-
-    public int getMaxCatalogNameLength() throws SQLException{
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-
-    public int getMaxCharLiteralLength() throws SQLException{
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-
-    public int getMaxColumnNameLength() throws SQLException{
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-
-    public int getMaxColumnsInGroupBy() throws SQLException{
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-
-    public int getMaxColumnsInIndex() throws SQLException{
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-
-    public int getMaxColumnsInOrderBy() throws SQLException{
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-
-    public int getMaxColumnsInSelect() throws SQLException{
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-
-    public int getMaxColumnsInTable() throws SQLException{
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-
-    public int getMaxConnections() throws SQLException{
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-
-    public int getMaxCursorNameLength() throws SQLException{
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-
-    public int getMaxIndexLength() throws SQLException{
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-
-    public int getMaxProcedureNameLength() throws SQLException{
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-
-    public int getMaxRowSize() throws SQLException{
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-
-    public int getMaxSchemaNameLength() throws SQLException{
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-
-    public int getMaxStatementLength() throws SQLException{
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-
-    public int getMaxStatements() throws SQLException{
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-
-    public int getMaxTableNameLength() throws SQLException{
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-
-    public int getMaxTablesInSelect() throws SQLException{
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-
-    public int getMaxUserNameLength() throws SQLException{
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-
-    public String getNumericFunctions() throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public ResultSet getPrimaryKeys(String catalog, String schema, String table) throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public ResultSet getProcedureColumns(String catalog, String schemaPattern, String procedureNamePattern,
-            String columnNamePattern) throws SQLException{
-        try{
-            // the description of the restrictions can you request with GetSchema("Restrictions")
-            String[] restrictions = new String[]{catalog, schemaPattern, procedureNamePattern, columnNamePattern};
-            DataTable dt1 = netConn.GetSchema(OdbcMetaDataCollectionNames.ProcedureColumns, restrictions);
-            DataTable dt2 = netConn.GetSchema(OdbcMetaDataCollectionNames.ProcedureParameters, restrictions);
-            // concatenate the both DataTable
-            DataRowCollection rows1 = dt1.get_Rows();
-            DataRowCollection rows2 = dt2.get_Rows();
-            for(int i = 0; i < rows2.get_Count(); i++){
-                DataRow row = rows2.get_Item(i);
-                rows1.Add(row.get_ItemArray());
-            }
-            return new JdbcOdbcDTResultSet(dt1);
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    public String getProcedureTerm() throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public ResultSet getProcedures(String catalog, String schemaPattern, String procedureNamePattern)
-            throws SQLException{
-        try{
-            // the description of the restrictions can you request with GetSchema("Restrictions")
-            String[] restrictions = new String[]{catalog, schemaPattern, procedureNamePattern};
-            DataTable data = netConn.GetSchema(OdbcMetaDataCollectionNames.Procedures, restrictions);
-            return new JdbcOdbcDTResultSet(data);
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    public int getResultSetHoldability(){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public RowIdLifetime getRowIdLifetime(){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public String getSQLKeywords() throws SQLException{
-        try{
-            DataTable dt = netConn.GetSchema(DbMetaDataCollectionNames.ReservedWords);
-            final DataRowCollection rows = dt.get_Rows();
-            final int count = rows.get_Count();
-            final StringBuilder builder = new StringBuilder();
-            for(int i=0; i<count; i++){
-                String word = (String)rows.get_Item(i).get_Item(0);
-                if(builder.length() > 0){
-                    builder.append(',');
-                }
-                builder.append(word);
-            }
-            return builder.toString();
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    public int getSQLStateType() throws SQLException{
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-
-    public String getSchemaTerm() throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public ResultSet getSchemas() throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public ResultSet getSchemas(String catalog, String schemaPattern){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public String getSearchStringEscape() throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public String getStringFunctions() throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public ResultSet getSuperTables(String catalog, String schemaPattern, String tableNamePattern){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public ResultSet getSuperTypes(String catalog, String schemaPattern, String typeNamePattern){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public String getSystemFunctions() throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public ResultSet getTablePrivileges(String catalog, String schemaPattern, String tableNamePattern)
-            throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public ResultSet getTableTypes() throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public ResultSet getTables(String catalog, String schemaPattern, String tableNamePattern, String[] types)
-            throws SQLException{
-        try{
-            // the description of the restrictions can you request with GetSchema("Restrictions")
-            String[] restrictions = new String[]{catalog, schemaPattern, tableNamePattern};
-            DataTable dt1 = netConn.GetSchema(OdbcMetaDataCollectionNames.Tables, restrictions);
-            DataTable dt2 = netConn.GetSchema(OdbcMetaDataCollectionNames.Views, restrictions);
-            // concatenate the both DataTable
-            DataRowCollection rows1 = dt1.get_Rows();
-            DataRowCollection rows2 = dt2.get_Rows();
-            for(int i = 0; i < rows2.get_Count(); i++){
-                DataRow row = rows2.get_Item(i);
-                rows1.Add(row.get_ItemArray());
-            }
-            if(types != null){
-                RowLoop:
-                // Filter the types
-                for(int i = rows1.get_Count() - 1; i >= 0; i--){
-                    DataRow row = rows1.get_Item(i);
-                    Object tableType = row.get_Item("TABLE_TYPE");
-                    for(String type : types){
-                        if(type.equals(tableType)){
-                            continue RowLoop;
-                        }
-                    }
-                    rows1.RemoveAt(i);
-                }
-            }
-            return new JdbcOdbcDTResultSet(dt1);
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    public String getTimeDateFunctions() throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public ResultSet getTypeInfo() throws SQLException{
-        try{
-            //TODO Column Names and order are wrong
-            DataTable data = netConn.GetSchema(DbMetaDataCollectionNames.DataTypes);
-            return new JdbcOdbcDTResultSet(data);
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    public ResultSet getUDTs(String catalog, String schemaPattern, String typeNamePattern, int[] types){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public String getURL() throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public String getUserName() throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public ResultSet getVersionColumns(String catalog, String schema, String table) throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public boolean insertsAreDetected(int type) throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean isCatalogAtStart() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean isReadOnly() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean locatorsUpdateCopy(){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public boolean nullPlusNonNullIsNull() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean nullsAreSortedAtEnd() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean nullsAreSortedAtStart() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean nullsAreSortedHigh() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean nullsAreSortedLow() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean othersDeletesAreVisible(int type) throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean othersInsertsAreVisible(int type) throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean othersUpdatesAreVisible(int type) throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean ownDeletesAreVisible(int type) throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean ownInsertsAreVisible(int type) throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean ownUpdatesAreVisible(int type) throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean storesLowerCaseIdentifiers() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean storesLowerCaseQuotedIdentifiers() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean storesMixedCaseIdentifiers() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean storesMixedCaseQuotedIdentifiers() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean storesUpperCaseIdentifiers() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean storesUpperCaseQuotedIdentifiers() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsANSI92EntryLevelSQL() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsANSI92FullSQL() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsANSI92IntermediateSQL() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsAlterTableWithAddColumn() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsAlterTableWithDropColumn() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsBatchUpdates() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsCatalogsInDataManipulation() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsCatalogsInIndexDefinitions() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsCatalogsInPrivilegeDefinitions() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsCatalogsInProcedureCalls() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsCatalogsInTableDefinitions() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsColumnAliasing() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsConvert() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsConvert(int fromType, int toType) throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsCoreSQLGrammar() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsCorrelatedSubqueries() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsDataDefinitionAndDataManipulationTransactions() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsDataManipulationTransactionsOnly() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsDifferentTableCorrelationNames() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsExpressionsInOrderBy() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsExtendedSQLGrammar() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsFullOuterJoins() throws SQLException{
-        int join = CIL.unbox_int(getInfo(DbMetaDataColumnNames.SupportedJoinOperators));
-        return (join & SupportedJoinOperators.FullOuter) > 0;
-    }
-
-
-    public boolean supportsGetGeneratedKeys() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsGroupBy() throws SQLException{
-        int behavior = CIL.unbox_int(getInfo(DbMetaDataColumnNames.GroupByBehavior));
-        return behavior != GroupByBehavior.NotSupported;
-    }
-
-
-    public boolean supportsGroupByBeyondSelect() throws SQLException{
-        int behavior = CIL.unbox_int(getInfo(DbMetaDataColumnNames.GroupByBehavior));
-        return behavior == GroupByBehavior.MustContainAll;
-    }
-
-
-    public boolean supportsGroupByUnrelated() throws SQLException{
-        int behavior = CIL.unbox_int(getInfo(DbMetaDataColumnNames.GroupByBehavior));
-        return behavior == GroupByBehavior.Unrelated;
-    }
-
-
-    public boolean supportsIntegrityEnhancementFacility() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsLikeEscapeClause() throws SQLException{
-        return getSQLKeywords().toUpperCase().indexOf(",LIKE,") > 0;
-    }
-
-
-    public boolean supportsLimitedOuterJoins() throws SQLException{
-        int join = CIL.unbox_int(getInfo(DbMetaDataColumnNames.SupportedJoinOperators));
-        return join > 0;
-    }
-
-
-    public boolean supportsMinimumSQLGrammar() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsMixedCaseIdentifiers() throws SQLException{
-        int identifierCase = CIL.unbox_int(getInfo(DbMetaDataColumnNames.IdentifierCase));
-        return identifierCase == IdentifierCase.Sensitive;
-    }
-
-
-    public boolean supportsMixedCaseQuotedIdentifiers() throws SQLException{
-        int identifierCase = CIL.unbox_int(getInfo(DbMetaDataColumnNames.QuotedIdentifierCase));
-        return identifierCase == IdentifierCase.Sensitive;
-    }
-
-
-    public boolean supportsMultipleOpenResults() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsMultipleResultSets() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsMultipleTransactions() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsNamedParameters() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsNonNullableColumns() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsOpenCursorsAcrossCommit() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsOpenCursorsAcrossRollback() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsOpenStatementsAcrossCommit() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsOpenStatementsAcrossRollback() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsOrderByUnrelated() throws SQLException{
-        return CIL.unbox_boolean( getInfo(DbMetaDataColumnNames.OrderByColumnsInSelect));
-    }
-
-
-    public boolean supportsOuterJoins() throws SQLException{
-        int join = CIL.unbox_int(getInfo(DbMetaDataColumnNames.SupportedJoinOperators));
-        return (join & SupportedJoinOperators.LeftOuter) > 0 || (join & SupportedJoinOperators.RightOuter) > 0;
-    }
-
-
-    public boolean supportsPositionedDelete() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsPositionedUpdate() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsResultSetConcurrency(int type, int concurrency) throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsResultSetHoldability(int holdability){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public boolean supportsResultSetType(int type) throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsSavepoints() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsSchemasInDataManipulation() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsSchemasInIndexDefinitions() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsSchemasInPrivilegeDefinitions() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsSchemasInProcedureCalls() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsSchemasInTableDefinitions() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsSelectForUpdate() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsStatementPooling(){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public boolean supportsStoredFunctionsUsingCallSyntax() throws SQLException{
-        throw new UnsupportedOperationException();
-    }
-
-
-    public boolean supportsStoredProcedures() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsSubqueriesInComparisons() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsSubqueriesInExists() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsSubqueriesInIns() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsSubqueriesInQuantifieds() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsTableCorrelationNames() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsTransactionIsolationLevel(int level) throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsTransactions() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsUnion() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean supportsUnionAll() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean updatesAreDetected(int type) throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean usesLocalFilePerTable() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean usesLocalFiles() throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public boolean isWrapperFor(Class<?> iface){
-        return iface.isAssignableFrom(this.getClass());
-    }
-
-
-    public <T>T unwrap(Class<T> iface) throws SQLException{
-        if(isWrapperFor(iface)){
-            return (T)this;
-        }
-        throw new SQLException(this.getClass().getName() + " does not implements " + iface.getName() + ".", "01000");
-    }
-
-    private Object getInfo(String key) throws SQLException{
-        try{
-            if(dataSourceInfo == null){
-                DataTable td = netConn.GetSchema(DbMetaDataCollectionNames.DataSourceInformation);
-                dataSourceInfo = td.get_Rows().get_Item(0);
-            }
-            return dataSourceInfo.get_Item(key);
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public ResultSet getPseudoColumns(String catalog, String schemaPattern,
-			String tableNamePattern, String columnNamePattern)
-			throws SQLException {
-		throw new SQLFeatureNotSupportedException();
-	}
-
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean generatedKeyAlwaysReturned() throws SQLException {
-		return false;
-	}
-}
diff --git a/openjdk/sun/jdbc/odbc/JdbcOdbcDriver.java b/openjdk/sun/jdbc/odbc/JdbcOdbcDriver.java
deleted file mode 100644
index 9eb1d9d4..00000000
--- a/openjdk/sun/jdbc/odbc/JdbcOdbcDriver.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-  Copyright (C) 2009, 2011 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.jdbc.odbc;
-
-import java.sql.*;
-import java.util.Properties;
-import java.util.logging.Logger;
-
-/**
- * This JDBC Driver is a wrapper to the ODBC.NET Data Provider
- */
-public class JdbcOdbcDriver implements Driver{
-
-    private static final String URL_PREFIX = "jdbc:odbc:";
-
-    static{
-        try{
-            DriverManager.registerDriver(new JdbcOdbcDriver());
-        }catch(SQLException ex){
-            throw new ExceptionInInitializerError(ex);
-        }
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-	public boolean acceptsURL(String url){
-        return url.startsWith(URL_PREFIX);
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-	public Connection connect(String url, Properties info) throws SQLException{
-        if(!acceptsURL(url)){
-            return null;
-        }
-        String connectString = url.substring(URL_PREFIX.length());
-        return new JdbcOdbcConnection(connectString, info);
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-	public int getMajorVersion(){
-        return 2;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-	public int getMinorVersion(){
-        return 1;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-	public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException{
-        return new DriverPropertyInfo[0];
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-	public boolean jdbcCompliant(){
-        return true;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-	public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-		throw new SQLFeatureNotSupportedException();
-	}
-
-}
diff --git a/openjdk/sun/jdbc/odbc/JdbcOdbcObject.java b/openjdk/sun/jdbc/odbc/JdbcOdbcObject.java
deleted file mode 100644
index 32e9a40f..00000000
--- a/openjdk/sun/jdbc/odbc/JdbcOdbcObject.java
+++ /dev/null
@@ -1,650 +0,0 @@
-/*
-  Copyright (C) 2009 Volker Berlin (i-net software)
-  Copyright (C) 2011 Karsten Heinrich (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.jdbc.odbc;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.Reader;
-import java.io.StringReader;
-import java.math.BigDecimal;
-import java.net.URL;
-import java.sql.Array;
-import java.sql.Blob;
-import java.sql.Clob;
-import java.sql.Date;
-import java.sql.NClob;
-import java.sql.Ref;
-import java.sql.RowId;
-import java.sql.SQLException;
-import java.sql.SQLXML;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.util.Calendar;
-import java.util.Map;
-
-import cli.System.Convert;
-import cli.System.DBNull;
-import cli.System.IConvertible;
-import cli.System.Int16;
-import cli.System.Int32;
-import cli.System.Int64;
-import cli.System.Single;
-
-/**
- * @author Volker Berlin
- */
-public abstract class JdbcOdbcObject{
-
-    private boolean wasNull;
-
-
-    /**
-     * Maps the given ResultSet column label to its ResultSet column index or the given CallableStatment parameter name
-     * to the parameter index.
-     * 
-     * @param columnLabel
-     *            the label for the column specified with the SQL AS clause. If the SQL AS clause was not specified,
-     *            then the label is the name of the column
-     * @return the column index of the given column name
-     * @throws SQLException
-     *             if the ResultSet object does not contain a column labeled columnLabel, a database access error occurs
-     *             or this method is called on a closed result set
-     */
-    public abstract int findColumn(String columnLabel) throws SQLException;
-
-
-    /**
-     * Read an Object from the current row store at the current row on the given column.
-     * 
-     * @param columnIndex
-     *            a JDBC column index starting with 1
-     * @return a .NET Object, DBNull or null
-     * @throws SQLException
-     *             if the result is closed or any other error occur.
-     */
-    protected abstract Object getObjectImpl(int columnIndex) throws SQLException;
-
-
-    /**
-     * Read an Object from the current row store at the current row on the given column. Set the flag wasNull.
-     * 
-     * @param columnIndex
-     *            a JDBC column index starting with 1
-     * @return a .NET Object or null
-     * @throws SQLException
-     *             if the result is closed or any other error occur.
-     */
-    private final Object getObjectSetWasNull(int columnIndex) throws SQLException{
-        Object obj = getObjectImpl(columnIndex);
-        if(obj == null || obj == DBNull.Value){
-            wasNull = true;
-            return null;
-        }
-        wasNull = false;
-        return obj;
-    }
-
-
-    public final Array getArray(int columnIndex){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public final Array getArray(String columnLabel) throws SQLException{
-        return getArray(findColumn(columnLabel));
-    }
-
-
-    public final InputStream getAsciiStream(int columnIndex) throws SQLException{
-        try{
-            String str = getString(columnIndex);
-            if(str == null){
-                return null;
-            }
-            return new ByteArrayInputStream(str.getBytes("Ascii"));
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    public final InputStream getAsciiStream(String columnLabel) throws SQLException{
-        return getAsciiStream(findColumn(columnLabel));
-    }
-
-
-    public final BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException{
-        BigDecimal dec = getBigDecimal(columnIndex);
-        if(dec == null){
-            return null;
-        }
-        if(dec.scale() != scale){
-            return dec.setScale(scale, BigDecimal.ROUND_HALF_EVEN);
-        }
-        return dec;
-    }
-
-
-    public final BigDecimal getBigDecimal(String columnLabel, int scale) throws SQLException{
-        return getBigDecimal(findColumn(columnLabel), scale);
-    }
-
-
-    public final BigDecimal getBigDecimal(int columnIndex) throws SQLException{
-        try{
-            Object obj = getObjectSetWasNull(columnIndex);
-            if(wasNull){
-                return null;
-            }
-            String str = obj.toString();
-            return new BigDecimal(str);
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    public final BigDecimal getBigDecimal(String columnLabel) throws SQLException{
-        return getBigDecimal(findColumn(columnLabel));
-    }
-
-
-    public final InputStream getBinaryStream(int columnIndex) throws SQLException{
-        byte[] data = getBytes(columnIndex);
-        if(data == null){
-            return null;
-        }
-        return new ByteArrayInputStream(data);
-    }
-
-
-    public final InputStream getBinaryStream(String columnLabel) throws SQLException{
-        return getBinaryStream(findColumn(columnLabel));
-    }
-
-
-    public final Blob getBlob(int columnIndex){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public final Blob getBlob(String columnLabel) throws SQLException{
-        return getBlob(findColumn(columnLabel));
-    }
-
-
-    public final boolean getBoolean(int columnIndex) throws SQLException{
-        try{
-            Object obj = getObjectSetWasNull(columnIndex);
-            if(wasNull){
-                return false;
-            }
-            if(obj instanceof IConvertible){
-                return Convert.ToBoolean(obj);
-            }
-            String str = obj.toString();
-            if(str.length() > 0){
-                // special handling for boolean representation in old databases
-                char ch = str.charAt(0);
-                if(ch == 'T' || ch == 't'){
-                    return true;
-                }
-                if(ch == 'F' || ch == 'f'){
-                    return true;
-                }
-            }
-            return cli.System.Boolean.Parse(str);
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    public final boolean getBoolean(String columnLabel) throws SQLException{
-        return getBoolean(findColumn(columnLabel));
-    }
-
-
-    public final byte getByte(int columnIndex) throws SQLException{
-        try{
-            Object obj = getObjectSetWasNull(columnIndex);
-            if(wasNull){
-                return 0;
-            }
-            if(obj instanceof IConvertible){
-                return Convert.ToByte(obj);
-            }
-            String str = obj.toString();
-            return cli.System.Byte.Parse(str);
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    public final byte getByte(String columnLabel) throws SQLException{
-        return getByte(findColumn(columnLabel));
-    }
-
-
-    public final byte[] getBytes(int columnIndex) throws SQLException{
-        try{
-            Object obj = getObjectSetWasNull(columnIndex);
-            if(wasNull){
-                return null;
-            }
-            if(obj instanceof byte[]){
-                return (byte[])obj;
-            }
-            String str = obj.toString();
-            return str.getBytes(); // which encoding?
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    public final byte[] getBytes(String columnLabel) throws SQLException{
-        return getBytes(findColumn(columnLabel));
-    }
-
-
-    public final Reader getCharacterStream(int columnIndex) throws SQLException{
-        String str = getString(columnIndex);
-        if(str == null){
-            return null;
-        }
-        return new StringReader(str);
-    }
-
-
-    public final Reader getCharacterStream(String columnLabel) throws SQLException{
-        return getCharacterStream(findColumn(columnLabel));
-    }
-
-
-    public final Clob getClob(int columnIndex){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public final Clob getClob(String columnLabel) throws SQLException{
-        return getClob(findColumn(columnLabel));
-    }
-
-
-    public final Date getDate(int columnIndex) throws SQLException{
-        try{
-            Object obj = getObjectSetWasNull(columnIndex);
-            if(wasNull){
-                return null;
-            }
-            if(obj instanceof cli.System.DateTime){
-                cli.System.DateTime dt = (cli.System.DateTime)obj;
-                return new Date(dt.get_Year() - 1900, dt.get_Month() - 1, dt.get_Day());
-            }
-            String str = obj.toString();
-            return Date.valueOf(str);
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    public final Date getDate(String columnLabel) throws SQLException{
-        return getDate(findColumn(columnLabel));
-    }
-
-
-    public final Date getDate(int columnIndex, Calendar cal) throws SQLException{
-        Date date = getDate(columnIndex);
-        JdbcOdbcUtils.convertLocalToCalendarDate(date, cal);
-        return date;
-    }
-
-
-    public final Date getDate(String columnLabel, Calendar cal) throws SQLException{
-        return getDate(findColumn(columnLabel), cal);
-    }
-
-
-    public final double getDouble(int columnIndex) throws SQLException{
-        try{
-            Object obj = getObjectSetWasNull(columnIndex);
-            if(wasNull){
-                return 0;
-            }
-            if(obj instanceof IConvertible){
-                return Convert.ToDouble(obj);
-            }
-            String str = obj.toString();
-            return cli.System.Double.Parse(str);
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    public final double getDouble(String columnLabel) throws SQLException{
-        return getDouble(findColumn(columnLabel));
-    }
-
-
-    public final float getFloat(int columnIndex) throws SQLException{
-        try{
-            Object obj = getObjectSetWasNull(columnIndex);
-            if(wasNull){
-                return 0;
-            }
-            if(obj instanceof IConvertible){
-                return Convert.ToSingle(obj);
-            }
-            String str = obj.toString();
-            return Single.Parse(str);
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    public final float getFloat(String columnLabel) throws SQLException{
-        return getFloat(findColumn(columnLabel));
-    }
-
-
-    public final int getInt(int columnIndex) throws SQLException{
-        try{
-            Object obj = getObjectSetWasNull(columnIndex);
-            if(wasNull){
-                return 0;
-            }
-            if(obj instanceof IConvertible){
-                return Convert.ToInt32(obj);
-            }
-            String str = obj.toString();
-            return Int32.Parse(str);
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    public final int getInt(String columnLabel) throws SQLException{
-        return getInt(findColumn(columnLabel));
-    }
-
-
-    public final long getLong(int columnIndex) throws SQLException{
-        try{
-            Object obj = getObjectSetWasNull(columnIndex);
-            if(wasNull){
-                return 0;
-            }
-            if(obj instanceof IConvertible){
-                return Convert.ToInt64(obj);
-            }
-            String str = obj.toString();
-            return Int64.Parse(str);
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    public final long getLong(String columnLabel) throws SQLException{
-        return getLong(findColumn(columnLabel));
-    }
-
-
-    public final Reader getNCharacterStream(int columnIndex) throws SQLException{
-        return getCharacterStream(columnIndex);
-    }
-
-
-    public final Reader getNCharacterStream(String columnLabel) throws SQLException{
-        return getCharacterStream(columnLabel);
-    }
-
-
-    public final NClob getNClob(int columnIndex){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public final NClob getNClob(String columnLabel) throws SQLException{
-        return getNClob(findColumn(columnLabel));
-    }
-
-
-    public final String getNString(int columnIndex) throws SQLException{
-        return getString(columnIndex);
-    }
-
-
-    public final String getNString(String columnLabel) throws SQLException{
-        return getString(columnLabel);
-    }
-
-
-    public final Object getObject(int columnIndex) throws SQLException{
-        return JdbcOdbcUtils.convertNet2Java(getObjectSetWasNull(columnIndex));
-    }
-
-
-    public final Object getObject(String columnLabel) throws SQLException{
-        return getObject(findColumn(columnLabel));
-    }
-
-
-    public final Object getObject(int columnIndex, Map<String, Class<?>> map){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public final Object getObject(String columnLabel, Map<String, Class<?>> map) throws SQLException{
-        return getObject(findColumn(columnLabel), map);
-    }
-
-
-    public final Ref getRef(int columnIndex){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public final Ref getRef(String columnLabel) throws SQLException{
-        return getRef(findColumn(columnLabel));
-    }
-
-
-    public final RowId getRowId(int columnIndex){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public final RowId getRowId(String columnLabel) throws SQLException{
-        return getRowId(findColumn(columnLabel));
-    }
-
-
-    public final SQLXML getSQLXML(int columnIndex){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public final SQLXML getSQLXML(String columnLabel) throws SQLException{
-        return getSQLXML(findColumn(columnLabel));
-    }
-
-
-    public final short getShort(int columnIndex) throws SQLException{
-        try{
-            Object obj = getObjectSetWasNull(columnIndex);
-            if(wasNull){
-                return 0;
-            }
-            if(obj instanceof IConvertible){
-                return Convert.ToInt16(obj);
-            }
-            String str = obj.toString();
-            return Int16.Parse(str);
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    public final short getShort(String columnLabel) throws SQLException{
-        return getShort(findColumn(columnLabel));
-    }
-
-
-    public final String getString(int columnIndex) throws SQLException{
-        try{
-            Object obj = getObjectSetWasNull(columnIndex);
-            if(wasNull){
-                return null;
-            }
-            return obj.toString();
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    public final String getString(String columnLabel) throws SQLException{
-        return getString(findColumn(columnLabel));
-    }
-
-
-    public final Time getTime(int columnIndex) throws SQLException{
-        try{
-            Object obj = getObjectSetWasNull(columnIndex);
-            if(wasNull){
-                return null;
-            }
-            if(obj instanceof cli.System.DateTime){
-                cli.System.DateTime dt = (cli.System.DateTime)obj;
-                return new Time(dt.get_Hour(), dt.get_Minute() - 1, dt.get_Second());
-            }
-            if(obj instanceof cli.System.TimeSpan){
-                cli.System.TimeSpan ts = (cli.System.TimeSpan)obj;
-                return new Time(ts.get_Hours(), ts.get_Minutes() - 1, ts.get_Seconds());
-            }
-            String str = obj.toString();
-            return Time.valueOf(str);
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    public final Time getTime(String columnLabel) throws SQLException{
-        return getTime(findColumn(columnLabel));
-    }
-
-
-    public final Time getTime(int columnIndex, Calendar cal) throws SQLException{
-        Time time = getTime(columnIndex);
-        JdbcOdbcUtils.convertLocalToCalendarDate(time, cal);
-        return time;
-    }
-
-
-    public final Time getTime(String columnLabel, Calendar cal) throws SQLException{
-        return getTime(findColumn(columnLabel), cal);
-    }
-
-
-    public final Timestamp getTimestamp(int columnIndex) throws SQLException{
-        try{
-            Object obj = getObjectSetWasNull(columnIndex);
-            if(wasNull){
-                return null;
-            }
-            if(obj instanceof cli.System.DateTime){
-            	return JdbcOdbcUtils.convertDateTimeToTimestamp((cli.System.DateTime)obj);
-            }
-            String str = obj.toString();
-            return Timestamp.valueOf(str);
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    public final Timestamp getTimestamp(String columnLabel) throws SQLException{
-        return getTimestamp(findColumn(columnLabel));
-    }
-
-
-    public final Timestamp getTimestamp(int columnIndex, Calendar cal) throws SQLException{
-        Timestamp ts = getTimestamp(columnIndex);
-        JdbcOdbcUtils.convertLocalToCalendarDate(ts, cal);
-        return ts;
-    }
-
-
-    public final Timestamp getTimestamp(String columnLabel, Calendar cal) throws SQLException{
-        return getTimestamp(findColumn(columnLabel), cal);
-    }
-
-
-    public final URL getURL(int columnIndex) throws SQLException{
-        try{
-            String url = getString(columnIndex);
-            if(wasNull){
-                return null;
-            }
-            return new URL(url);
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    public final URL getURL(String columnLabel) throws SQLException{
-        return getURL(findColumn(columnLabel));
-    }
-
-
-    public final InputStream getUnicodeStream(int columnIndex) throws SQLException{
-        try{
-            return new ByteArrayInputStream(getString(columnIndex).getBytes("UTF16"));
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    public final InputStream getUnicodeStream(String columnLabel) throws SQLException{
-        return getUnicodeStream(findColumn(columnLabel));
-    }
-
-
-    public final boolean wasNull(){
-        return wasNull;
-    }
-
-}
diff --git a/openjdk/sun/jdbc/odbc/JdbcOdbcPreparedStatement.java b/openjdk/sun/jdbc/odbc/JdbcOdbcPreparedStatement.java
deleted file mode 100644
index 93805fd6..00000000
--- a/openjdk/sun/jdbc/odbc/JdbcOdbcPreparedStatement.java
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
-  Copyright (C) 2009 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.jdbc.odbc;
-
-import java.io.InputStream;
-import java.io.Reader;
-import java.math.BigDecimal;
-import java.net.URL;
-import java.sql.Array;
-import java.sql.Blob;
-import java.sql.Clob;
-import java.sql.Date;
-import java.sql.NClob;
-import java.sql.ParameterMetaData;
-import java.sql.PreparedStatement;
-import java.sql.Ref;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.RowId;
-import java.sql.SQLException;
-import java.sql.SQLXML;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.sql.Types;
-import java.util.Calendar;
-
-import cli.System.Data.*;
-import cli.System.Data.Common.*;
-import cli.System.Data.Odbc.*;
-
-/**
- * @author Volker Berlin
- */
-public class JdbcOdbcPreparedStatement extends JdbcOdbcStatement implements PreparedStatement{
-
-    public JdbcOdbcPreparedStatement(JdbcOdbcConnection jdbcConn, OdbcCommand command, String sql, int resultSetType, int resultSetConcurrency){
-        super(jdbcConn, command, resultSetType, resultSetConcurrency);
-        command.set_CommandText(sql);
-        command.Prepare();
-    }
-
-
-    public void addBatch() throws SQLException{
-        // TODO Auto-generated method stub
-
-    }
-
-
-    public void clearParameters(){
-        DbParameterCollection params = command.get_Parameters();
-        params.Clear();
-    }
-
-
-    public boolean execute() throws SQLException{
-        return super.execute(null);
-    }
-
-
-    public ResultSet executeQuery() throws SQLException{
-        return super.executeQuery(null);
-    }
-
-
-    public int executeUpdate() throws SQLException{
-        return super.executeUpdate(null);
-    }
-
-
-    public ResultSetMetaData getMetaData() throws SQLException{
-        ResultSet rs = getResultSet();
-        if(rs != null){
-            rs.getMetaData();
-        }
-        DbDataReader reader = command.ExecuteReader(CommandBehavior.wrap(CommandBehavior.SchemaOnly));
-        JdbcOdbcResultSetMetaData metadata = new JdbcOdbcResultSetMetaData(reader);
-        reader.Close();
-        return metadata;
-    }
-
-
-    public ParameterMetaData getParameterMetaData(){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public void setArray(int parameterIndex, Array x) throws SQLException{
-        setObject(parameterIndex, x, Types.ARRAY);
-    }
-
-
-    public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException{
-        setObject(parameterIndex, x, Types.LONGVARCHAR);
-    }
-
-
-    public void setAsciiStream(int parameterIndex, InputStream x, int length) throws SQLException{
-        setObject(parameterIndex, x, Types.LONGVARCHAR, length);
-    }
-
-
-    public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException{
-        setObject(parameterIndex, x, Types.LONGVARCHAR, (int)length);
-    }
-
-
-    public void setBigDecimal(int parameterIndex, BigDecimal x) throws SQLException{
-        setObject(parameterIndex, x, Types.DECIMAL);
-    }
-
-
-    public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException{
-        setObject(parameterIndex, x, Types.LONGVARBINARY);
-    }
-
-
-    public void setBinaryStream(int parameterIndex, InputStream x, int length) throws SQLException{
-        setObject(parameterIndex, x, Types.LONGVARBINARY, length);
-    }
-
-
-    public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException{
-        setObject(parameterIndex, x, Types.LONGVARBINARY, (int)length);
-    }
-
-
-    public void setBlob(int parameterIndex, Blob x) throws SQLException{
-        setObject(parameterIndex, x, Types.BLOB);
-    }
-
-
-    public void setBlob(int parameterIndex, InputStream x) throws SQLException{
-        setObject(parameterIndex, x, Types.BLOB);
-    }
-
-
-    public void setBlob(int parameterIndex, InputStream x, long length) throws SQLException{
-        setObject(parameterIndex, x, Types.BLOB, (int)length);
-    }
-
-
-    public void setBoolean(int parameterIndex, boolean x) throws SQLException{
-        setObject(parameterIndex, Boolean.valueOf(x), Types.BOOLEAN);
-    }
-
-
-    public void setByte(int parameterIndex, byte x) throws SQLException{
-        setObject(parameterIndex, Byte.valueOf(x), Types.TINYINT);
-    }
-
-
-    public void setBytes(int parameterIndex, byte[] x) throws SQLException{
-        setObject(parameterIndex, x, Types.BINARY);
-    }
-
-
-    public void setCharacterStream(int parameterIndex, Reader x) throws SQLException{
-        setObject(parameterIndex, x, Types.LONGVARCHAR);
-    }
-
-
-    public void setCharacterStream(int parameterIndex, Reader x, int length) throws SQLException{
-        setObject(parameterIndex, x, Types.NCLOB, length);
-    }
-
-
-    public void setCharacterStream(int parameterIndex, Reader x, long length) throws SQLException{
-        setObject(parameterIndex, x, Types.LONGVARCHAR, (int)length);
-    }
-
-
-    public void setClob(int parameterIndex, Clob x) throws SQLException{
-        setObject(parameterIndex, x, Types.CLOB);
-    }
-
-
-    public void setClob(int parameterIndex, Reader x) throws SQLException{
-        setObject(parameterIndex, x, Types.CLOB);
-    }
-
-
-    public void setClob(int parameterIndex, Reader x, long length) throws SQLException{
-        setObject(parameterIndex, x, Types.CLOB, (int)length);
-    }
-
-
-    public void setDate(int parameterIndex, Date x) throws SQLException{
-        setObject(parameterIndex, x, Types.DATE);
-    }
-
-
-    public void setDate(int parameterIndex, Date x, Calendar cal) throws SQLException{
-        JdbcOdbcUtils.convertCalendarToLocalDate(x, cal);
-        setObject(parameterIndex, x, Types.DATE);
-    }
-
-
-    public void setDouble(int parameterIndex, double x) throws SQLException{
-        setObject(parameterIndex, Double.valueOf(x), Types.DOUBLE);
-    }
-
-
-    public void setFloat(int parameterIndex, float x) throws SQLException{
-        setObject(parameterIndex, Float.valueOf(x), Types.FLOAT);
-    }
-
-
-    public void setInt(int parameterIndex, int x) throws SQLException{
-        setObject(parameterIndex, Integer.valueOf(x), Types.INTEGER);
-    }
-
-
-    public void setLong(int parameterIndex, long x) throws SQLException{
-        setObject(parameterIndex, Long.valueOf(x), Types.BIGINT);
-    }
-
-
-    public void setNCharacterStream(int parameterIndex, Reader x) throws SQLException{
-        setObject(parameterIndex, x, Types.LONGNVARCHAR);
-    }
-
-
-    public void setNCharacterStream(int parameterIndex, Reader x, long length) throws SQLException{
-        setObject(parameterIndex, x, Types.LONGNVARCHAR, (int)length);
-    }
-
-
-    public void setNClob(int parameterIndex, NClob x) throws SQLException{
-        setObject(parameterIndex, x, Types.NCLOB);
-    }
-
-
-    public void setNClob(int parameterIndex, Reader x) throws SQLException{
-        setObject(parameterIndex, x, Types.NCLOB);
-    }
-
-
-    public void setNClob(int parameterIndex, Reader x, long length) throws SQLException{
-        setObject(parameterIndex, x, Types.NCLOB, (int)length);
-    }
-
-
-    public void setNString(int parameterIndex, String x) throws SQLException{
-        setObject(parameterIndex, x, Types.NVARCHAR);
-    }
-
-
-    public void setNull(int parameterIndex, int sqlType) throws SQLException{
-        setObject(parameterIndex, null, sqlType);
-    }
-
-
-    public void setNull(int parameterIndex, int sqlType, String typeName) throws SQLException{
-        setObject(parameterIndex, null, sqlType);
-    }
-
-
-    public void setObject(int parameterIndex, Object x) throws SQLException{
-        setObject(parameterIndex, x, Types.OTHER, -1);
-    }
-
-
-    public void setObject(int parameterIndex, Object x, int targetSqlType) throws SQLException{
-        setObject(parameterIndex, x, targetSqlType, -1);
-    }
-
-
-    public void setObject(int parameterIndex, Object x, int targetSqlType, int scaleOrLength) throws SQLException{
-        DbParameter para = getPara(parameterIndex);
-        para.set_Value(JdbcOdbcUtils.convertJava2Net(x, scaleOrLength));
-        if(para.get_Direction().Value == ParameterDirection.Output){
-            para.set_Direction(ParameterDirection.wrap(ParameterDirection.InputOutput));
-        }
-        
-        if(targetSqlType != Types.OTHER){
-            para.set_DbType(DbType.wrap(JdbcOdbcUtils.convertJdbc2AdoNetType(targetSqlType)));
-        }
-        
-        if(scaleOrLength >= 0){
-            switch(targetSqlType){
-                case Types.DECIMAL:
-                case Types.NUMERIC:
-                    para.set_Scale((byte)scaleOrLength);
-            }
-        }
-    }
-
-
-    public void setRef(int parameterIndex, Ref x) throws SQLException{
-        setObject(parameterIndex, x, Types.REF);
-    }
-
-
-    public void setRowId(int parameterIndex, RowId x) throws SQLException{
-        setObject(parameterIndex, x, Types.ROWID);
-    }
-
-
-    public void setSQLXML(int parameterIndex, SQLXML x) throws SQLException{
-        setObject(parameterIndex, x, Types.SQLXML);
-    }
-
-
-    public void setShort(int parameterIndex, short x) throws SQLException{
-        setObject(parameterIndex, Short.valueOf(x), Types.SMALLINT);
-    }
-
-
-    public void setString(int parameterIndex, String x) throws SQLException{
-        setObject(parameterIndex, x, Types.VARCHAR);
-    }
-
-
-    public void setTime(int parameterIndex, Time x) throws SQLException{
-        setObject(parameterIndex, x, Types.TIME);
-    }
-
-
-    public void setTime(int parameterIndex, Time x, Calendar cal) throws SQLException{
-        JdbcOdbcUtils.convertCalendarToLocalDate(x, cal);
-        setObject(parameterIndex, x, Types.TIME);
-    }
-
-
-    public void setTimestamp(int parameterIndex, Timestamp x) throws SQLException{
-        setObject(parameterIndex, x, Types.TIMESTAMP);
-    }
-
-
-    public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) throws SQLException{
-        JdbcOdbcUtils.convertCalendarToLocalDate(x, cal);
-        setObject(parameterIndex, x, Types.TIMESTAMP);
-    }
-
-
-    public void setURL(int parameterIndex, URL x) throws SQLException{
-        setObject(parameterIndex, x, Types.DATALINK);
-    }
-
-
-    public void setUnicodeStream(int parameterIndex, InputStream x, int length) throws SQLException{
-        setObject(parameterIndex, x, Types.LONGNVARCHAR, length);
-    }
-
-
-    /**
-     * Get the DbParameter from the current command. If the parameter does not exits in the collection then add it.
-     * 
-     * @param parameterIndex
-     *            The JDBC parameter index starting with 1
-     * @return the DbParameter for the index.
-     * @throws SQLException
-     *             If any error occur.
-     */
-    protected DbParameter getPara(int parameterIndex) throws SQLException{
-        try{
-            DbParameterCollection params = command.get_Parameters();
-            while(params.get_Count() < parameterIndex){
-                params.Add(command.CreateParameter());
-            }
-            return params.get_Item(parameterIndex - 1);
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-}
diff --git a/openjdk/sun/jdbc/odbc/JdbcOdbcResultSet.java b/openjdk/sun/jdbc/odbc/JdbcOdbcResultSet.java
deleted file mode 100644
index 398f368b..00000000
--- a/openjdk/sun/jdbc/odbc/JdbcOdbcResultSet.java
+++ /dev/null
@@ -1,799 +0,0 @@
-/*
-  Copyright (C) 2009, 2011 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.jdbc.odbc;
-
-import java.io.InputStream;
-import java.io.Reader;
-import java.math.BigDecimal;
-import java.sql.*;
-
-import cli.System.Data.Common.*;
-
-/**
- * This JDBC Driver is a wrapper to the ODBC.NET Data Provider. This ResultSet based on a DataReader.
- */
-public class JdbcOdbcResultSet extends JdbcOdbcObject implements ResultSet{
-
-    private DbDataReader reader;
-
-    private final JdbcOdbcStatement statement;
-
-    private final int holdability;
-
-    private final int concurrency;
-
-    private int fetchSize;
-
-    private int row;
-
-    private final int resultSetType;
-
-    private ResultSetMetaData metaData;
-
-
-    /**
-     * Create a ResultSet that based on a DbDataReader
-     * 
-     * @param statement
-     *            the statement for getStatement(), can be null
-     * @param reader
-     *            the reader for the data access, if it null then the resultset is closed.
-     */
-    public JdbcOdbcResultSet(JdbcOdbcStatement statement, DbDataReader reader){
-        this.statement = statement;
-        this.reader = reader;
-        this.resultSetType = TYPE_FORWARD_ONLY;
-        this.concurrency = CONCUR_READ_ONLY;
-        this.holdability = HOLD_CURSORS_OVER_COMMIT;
-    }
-
-
-    /**
-     * A constructor for extended classes. All methods that use the reader must be overridden if you use this
-     * constructor.
-     * 
-     * @param statement
-     *            the statement for getStatement(), can be null
-     * @param resultSetType
-     *            a result set type; one of ResultSet.TYPE_FORWARD_ONLY, ResultSet.TYPE_SCROLL_INSENSITIVE, or
-     *            ResultSet.TYPE_SCROLL_SENSITIVE
-     * @param concurrency
-     *            a concurrency type; one of ResultSet.CONCUR_READ_ONLY or ResultSet.CONCUR_UPDATABLE
-     */
-    protected JdbcOdbcResultSet(JdbcOdbcStatement statement, int resultSetType, int concurrency){
-        this.statement = statement;
-        this.reader = null;
-        this.resultSetType = resultSetType;
-        this.concurrency = concurrency;
-        this.holdability = HOLD_CURSORS_OVER_COMMIT;
-    }
-
-
-    public boolean absolute(int rowPosition) throws SQLException{
-        throwForwardOnly();
-        return false; // for Compiler
-    }
-
-
-    public void afterLast() throws SQLException{
-        throwForwardOnly();
-    }
-
-
-    public void beforeFirst() throws SQLException{
-        throwForwardOnly();
-    }
-
-
-    public void cancelRowUpdates() throws SQLException{
-        throwReadOnly();
-    }
-
-
-    public void clearWarnings() throws SQLException{
-        // TODO Auto-generated method stub
-
-    }
-
-
-    public void close(){
-        reader = null;
-        statement.closeReaderIfPossible();
-    }
-
-
-    public void deleteRow() throws SQLException{
-        throwReadOnly();
-    }
-
-
-    @Override
-    public int findColumn(String columnLabel) throws SQLException{
-        try{
-            return getReader().GetOrdinal(columnLabel) + 1;
-        }catch(ArrayIndexOutOfBoundsException ex){
-            throw new SQLException("Column '" + columnLabel + "' not found.", "S0022", ex);
-        }
-    }
-
-
-    public boolean first() throws SQLException{
-        throwForwardOnly();
-        return false; // for compiler
-    }
-
-
-    public int getConcurrency(){
-        return concurrency;
-    }
-
-
-    public String getCursorName() throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public int getFetchDirection(){
-        return FETCH_UNKNOWN;
-    }
-
-
-    public int getFetchSize(){
-        return fetchSize;
-    }
-
-
-    public int getHoldability(){
-        return holdability;
-    }
-
-
-    public ResultSetMetaData getMetaData() throws SQLException{
-        if(metaData == null){
-            metaData = new JdbcOdbcResultSetMetaData(getReader());
-        }
-        return metaData;
-    }
-
-
-    public int getRow() throws SQLException{
-        getReader(); // checking for is closed
-        return row;
-    }
-
-
-    public Statement getStatement(){
-        return statement;
-    }
-
-
-    public int getType(){
-        return resultSetType;
-    }
-
-
-    public SQLWarning getWarnings() throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public void insertRow() throws SQLException{
-        throwReadOnly();
-    }
-
-
-    public boolean isAfterLast() throws SQLException{
-        throwForwardOnly();
-        return false; // only for compiler
-    }
-
-
-    public boolean isBeforeFirst() throws SQLException{
-        throwForwardOnly();
-        return false; // only for compiler
-    }
-
-
-    public boolean isClosed(){
-        return reader == null;
-    }
-
-
-    public boolean isFirst() throws SQLException{
-        throwForwardOnly();
-        return false; // only for compiler
-    }
-
-
-    public boolean isLast() throws SQLException{
-        throwForwardOnly();
-        return false; // only for compiler
-    }
-
-
-    public boolean last() throws SQLException{
-        throwForwardOnly();
-        return false; // only for compiler
-    }
-
-
-    public void moveToCurrentRow() throws SQLException{
-        throwReadOnly();
-    }
-
-
-    public void moveToInsertRow() throws SQLException{
-        throwReadOnly();
-    }
-
-
-    public boolean next() throws SQLException{
-        DbDataReader dataReader = getReader();
-        //if we after the last row then we close the reader
-        //to prevent an error on repeating call of next() after the end
-        //that we check also get_IsClosed()
-        if(!dataReader.get_IsClosed() && dataReader.Read()){
-            row++;
-            return true;
-        }
-        row = 0;
-        statement.closeReaderIfPossible();
-        return false;
-    }
-
-
-    public boolean previous() throws SQLException{
-        throwForwardOnly();
-        return false; // only for compiler
-    }
-
-
-    public void refreshRow() throws SQLException{
-        throwForwardOnly();
-    }
-
-
-    public boolean relative(int rowPositions) throws SQLException{
-        throwForwardOnly();
-        return false; // only for compiler
-    }
-
-
-    public boolean rowDeleted() throws SQLException{
-        throwReadOnly();
-        return false; // only for compiler
-    }
-
-
-    public boolean rowInserted() throws SQLException{
-        throwReadOnly();
-        return false; // only for compiler
-    }
-
-
-    public boolean rowUpdated() throws SQLException{
-        throwReadOnly();
-        return false; // only for compiler
-    }
-
-
-    public void setFetchDirection(int direction){
-        // ignore it
-    }
-
-
-    public void setFetchSize(int rows){
-        // ignore it
-    }
-
-
-    public void updateArray(int columnIndex, Array x) throws SQLException{
-        updateObject(columnIndex, x);
-    }
-
-
-    public void updateArray(String columnLabel, Array x) throws SQLException{
-        updateArray(findColumn(columnLabel), x);
-    }
-
-
-    public void updateAsciiStream(int columnIndex, InputStream x, int length) throws SQLException{
-        updateObject(columnIndex, x, length);
-    }
-
-
-    public void updateAsciiStream(String columnLabel, InputStream x, int length) throws SQLException{
-        updateObject(findColumn(columnLabel), x, length);
-    }
-
-
-    public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException{
-        updateObject(columnIndex, x, (int)length);
-    }
-
-
-    public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException{
-        updateObject(findColumn(columnLabel), x, (int)length);
-    }
-
-
-    public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException{
-        updateObject(columnIndex, x);
-    }
-
-
-    public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException{
-        updateObject(findColumn(columnLabel), x);
-    }
-
-
-    public void updateBigDecimal(int columnIndex, BigDecimal x) throws SQLException{
-        updateObject(columnIndex, x);
-    }
-
-
-    public void updateBigDecimal(String columnLabel, BigDecimal x) throws SQLException{
-        updateObject(findColumn(columnLabel), x);
-    }
-
-
-    public void updateBinaryStream(int columnIndex, InputStream x, int length) throws SQLException{
-        updateObject(columnIndex, x, length);
-    }
-
-
-    public void updateBinaryStream(String columnLabel, InputStream x, int length) throws SQLException{
-        updateObject(findColumn(columnLabel), x, length);
-    }
-
-
-    public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException{
-        updateObject(columnIndex, x, (int)length);
-    }
-
-
-    public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException{
-        updateObject(findColumn(columnLabel), x, (int)length);
-    }
-
-
-    public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException{
-        updateObject(columnIndex, x);
-    }
-
-
-    public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException{
-        updateObject(findColumn(columnLabel), x);
-    }
-
-
-    public void updateBlob(int columnIndex, Blob x) throws SQLException{
-        updateObject(columnIndex, x);
-    }
-
-
-    public void updateBlob(String columnLabel, Blob x) throws SQLException{
-        updateObject(findColumn(columnLabel), x);
-    }
-
-
-    public void updateBlob(int columnIndex, InputStream x, long length) throws SQLException{
-        updateObject(columnIndex, x, (int)length);
-    }
-
-
-    public void updateBlob(String columnLabel, InputStream x, long length) throws SQLException{
-        updateObject(findColumn(columnLabel), x, (int)length);
-    }
-
-
-    public void updateBlob(int columnIndex, InputStream x) throws SQLException{
-        updateObject(columnIndex, x);
-    }
-
-
-    public void updateBlob(String columnLabel, InputStream x) throws SQLException{
-        updateObject(findColumn(columnLabel), x);
-    }
-
-
-    public void updateBoolean(int columnIndex, boolean x) throws SQLException{
-        updateObject(columnIndex, Boolean.valueOf(x));
-    }
-
-
-    public void updateBoolean(String columnLabel, boolean x) throws SQLException{
-        updateObject(findColumn(columnLabel), Boolean.valueOf(x));
-    }
-
-
-    public void updateByte(int columnIndex, byte x) throws SQLException{
-        updateObject(columnIndex, Byte.valueOf(x));
-    }
-
-
-    public void updateByte(String columnLabel, byte x) throws SQLException{
-        updateObject(findColumn(columnLabel), Byte.valueOf(x));
-    }
-
-
-    public void updateBytes(int columnIndex, byte[] x) throws SQLException{
-        updateObject(columnIndex, x);
-    }
-
-
-    public void updateBytes(String columnLabel, byte[] x) throws SQLException{
-        updateObject(findColumn(columnLabel), x);
-    }
-
-
-    public void updateCharacterStream(int columnIndex, Reader x, int length) throws SQLException{
-        updateObject(columnIndex, x, length);
-    }
-
-
-    public void updateCharacterStream(String columnLabel, Reader x, int length) throws SQLException{
-        updateObject(findColumn(columnLabel), x, length);
-    }
-
-
-    public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException{
-        updateObject(columnIndex, x, (int)length);
-    }
-
-
-    public void updateCharacterStream(String columnLabel, Reader x, long length) throws SQLException{
-        updateObject(findColumn(columnLabel), x, (int)length);
-    }
-
-
-    public void updateCharacterStream(int columnIndex, Reader x) throws SQLException{
-        updateObject(columnIndex, x);
-    }
-
-
-    public void updateCharacterStream(String columnLabel, Reader x) throws SQLException{
-        updateObject(findColumn(columnLabel), x);
-    }
-
-
-    public void updateClob(int columnIndex, Clob x) throws SQLException{
-        updateObject(columnIndex, x);
-    }
-
-
-    public void updateClob(String columnLabel, Clob x) throws SQLException{
-        updateObject(findColumn(columnLabel), x);
-    }
-
-
-    public void updateClob(int columnIndex, Reader x, long length) throws SQLException{
-        updateObject(columnIndex, x, (int)length);
-    }
-
-
-    public void updateClob(String columnLabel, Reader x, long length) throws SQLException{
-        updateObject(findColumn(columnLabel), x, (int)length);
-    }
-
-
-    public void updateClob(int columnIndex, Reader x) throws SQLException{
-        updateObject(columnIndex, x);
-    }
-
-
-    public void updateClob(String columnLabel, Reader x) throws SQLException{
-        updateObject(findColumn(columnLabel), x);
-    }
-
-
-    public void updateDate(int columnIndex, Date x) throws SQLException{
-        updateObject(columnIndex, x);
-    }
-
-
-    public void updateDate(String columnLabel, Date x) throws SQLException{
-        updateObject(findColumn(columnLabel), x);
-    }
-
-
-    public void updateDouble(int columnIndex, double x) throws SQLException{
-        updateObject(columnIndex, Double.valueOf(x));
-    }
-
-
-    public void updateDouble(String columnLabel, double x) throws SQLException{
-        updateObject(findColumn(columnLabel), Double.valueOf(x));
-    }
-
-
-    public void updateFloat(int columnIndex, float x) throws SQLException{
-        updateObject(columnIndex, Float.valueOf(x));
-    }
-
-
-    public void updateFloat(String columnLabel, float x) throws SQLException{
-        updateObject(findColumn(columnLabel), Float.valueOf(x));
-    }
-
-
-    public void updateInt(int columnIndex, int x) throws SQLException{
-        updateObject(columnIndex, Integer.valueOf(x));
-    }
-
-
-    public void updateInt(String columnLabel, int x) throws SQLException{
-        updateObject(findColumn(columnLabel), Integer.valueOf(x));
-    }
-
-
-    public void updateLong(int columnIndex, long x) throws SQLException{
-        updateObject(columnIndex, Long.valueOf(x));
-    }
-
-
-    public void updateLong(String columnLabel, long x) throws SQLException{
-        updateObject(findColumn(columnLabel), Long.valueOf(x));
-    }
-
-
-    public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException{
-        updateObject(columnIndex, x, (int)length);
-    }
-
-
-    public void updateNCharacterStream(String columnLabel, Reader x, long length) throws SQLException{
-        updateObject(findColumn(columnLabel), x, (int)length);
-    }
-
-
-    public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException{
-        updateObject(columnIndex, x);
-    }
-
-
-    public void updateNCharacterStream(String columnLabel, Reader x) throws SQLException{
-        updateObject(findColumn(columnLabel), x);
-    }
-
-
-    public void updateNClob(int columnIndex, NClob x) throws SQLException{
-        updateObject(columnIndex, x);
-    }
-
-
-    public void updateNClob(String columnLabel, NClob x) throws SQLException{
-        updateObject(findColumn(columnLabel), x);
-    }
-
-
-    public void updateNClob(int columnIndex, Reader x, long length) throws SQLException{
-        updateObject(columnIndex, x, (int)length);
-    }
-
-
-    public void updateNClob(String columnLabel, Reader x, long length) throws SQLException{
-        updateObject(findColumn(columnLabel), x, (int)length);
-    }
-
-
-    public void updateNClob(int columnIndex, Reader x) throws SQLException{
-        updateObject(columnIndex, x);
-    }
-
-
-    public void updateNClob(String columnLabel, Reader x) throws SQLException{
-        updateObject(findColumn(columnLabel), x);
-    }
-
-
-    public void updateNString(int columnIndex, String x) throws SQLException{
-        updateObject(columnIndex, x);
-    }
-
-
-    public void updateNString(String columnLabel, String x) throws SQLException{
-        updateObject(findColumn(columnLabel), x);
-    }
-
-
-    public void updateNull(int columnIndex) throws SQLException{
-        updateObject(columnIndex, null);
-    }
-
-
-    public void updateNull(String columnLabel) throws SQLException{
-        updateObject(findColumn(columnLabel), null);
-    }
-
-
-    public void updateObject(int columnIndex, Object x, int scaleOrLength) throws SQLException{
-        throwReadOnly();
-    }
-
-
-    public void updateObject(int columnIndex, Object x) throws SQLException{
-        updateObject(columnIndex, x, -1);
-    }
-
-
-    public void updateObject(String columnLabel, Object x, int scaleOrLength) throws SQLException{
-        updateObject(findColumn(columnLabel), x, scaleOrLength);
-    }
-
-
-    public void updateObject(String columnLabel, Object x) throws SQLException{
-        updateObject(findColumn(columnLabel), x);
-    }
-
-
-    public void updateRef(int columnIndex, Ref x) throws SQLException{
-        updateObject(columnIndex, x);
-    }
-
-
-    public void updateRef(String columnLabel, Ref x) throws SQLException{
-        updateObject(findColumn(columnLabel), x);
-    }
-
-
-    public void updateRow() throws SQLException{
-        throwReadOnly();
-    }
-
-
-    public void updateRowId(int columnIndex, RowId x) throws SQLException{
-        updateObject(columnIndex, x);
-    }
-
-
-    public void updateRowId(String columnLabel, RowId x) throws SQLException{
-        updateObject(findColumn(columnLabel), x);
-    }
-
-
-    public void updateSQLXML(int columnIndex, SQLXML x) throws SQLException{
-        updateObject(columnIndex, x);
-    }
-
-
-    public void updateSQLXML(String columnLabel, SQLXML x) throws SQLException{
-        updateObject(findColumn(columnLabel), x);
-    }
-
-
-    public void updateShort(int columnIndex, short x) throws SQLException{
-        updateObject(columnIndex, Short.valueOf(x));
-    }
-
-
-    public void updateShort(String columnLabel, short x) throws SQLException{
-        updateObject(findColumn(columnLabel), Short.valueOf(x));
-    }
-
-
-    public void updateString(int columnIndex, String x) throws SQLException{
-        updateObject(columnIndex, x);
-    }
-
-
-    public void updateString(String columnLabel, String x) throws SQLException{
-        updateObject(findColumn(columnLabel), x);
-    }
-
-
-    public void updateTime(int columnIndex, Time x) throws SQLException{
-        updateObject(columnIndex, x);
-    }
-
-
-    public void updateTime(String columnLabel, Time x) throws SQLException{
-        updateObject(findColumn(columnLabel), x);
-    }
-
-
-    public void updateTimestamp(int columnIndex, Timestamp x) throws SQLException{
-        updateObject(columnIndex, x);
-    }
-
-
-    public void updateTimestamp(String columnLabel, Timestamp x) throws SQLException{
-        updateObject(findColumn(columnLabel), x);
-    }
-
-
-    public boolean isWrapperFor(Class<?> iface){
-        return iface.isAssignableFrom(this.getClass());
-    }
-
-
-    public <T>T unwrap(Class<T> iface) throws SQLException{
-        if(isWrapperFor(iface)){
-            return (T)this;
-        }
-        throw new SQLException(this.getClass().getName() + " does not implements " + iface.getName() + ".", "01000");
-    }
-
-
-    private void throwForwardOnly() throws SQLException{
-        throw new SQLException("ResultSet is forward only.", "24000");
-    }
-
-
-    private void throwReadOnly() throws SQLException{
-        throw new SQLException("ResultSet is read only.", "24000");
-    }
-
-
-    /**
-     * Check if this ResultSet is closed before access to the DbDataReader
-     * 
-     * @return
-     * @throws SQLException
-     */
-    private DbDataReader getReader() throws SQLException{
-        if(reader == null){
-            throw new SQLException("ResultSet is closed.", "24000");
-        }
-        return reader;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected Object getObjectImpl(int columnIndex) throws SQLException{
-        try{
-            DbDataReader datareader = getReader();
-            try{
-                return datareader.get_Item(columnIndex-1);
-            }catch(ArrayIndexOutOfBoundsException aioobe){
-                throw new SQLException( "Invalid column number ("+columnIndex+"). A number between 1 and "+datareader.get_FieldCount()+" is valid.", "S1002", aioobe);
-            }
-        }catch(Throwable ex){
-            throw JdbcOdbcUtils.createSQLException(ex);
-        }
-    }
-
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
-		throw new SQLFeatureNotSupportedException();
-	}
-
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public <T> T getObject(String columnLabel, Class<T> type)
-			throws SQLException {
-		throw new SQLFeatureNotSupportedException();
-	}
-
-}
diff --git a/openjdk/sun/jdbc/odbc/JdbcOdbcResultSetMetaData.java b/openjdk/sun/jdbc/odbc/JdbcOdbcResultSetMetaData.java
deleted file mode 100644
index a92fdaf1..00000000
--- a/openjdk/sun/jdbc/odbc/JdbcOdbcResultSetMetaData.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
-  Copyright (C) 2009 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.jdbc.odbc;
-
-import ikvm.lang.CIL;
-
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.sql.Types;
-
-import cli.System.Convert;
-import cli.System.DBNull;
-import cli.System.Data.*;
-import cli.System.Data.Common.*;
-import cli.System.Data.Odbc.OdbcType;
-
-/**
- * This JDBC Driver is a wrapper to the ODBC.NET Data Provider.
- */
-public class JdbcOdbcResultSetMetaData implements ResultSetMetaData{
-
-    private final DbDataReader reader;
-    
-    private final DataTable schema;
-    
-    JdbcOdbcResultSetMetaData(DbDataReader reader){
-        this.reader = reader;
-        schema = reader.GetSchemaTable();
-    }
-    
-    public String getCatalogName(int column) throws SQLException{
-        Object obj = getColumnMeta(column, "BaseCatalogName");
-        if(obj == null || obj == DBNull.Value){
-            return "";
-        }
-        return obj.toString();
-    }
-
-
-    public String getColumnClassName(int column) throws SQLException{
-        String type = getColumnMeta(column, "DataType").toString();
-        return JdbcOdbcUtils.getJavaClassName(type);
-    }
-
-
-    public int getColumnCount(){
-        return schema.get_Rows().get_Count();
-    }
-
-
-    public int getColumnDisplaySize(int column) throws SQLException{
-        int precision = getPrecision(column);
-        int type = CIL.unbox_int( getColumnMeta(column, "ProviderType") );
-        switch(type){
-            case OdbcType.Decimal:
-            case OdbcType.Numeric:
-                return precision + (getScale(column) > 0 ? 2 : 1); // + sign and comma
-        }
-        return precision;
-    }
-
-
-    public String getColumnLabel(int column) throws SQLException{
-        return getColumnMeta(column, "ColumnName").toString();
-    }
-
-
-    public String getColumnName(int column) throws SQLException{
-        return getColumnMeta(column, "ColumnName").toString();
-    }
-
-
-    public int getColumnType(int column) throws SQLException{
-        int type = CIL.unbox_int( getColumnMeta(column, "ProviderType") );
-        switch(type){
-            case OdbcType.VarChar:
-                return Types.VARCHAR;
-            case OdbcType.Char:
-                return Types.CHAR;
-            case OdbcType.Binary:
-            case OdbcType.Timestamp:
-                return Types.BINARY;
-            case OdbcType.Bit:
-                return Types.BOOLEAN;
-            case OdbcType.TinyInt:
-                return Types.TINYINT;
-            case OdbcType.Date:
-                return Types.DATE;
-            case OdbcType.DateTime:
-            case OdbcType.SmallDateTime:
-                return Types.TIMESTAMP;
-            case OdbcType.Decimal:
-                return Types.DECIMAL;
-            case OdbcType.Double:
-                return Types.DOUBLE;
-            case OdbcType.UniqueIdentifier:
-                return Types.ROWID;
-            case OdbcType.SmallInt:
-                return Types.SMALLINT;
-            case OdbcType.Int:
-                return Types.INTEGER;
-            case OdbcType.BigInt:
-                return Types.BIGINT;
-            case OdbcType.Real:
-                return Types.FLOAT;
-            case OdbcType.NVarChar:
-                return Types.NVARCHAR;
-            case OdbcType.NChar:
-                return Types.NCHAR;
-            case OdbcType.NText:
-                return Types.LONGNVARCHAR;
-            case OdbcType.Text:
-                return Types.LONGVARCHAR;
-            case OdbcType.Image:
-                return Types.LONGVARBINARY;
-            case OdbcType.Time:
-                return Types.TIME;
-            case OdbcType.Numeric:
-                return Types.NUMERIC;
-            case OdbcType.VarBinary:
-                return Types.VARBINARY;
-        }
-        return Types.OTHER;
-    }
-
-
-    public String getColumnTypeName(int column) throws SQLException{
-        try{
-            return reader.GetDataTypeName(column - 1);
-        }catch(ArrayIndexOutOfBoundsException ex){
-            throw new SQLException("Invalid column number ("+column+"). A number between 1 and "+schema.get_Rows().get_Count()+" is valid.", "S1002");
-        }catch(Throwable ex){
-            throw JdbcOdbcUtils.createSQLException(ex);
-        }
-    }
-
-
-    public int getPrecision(int column) throws SQLException{
-        Object obj = getColumnMeta(column, "NumericPrecision");
-        return Convert.ToInt32(obj);
-    }
-
-
-    public int getScale(int column) throws SQLException{
-        Object obj = getColumnMeta(column, "NumericScale");
-        return Convert.ToInt32(obj);
-    }
-
-
-    public String getSchemaName(int column) throws SQLException{
-        Object obj = getColumnMeta(column, "BaseSchemaName");
-        if(obj == null || obj == DBNull.Value){
-            return "";
-        }
-        return obj.toString();
-    }
-
-
-    public String getTableName(int column) throws SQLException{
-        Object obj = getColumnMeta(column, "BaseTableName");
-        if(obj == null || obj == DBNull.Value){
-            return "";
-        }
-        return obj.toString();
-    }
-
-
-    public boolean isAutoIncrement(int column) throws SQLException{
-        Object obj = getColumnMeta(column, "IsAutoIncrement");
-        return Convert.ToBoolean(obj);
-    }
-
-
-    public boolean isCaseSensitive(int column){
-        return false;
-    }
-
-
-    public boolean isCurrency(int column) throws SQLException{
-        return CIL.unbox_int( getColumnMeta(column, "ProviderType") ) == OdbcType.Decimal && getScale(column) == 4;
-    }
-
-
-    public boolean isDefinitelyWritable(int column){
-        return false;
-    }
-
-
-    public int isNullable(int column) throws SQLException{
-        Object obj = getColumnMeta(column, "AllowDBNull");
-        return Convert.ToBoolean(obj) ? columnNullable : columnNoNulls;
-    }
-
-
-    public boolean isReadOnly(int column) throws SQLException{
-        Object obj = getColumnMeta(column, "IsReadOnly");
-        return Convert.ToBoolean(obj);
-    }
-
-
-    public boolean isSearchable(int column) throws SQLException{
-        return !CIL.unbox_boolean( getColumnMeta(column, "IsLong") );
-    }
-
-
-    public boolean isSigned(int column) throws SQLException{
-        int type = CIL.unbox_int( getColumnMeta(column, "ProviderType") );
-        switch(type){
-            case OdbcType.Numeric:
-            case OdbcType.Decimal:
-            case OdbcType.Double:
-            case OdbcType.SmallInt:
-            case OdbcType.Int:
-            case OdbcType.BigInt:
-            case OdbcType.Real:
-                return true;
-        }
-        return false;
-    }
-
-
-    public boolean isWritable(int column) throws SQLException{
-        Object obj = getColumnMeta(column, "IsReadOnly");
-        return !Convert.ToBoolean(obj);
-    }
-
-
-    public boolean isWrapperFor(Class<?> iface){
-        return iface.isAssignableFrom(this.getClass());
-    }
-
-
-    public <T>T unwrap(Class<T> iface) throws SQLException{
-        if(isWrapperFor(iface)){
-            return (T)this;
-        }
-        throw new SQLException(this.getClass().getName() + " does not implements " + iface.getName() + ".", "01000");
-    }
-    
-    private Object getColumnMeta(int column, String metaKey) throws SQLException{
-        try{
-            DataRow columnMeta = schema.get_Rows().get_Item(column-1);
-            return columnMeta.get_Item(metaKey);
-        }catch(ArrayIndexOutOfBoundsException ex){
-            throw new SQLException("Invalid column number ("+column+"). A number between 1 and "+schema.get_Rows().get_Count()+" is valid.", "S1002");
-        }
-    }
-}
diff --git a/openjdk/sun/jdbc/odbc/JdbcOdbcStatement.java b/openjdk/sun/jdbc/odbc/JdbcOdbcStatement.java
deleted file mode 100644
index 358ae0e7..00000000
--- a/openjdk/sun/jdbc/odbc/JdbcOdbcStatement.java
+++ /dev/null
@@ -1,386 +0,0 @@
-/*
-  Copyright (C) 2009, 2011 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.jdbc.odbc;
-
-import java.sql.*;
-
-import cli.System.Data.*;
-import cli.System.Data.Common.*;
-import cli.System.Data.Odbc.*;
-
-/**
- * This JDBC Driver is a wrapper to the ODBC.NET Data Provider.
- */
-public class JdbcOdbcStatement implements Statement{
-
-    private final JdbcOdbcConnection jdbcConn;
-
-    protected final OdbcCommand command;
-
-    private final int resultSetType;
-    
-    private final int resultSetConcurrency;
-    
-    private DbDataReader reader;
-    
-    private ResultSet rs;
-    
-    private int updateCount;
-    
-    private boolean isClosed;
-    
-    private ResultSet moreResults;
-
-    public JdbcOdbcStatement(JdbcOdbcConnection jdbcConn, OdbcCommand command, int resultSetType, int resultSetConcurrency){
-        this.jdbcConn = jdbcConn;
-        this.command = command;
-        this.resultSetType = resultSetType;
-        this.resultSetConcurrency = resultSetConcurrency;
-    }
-
-
-    public void addBatch(String sql) throws SQLException{
-        // TODO Auto-generated method stub
-
-    }
-
-
-    public void cancel() throws SQLException{
-        try{
-            command.Cancel();
-        }catch(Throwable ex){
-            throw JdbcOdbcUtils.createSQLException(ex);
-        }
-    }
-
-
-    public void clearBatch() throws SQLException{
-        // TODO Auto-generated method stub
-
-    }
-
-
-    public void clearWarnings() throws SQLException{
-        // TODO Auto-generated method stub
-
-    }
-
-
-    public void close() throws SQLException{
-        isClosed = true;
-        if(rs != null){
-            rs.close();
-        }
-        if(reader != null){
-            reader.Close();
-        }
-        command.Dispose();
-    }
-
-
-    public boolean execute(String sql) throws SQLException{
-        try{
-            if(sql != null){
-                command.set_CommandText(sql);
-            }
-            command.ExecuteNonQuery();
-            return false;
-        }catch(Throwable ex){
-            throw JdbcOdbcUtils.createSQLException(ex);
-        }
-    }
-
-
-    public boolean execute(String sql, int autoGeneratedKeys){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public boolean execute(String sql, int[] columnIndexes){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public boolean execute(String sql, String[] columnNames){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public int[] executeBatch() throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public ResultSet executeQuery(String sql) throws SQLException{
-        try{
-            if(sql != null){
-                command.set_CommandText(sql);
-            }
-            if(resultSetConcurrency == ResultSet.CONCUR_UPDATABLE){
-                rs = new JdbcOdbcUpdateableResultSet(command);
-            }else{
-                if(resultSetType == ResultSet.TYPE_FORWARD_ONLY){
-                    reader = command.ExecuteReader();
-                    rs = new JdbcOdbcResultSet(this, reader);
-                }else{
-                    OdbcDataAdapter da = new OdbcDataAdapter(command);
-                    DataTable dt = new DataTable();
-                    da.Fill(dt);
-                    rs = new JdbcOdbcDTResultSet(dt);
-                }
-            }
-            return rs;
-        }catch(Throwable ex){
-            throw JdbcOdbcUtils.createSQLException(ex);
-        }
-    }
-
-
-    public int executeUpdate(String sql) throws SQLException{
-        try{
-            if(sql != null){
-                command.set_CommandText(sql);
-            }
-            updateCount = command.ExecuteNonQuery();
-            return updateCount;
-        }catch(Throwable ex){
-            throw JdbcOdbcUtils.createSQLException(ex);
-        }
-    }
-
-
-    public int executeUpdate(String sql, int autoGeneratedKeys){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public int executeUpdate(String sql, int[] columnIndexes){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public int executeUpdate(String sql, String[] columnNames){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public Connection getConnection(){
-        return jdbcConn;
-    }
-
-
-    public int getFetchDirection(){
-        return ResultSet.FETCH_UNKNOWN;
-    }
-
-
-    public int getFetchSize(){
-        return 0;
-    }
-
-
-    public ResultSet getGeneratedKeys(){
-        throw new UnsupportedOperationException();
-    }
-
-
-    public int getMaxFieldSize() throws SQLException{
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-
-    public int getMaxRows() throws SQLException{
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-
-    public boolean getMoreResults() throws SQLException{
-        try{
-            if(moreResults != null){
-                rs = moreResults;
-                moreResults = null;
-                return true;
-            }
-            boolean isNext = reader.NextResult();
-            if(isNext){
-                rs = new JdbcOdbcResultSet(this, reader);
-                return true;
-            }
-            rs = null;
-            return false;
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    public boolean getMoreResults(int current) throws SQLException{
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    public int getQueryTimeout(){
-        return command.get_CommandTimeout();
-    }
-
-
-    public ResultSet getResultSet(){
-        return rs;
-    }
-
-
-    public int getResultSetConcurrency(){
-        return resultSetConcurrency;
-    }
-
-
-    public int getResultSetHoldability() throws SQLException{
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-
-    public int getResultSetType(){
-        return resultSetType;
-    }
-
-
-    public int getUpdateCount(){
-        return updateCount;
-    }
-
-
-    public SQLWarning getWarnings() throws SQLException{
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    public boolean isClosed(){
-        return isClosed;
-    }
-
-
-    public void setCursorName(String name) throws SQLException{
-        // TODO Auto-generated method stub
-
-    }
-
-
-    public void setEscapeProcessing(boolean enable) throws SQLException{
-        // TODO Auto-generated method stub
-
-    }
-
-
-    public void setFetchDirection(int direction){
-        // ignore it
-    }
-
-
-    public void setFetchSize(int rows){
-        // ignore it
-    }
-
-
-    public void setMaxFieldSize(int max) throws SQLException{
-        // TODO Auto-generated method stub
-
-    }
-
-
-    public void setMaxRows(int max) throws SQLException{
-        // TODO Auto-generated method stub
-
-    }
-
-
-    public boolean isPoolable(){
-        return false;
-    }
-
-
-    public void setPoolable(boolean poolable) throws SQLException{
-        // ignore it
-    }
-
-
-    public void setQueryTimeout(int seconds){
-        command.set_CommandTimeout(seconds);
-    }
-
-
-    public boolean isWrapperFor(Class<?> iface){
-        return iface.isAssignableFrom(this.getClass());
-    }
-
-
-    public <T>T unwrap(Class<T> iface) throws SQLException{
-        if(isWrapperFor(iface)){
-            return (T)this;
-        }
-        throw new SQLException(this.getClass().getName() + " does not implements " + iface.getName() + ".", "01000");
-    }
-    
-    /**
-     * Close the DbDataReader if there are no more results.
-     * This give some blocking free without calling close() explicit.
-     * If there are more results then we need to save it.
-     */
-    void closeReaderIfPossible(){
-        ResultSet currentRs = rs;
-        boolean isMoreResults;
-        try{
-            isMoreResults = getMoreResults();
-        }catch(SQLException ex){
-            isMoreResults = false;
-        }
-        if(!isMoreResults){
-            reader.Close(); //this give the ODBC cursor free
-        }else{
-            moreResults = rs;
-        }
-        rs = currentRs;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-	public void closeOnCompletion() throws SQLException {
-	}
-
-
-    /**
-     * {@inheritDoc}
-     */
-	public boolean isCloseOnCompletion() throws SQLException {
-		return false;
-	}
-
-}
diff --git a/openjdk/sun/jdbc/odbc/JdbcOdbcUpdateableResultSet.java b/openjdk/sun/jdbc/odbc/JdbcOdbcUpdateableResultSet.java
deleted file mode 100644
index a3ce0ffe..00000000
--- a/openjdk/sun/jdbc/odbc/JdbcOdbcUpdateableResultSet.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
-  Copyright (C) 2009 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.jdbc.odbc;
-
-import java.sql.*;
-
-import cli.System.Data.*;
-import cli.System.Data.Odbc.*;
-
-/**
- * @author Volker Berlin
- */
-public class JdbcOdbcUpdateableResultSet extends JdbcOdbcDTResultSet{
-
-    private final OdbcDataAdapter da;
-
-    private final DataTable data;
-
-    private DataRow insertRow;
-
-
-    public JdbcOdbcUpdateableResultSet(OdbcCommand cmd){
-        this(new DataTable(), cmd);
-    }
-
-
-    private JdbcOdbcUpdateableResultSet(DataTable data, OdbcCommand cmd){
-        super(data, CONCUR_UPDATABLE);
-        this.data = data;
-        da = new OdbcDataAdapter(cmd);
-        da.Fill(data);
-        OdbcCommandBuilder cmdBldr = new OdbcCommandBuilder(da);
-        cmdBldr.GetUpdateCommand(); // throw an exception if update is not possible, we want a very early exception
-    }
-
-
-    @Override
-    protected DataRow getDataRow() throws SQLException{
-        if(insertRow != null){
-            return insertRow;
-        }
-        return super.getDataRow();
-    }
-
-
-    @Override
-    protected void setDataRow() throws SQLException{
-        insertRow = null;
-        super.setDataRow();
-    }
-
-
-    @Override
-    public void updateObject(int columnIndex, Object x, int scaleOrLength) throws SQLException{
-        try{
-            x = JdbcOdbcUtils.convertJava2Net(x, scaleOrLength);
-            getDataRow().set_Item(columnIndex - 1, x);
-        }catch(ArrayIndexOutOfBoundsException ex){
-            throw new SQLException("Invalid column number (" + columnIndex + "). A number between 1 and "
-                    + data.get_Columns().get_Count() + " is valid.", "S1002", ex);
-        }
-    }
-
-
-    @Override
-    public void updateRow() throws SQLException{
-        if(insertRow != null){
-            throw new SQLException("Cursor is on the insert row.");
-        }
-        try{
-            da.Update(data);
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    @Override
-    public void deleteRow() throws SQLException{
-        if(insertRow != null){
-            throw new SQLException("Cursor is on the insert row.");
-        }
-        try{
-            getDataRow().Delete(); // Delete the current row
-            da.Update(data);
-            setDataRow(); // set a new Current Row
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-    }
-
-
-    @Override
-    public void insertRow() throws SQLException{
-        if(insertRow == null){
-            throw new SQLException("Cursor is not on the insert row.");
-        }
-        try{
-            getRows().Add(insertRow);
-            insertRow = null;
-            da.Update(data);
-            last();
-        }catch(Throwable th){
-            throw JdbcOdbcUtils.createSQLException(th);
-        }
-
-    }
-
-
-    @Override
-    public void moveToInsertRow(){
-        insertRow = data.NewRow();
-    }
-
-
-    @Override
-    public void moveToCurrentRow(){
-        insertRow = null;
-    }
-
-
-    @Override
-    public void cancelRowUpdates() throws SQLException{
-        getDataRow().CancelEdit();
-    }
-
-
-    @Override
-    public boolean rowDeleted(){
-        return false;
-    }
-
-
-    @Override
-    public boolean rowInserted(){
-        return false;
-    }
-
-
-    @Override
-    public boolean rowUpdated(){
-        return false;
-    }
-}
diff --git a/openjdk/sun/jdbc/odbc/JdbcOdbcUtils.java b/openjdk/sun/jdbc/odbc/JdbcOdbcUtils.java
deleted file mode 100644
index c5497e30..00000000
--- a/openjdk/sun/jdbc/odbc/JdbcOdbcUtils.java
+++ /dev/null
@@ -1,372 +0,0 @@
-/*
-  Copyright (C) 2009, 2010 Volker Berlin (i-net software)
-  Copyright (C) 2011 Karsten Heinrich (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.jdbc.odbc;
-
-import ikvm.lang.CIL;
-
-import java.math.BigDecimal;
-import java.sql.*;
-import java.util.Calendar;
-import java.util.HashMap;
-
-import cli.System.DBNull;
-import cli.System.TimeSpan;
-import cli.System.Data.DbType;
-import cli.System.Data.Common.DbException;
-import cli.System.Data.Odbc.*;
-import cli.System.Globalization.CultureInfo;
-
-/**
- * @author Volker Berlin
- */
-public class JdbcOdbcUtils{
-
-    private static final HashMap<String, String> classNameMap = new HashMap<String, String>();
-    static{
-        classNameMap.put("System.String", "java.lang.String");
-        classNameMap.put("System.Int16", "java.lang.Short");
-        classNameMap.put("System.Int32", "java.lang.Integer");
-        classNameMap.put("System.Int64", "java.lang.Long");
-        classNameMap.put("System.Double", "java.lang.Double");
-        classNameMap.put("System.Decimal", "java.math.BigDecimal");
-        classNameMap.put("System.DateTime", "java.sql.Timestamp");
-        classNameMap.put("System.TimeSpan", "java.sql.Time");
-    }
-
-
-    /**
-     * Solve a mapping between .NET class names and the equivalent Java class names for
-     * ResultSetMetaData.getColumnClassName
-     * 
-     * @param netClassName
-     *            the .NET class name
-     * @return the Java class name
-     */
-    public static String getJavaClassName(String netClassName){
-        String javaClassName = classNameMap.get(netClassName);
-        if(javaClassName != null){
-            return javaClassName;
-        }
-        return "java.lang.Object";
-    }
-
-
-    /**
-     * Convert a .NET Object in the equals Java Object.
-     * 
-     * @param obj
-     *            the .NET Object
-     * @return a Java Object
-     */
-    public static java.lang.Object convertNet2Java(java.lang.Object obj){
-        if(obj instanceof cli.System.Int64){
-            return Long.valueOf(CIL.unbox_long(obj));
-        }
-        if(obj instanceof cli.System.Int32){
-            return Integer.valueOf(CIL.unbox_int(obj));
-        }
-        if(obj instanceof cli.System.Int16){
-            return Short.valueOf(CIL.unbox_short(obj));
-        }
-        if(obj instanceof cli.System.Byte){
-            return Byte.valueOf(CIL.unbox_byte(obj));
-        }
-        if(obj instanceof cli.System.Double){
-            return Double.valueOf(CIL.unbox_double(obj));
-        }
-        if(obj instanceof cli.System.Single){
-            return Float.valueOf(CIL.unbox_float(obj));
-        }
-        if(obj instanceof cli.System.Boolean){
-            return Boolean.valueOf(CIL.unbox_boolean(obj));
-        }
-        if(obj instanceof cli.System.Decimal){
-            return new BigDecimal(((cli.System.Decimal)obj).ToString(CultureInfo.get_InvariantCulture()));
-        }
-        if(obj instanceof cli.System.DateTime){
-        	return convertDateTimeToTimestamp((cli.System.DateTime)obj);
-        }
-        if(obj instanceof cli.System.TimeSpan){
-            cli.System.TimeSpan ts = (cli.System.TimeSpan)obj;
-            return new Time(ts.get_Hours(), ts.get_Minutes(), ts.get_Seconds());
-        }
-        if(obj instanceof cli.System.DBNull){
-            return null;
-        }
-        return obj;
-    }
-
-    /**
-     * Converts a .NET DateTime to a Timestamp in the current Timezone
-     * @param obj the dateTime
-     * @return the conveted time stamp
-     */
-	public static Timestamp convertDateTimeToTimestamp( cli.System.DateTime obj) {
-		long javaMillis = getJavaMillis(obj);
-		int seconds = (int)(javaMillis / 1000);
-		int nanos = (int)((javaMillis % 1000) * 1000000);
-		return new Timestamp( 70, 0, 1, 0, 0, seconds, nanos );
-	}
-
-
-    /**
-     * Convert a Java Object in the equals .NET Object.
-     * 
-     * @param obj
-     *            Java Object
-     * @param length
-     *            the length of data if obj is a stream
-     * @return .NET Object
-     */
-    public static Object convertJava2Net(Object obj, int length){
-        // TODO use the length with streams
-        return convertJava2Net(obj);
-    }
-
-
-    /**
-     * Convert a Java Object in the equals .NET Object.
-     * 
-     * @param obj
-     *            Java Object
-     * @return a .NET Object
-     */
-    public static Object convertJava2Net(Object obj){
-        if(obj == null){
-            return DBNull.Value;
-        }
-        if(obj instanceof Double){
-            return CIL.box_double(((Double)obj).doubleValue());
-        }
-        if(obj instanceof Float){
-            return CIL.box_float(((Float)obj).floatValue());
-        }
-        if(obj instanceof Long){
-            return CIL.box_long(((Long)obj).longValue());
-        }
-        if(obj instanceof Integer){
-            return CIL.box_int(((Integer)obj).intValue());
-        }
-        if(obj instanceof Short){
-            return CIL.box_short(((Short)obj).shortValue());
-        }
-        if(obj instanceof Byte){
-            return CIL.box_byte(((Byte)obj).byteValue());
-        }
-        if(obj instanceof Boolean){
-            return CIL.box_boolean(((Boolean)obj).booleanValue());
-        }
-        if(obj instanceof Time){
-            Time ts = (Time)obj;
-            return new TimeSpan(ts.getHours(), ts.getMinutes(), ts.getSeconds());
-        }
-        if(obj instanceof java.util.Date){
-            long ticks = getNetTicks((java.util.Date)obj);
-            return new cli.System.DateTime(ticks);
-        }
-        if(obj instanceof BigDecimal){
-            return cli.System.Decimal.Parse(obj.toString(), CultureInfo.get_InvariantCulture());
-        }
-        return obj;
-    }
-
-
-    /**
-     * Get the milliseconds in the Java range from a .NET DateTime object.
-     * 
-     * @param dt
-     *            the DateTime object
-     * @return the milliseconds since 1970-01-01
-     */
-    public static long getJavaMillis(cli.System.DateTime dt){
-        // calculation copied from System.currentTimeMillis()
-        long january_1st_1970 = 62135596800000L;
-        return dt.get_Ticks() / 10000L - january_1st_1970;
-    }
-
-
-    /**
-     * Get the ticks for a System.DateTime from a java.util.Date
-     * 
-     * @param date
-     *            the java.util.Date
-     * @return ticks
-     */
-    public static long getNetTicks(java.util.Date date){
-        // inverse from getJavaMillis
-        long january_1st_1970 = 62135596800000L;
-        return (date.getTime() + january_1st_1970) * 10000L;
-    }
-
-
-    /**
-     * Convert a local (current default) Date to a Date in the time zone of the given calendar. Do nothing if date or
-     * calendar is null.
-     * 
-     * @param date
-     *            the converting Date
-     * @param cal
-     *            the Calendar with the time zone
-     */
-    public static void convertLocalToCalendarDate(java.util.Date date, Calendar cal){
-        if(date == null || cal == null){
-            return;
-        }
-        cal.set(date.getYear() + 1900, date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date
-                .getSeconds());
-        long millis = cal.getTimeInMillis() / 1000 * 1000 + date.getTime() % 1000;
-        date.setTime(millis);
-    }
-
-
-    /**
-     * Convert a Date in the calendar time zone to a date in the local (current default) time zone. Do nothing if date
-     * or calendar is null.
-     * 
-     * @param date
-     * @param cal
-     */
-    public static void convertCalendarToLocalDate(java.util.Date date, Calendar cal){
-        if(date == null || cal == null){
-            return;
-        }
-        cal.setTimeInMillis(date.getTime());
-        date.setYear(cal.get(Calendar.YEAR) - 1900);
-        date.setMonth(cal.get(Calendar.MONTH));
-        date.setDate(cal.get(Calendar.DAY_OF_MONTH));
-        date.setHours(cal.get(Calendar.HOUR_OF_DAY));
-        date.setMinutes(cal.get(Calendar.MINUTE));
-        date.setSeconds(cal.get(Calendar.SECOND));
-    }
-
-
-    /**
-     * The only valid Exception for JDBC is a SQLException. Here we create one based on the real exception.
-     * 
-     * @param th
-     *            any Throwable that occur
-     * @return a SQLException, never null
-     */
-    public static SQLException createSQLException(Throwable th){
-        if(th instanceof SQLException){
-            return (SQLException)th;
-        }
-        if(th instanceof OdbcException){
-            SQLException sqlEx = null;
-            OdbcErrorCollection errors = ((OdbcException)th).get_Errors();
-            for(int e = 0; e < errors.get_Count(); e++){
-                OdbcError err = errors.get_Item(e);
-                SQLException newEx = new SQLException(err.get_Message(), err.get_SQLState(), err.get_NativeError());
-                if(sqlEx == null){
-                    sqlEx = newEx;
-                }else{
-                    sqlEx.setNextException(newEx);
-                }
-            }
-            if(sqlEx != null){
-                sqlEx.initCause(th);
-                return sqlEx;
-            }
-        }
-        if(th instanceof DbException){
-            DbException dbEx = (DbException)th;
-            return new SQLException(dbEx.get_Message(), "S1000", dbEx.get_ErrorCode(), th);
-        }
-        return new SQLException(th);
-    }
-
-
-    /**
-     * Convert a value from java.sql.Types to a value from to a System.Data.DbType
-     * 
-     * @param type
-     *            a JDBC type
-     * @return a ADO.NET type
-     * @throws SQLException
-     *             if the type can not be converted
-     */
-    public static int convertJdbc2AdoNetType(int type) throws SQLException{
-        switch(type){
-            case Types.BIGINT:
-                return DbType.Int64;
-            case Types.BINARY:
-            case Types.BLOB:
-            case Types.LONGVARBINARY:
-            case Types.VARBINARY:
-                return DbType.Binary;
-            case Types.BIT:
-            case Types.BOOLEAN:
-                return DbType.Boolean;
-            case Types.CHAR:
-                return DbType.AnsiStringFixedLength;
-            case Types.CLOB:
-            case Types.DATALINK:
-            case Types.LONGVARCHAR:
-            case Types.NULL: // we hope that the DBMS can map any NULL values from VARCHAR
-            case Types.VARCHAR:
-                return DbType.AnsiString;
-            case Types.DATE:
-                return DbType.Date;
-            case Types.DECIMAL:
-            case Types.NUMERIC:
-                return DbType.Decimal;
-            case Types.DOUBLE:
-                return DbType.Double;
-            case Types.FLOAT:
-            case Types.REAL:
-                return DbType.Single;
-            case Types.INTEGER:
-                return DbType.Int32;
-            case Types.JAVA_OBJECT:
-                return DbType.Object;
-            case Types.LONGNVARCHAR:
-            case Types.NCLOB:
-            case Types.NVARCHAR:
-                return DbType.String;
-            case Types.NCHAR:
-                return DbType.StringFixedLength;
-            case Types.ROWID:
-                return DbType.Guid;
-            case Types.SMALLINT:
-                return DbType.Int16;
-            case Types.SQLXML:
-                return DbType.Xml;
-            case Types.TIME:
-                return DbType.Time;
-            case Types.TIMESTAMP:
-                return DbType.DateTime;
-            case Types.TINYINT:
-                return DbType.Byte;
-            case Types.ARRAY:
-            case Types.DISTINCT:
-            case Types.OTHER:
-            case Types.REF:
-            case Types.STRUCT:
-                break;
-
-        }
-        throw new SQLException("Not supported JDBC type:" + type);
-    }
-}
diff --git a/openjdk/sun/management/ManagementFactoryHelper.java b/openjdk/sun/management/ManagementFactoryHelper.java
deleted file mode 100644
index 0e54032d..00000000
--- a/openjdk/sun/management/ManagementFactoryHelper.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.management;
-
-import java.lang.management.*;
-
-import javax.management.InstanceAlreadyExistsException;
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanServer;
-import javax.management.MBeanRegistrationException;
-import javax.management.NotCompliantMBeanException;
-import javax.management.ObjectName;
-import javax.management.RuntimeOperationsException;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import sun.security.action.LoadLibraryAction;
-
-import sun.util.logging.LoggingSupport;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import com.sun.management.OSMBeanFactory;
-
-import static java.lang.management.ManagementFactory.*;
-
-/**
- * ManagementFactoryHelper provides static factory methods to create
- * instances of the management interface.
- */
-public class ManagementFactoryHelper {
-    private ManagementFactoryHelper() {};
-
-    private static VMManagement jvm;
-
-    private static ClassLoadingImpl    classMBean = null;
-    private static MemoryImpl          memoryMBean = null;
-    private static ThreadImpl          threadMBean = null;
-    private static RuntimeImpl         runtimeMBean = null;
-    private static CompilationImpl     compileMBean = null;
-    private static OperatingSystemImpl osMBean = null;
-
-    public static synchronized ClassLoadingMXBean getClassLoadingMXBean() {
-        if (classMBean == null) {
-            classMBean = new ClassLoadingImpl(jvm);
-        }
-        return classMBean;
-    }
-
-    public static synchronized MemoryMXBean getMemoryMXBean() {
-        if (memoryMBean == null) {
-            memoryMBean = new MemoryImpl(jvm);
-        }
-        return memoryMBean;
-    }
-
-    public static synchronized ThreadMXBean getThreadMXBean() {
-        if (threadMBean == null) {
-            threadMBean = new ThreadImpl(jvm);
-        }
-        return threadMBean;
-    }
-
-    public static synchronized RuntimeMXBean getRuntimeMXBean() {
-        if (runtimeMBean == null) {
-            runtimeMBean = new RuntimeImpl(jvm);
-        }
-        return runtimeMBean;
-    }
-
-    public static synchronized CompilationMXBean getCompilationMXBean() {
-        if (compileMBean == null && jvm.getCompilerName() != null) {
-            compileMBean = new CompilationImpl(jvm);
-        }
-        return compileMBean;
-    }
-
-    public static synchronized OperatingSystemMXBean getOperatingSystemMXBean() {
-        if (osMBean == null) {
-            osMBean = (OperatingSystemImpl)
-                          OSMBeanFactory.getOperatingSystemMXBean(jvm);
-        }
-        return osMBean;
-    }
-
-    public static List<MemoryPoolMXBean> getMemoryPoolMXBeans() {
-        MemoryPoolMXBean[] pools = MemoryImpl.getMemoryPools();
-        List<MemoryPoolMXBean> list = new ArrayList<MemoryPoolMXBean>(pools.length);
-        for (MemoryPoolMXBean p : pools) {
-            list.add(p);
-        }
-        return list;
-    }
-
-    public static List<MemoryManagerMXBean> getMemoryManagerMXBeans() {
-        MemoryManagerMXBean[]  mgrs = MemoryImpl.getMemoryManagers();
-        List<MemoryManagerMXBean> result = new ArrayList<MemoryManagerMXBean>(mgrs.length);
-        for (MemoryManagerMXBean m : mgrs) {
-            result.add(m);
-        }
-        return result;
-    }
-
-    public static List<GarbageCollectorMXBean> getGarbageCollectorMXBeans() {
-        MemoryManagerMXBean[]  mgrs = MemoryImpl.getMemoryManagers();
-        List<GarbageCollectorMXBean> result = new ArrayList<GarbageCollectorMXBean>(mgrs.length);
-        for (MemoryManagerMXBean m : mgrs) {
-            if (GarbageCollectorMXBean.class.isInstance(m)) {
-                 result.add(GarbageCollectorMXBean.class.cast(m));
-            }
-        }
-        return result;
-    }
-
-    public static PlatformLoggingMXBean getPlatformLoggingMXBean() {
-        if (LoggingSupport.isAvailable()) {
-            return PlatformLoggingImpl.instance;
-        } else {
-            return null;
-        }
-    }
-
-    // The logging MXBean object is an instance of
-    // PlatformLoggingMXBean and java.util.logging.LoggingMXBean
-    // but it can't directly implement two MXBean interfaces
-    // as a compliant MXBean implements exactly one MXBean interface,
-    // or if it implements one interface that is a subinterface of
-    // all the others; otherwise, it is a non-compliant MXBean
-    // and MBeanServer will throw NotCompliantMBeanException.
-    // See the Definition of an MXBean section in javax.management.MXBean spec.
-    //
-    // To create a compliant logging MXBean, define a LoggingMXBean interface
-    // that extend PlatformLoggingMXBean and j.u.l.LoggingMXBean
-    interface LoggingMXBean
-        extends PlatformLoggingMXBean, java.util.logging.LoggingMXBean {
-    }
-
-    static class PlatformLoggingImpl implements LoggingMXBean
-    {
-        final static PlatformLoggingMXBean instance = new PlatformLoggingImpl();
-        final static String LOGGING_MXBEAN_NAME = "java.util.logging:type=Logging";
-
-        private volatile ObjectName objname;  // created lazily
-        @Override
-        public ObjectName getObjectName() {
-            ObjectName result = objname;
-            if (result == null) {
-                synchronized (this) {
-                    result = objname;
-                    if (result == null) {
-                        result = Util.newObjectName(LOGGING_MXBEAN_NAME);
-                        objname = result;
-                    }
-                }
-            }
-            return result;
-        }
-
-        @Override
-        public java.util.List<String> getLoggerNames() {
-            return LoggingSupport.getLoggerNames();
-        }
-
-        @Override
-        public String getLoggerLevel(String loggerName) {
-            return LoggingSupport.getLoggerLevel(loggerName);
-        }
-
-        @Override
-        public void setLoggerLevel(String loggerName, String levelName) {
-            LoggingSupport.setLoggerLevel(loggerName, levelName);
-        }
-
-        @Override
-        public String getParentLoggerName(String loggerName) {
-            return LoggingSupport.getParentLoggerName(loggerName);
-        }
-    }
-
-    private static List<BufferPoolMXBean> bufferPools = null;
-    public static synchronized List<BufferPoolMXBean> getBufferPoolMXBeans() {
-        if (bufferPools == null) {
-            bufferPools = new ArrayList<>(2);
-            bufferPools.add(createBufferPoolMXBean(sun.misc.SharedSecrets.getJavaNioAccess()
-                .getDirectBufferPool()));
-            bufferPools.add(createBufferPoolMXBean(sun.nio.ch.FileChannelImpl
-                .getMappedBufferPool()));
-        }
-        return bufferPools;
-    }
-
-    private final static String BUFFER_POOL_MXBEAN_NAME = "java.nio:type=BufferPool";
-
-    /**
-     * Creates management interface for the given buffer pool.
-     */
-    private static BufferPoolMXBean
-        createBufferPoolMXBean(final sun.misc.JavaNioAccess.BufferPool pool)
-    {
-        return new BufferPoolMXBean() {
-            private volatile ObjectName objname;  // created lazily
-            @Override
-            public ObjectName getObjectName() {
-                ObjectName result = objname;
-                if (result == null) {
-                    synchronized (this) {
-                        result = objname;
-                        if (result == null) {
-                            result = Util.newObjectName(BUFFER_POOL_MXBEAN_NAME +
-                                ",name=" + pool.getName());
-                            objname = result;
-                        }
-                    }
-                }
-                return result;
-            }
-            @Override
-            public String getName() {
-                return pool.getName();
-            }
-            @Override
-            public long getCount() {
-                return pool.getCount();
-            }
-            @Override
-            public long getTotalCapacity() {
-                return pool.getTotalCapacity();
-            }
-            @Override
-            public long getMemoryUsed() {
-                return pool.getMemoryUsed();
-            }
-        };
-    }
-
-    /**
-     * Registers a given MBean if not registered in the MBeanServer;
-     * otherwise, just return.
-     */
-    private static void addMBean(MBeanServer mbs, Object mbean, String mbeanName) {
-        try {
-            final ObjectName objName = Util.newObjectName(mbeanName);
-
-            // inner class requires these fields to be final
-            final MBeanServer mbs0 = mbs;
-            final Object mbean0 = mbean;
-            AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
-                public Void run() throws MBeanRegistrationException,
-                                         NotCompliantMBeanException {
-                    try {
-                        mbs0.registerMBean(mbean0, objName);
-                        return null;
-                    } catch (InstanceAlreadyExistsException e) {
-                        // if an instance with the object name exists in
-                        // the MBeanServer ignore the exception
-                    }
-                    return null;
-                }
-            });
-        } catch (PrivilegedActionException e) {
-            throw Util.newException(e.getException());
-        }
-    }
-
-    static void registerInternalMBeans(MBeanServer mbs) {
-    }
-
-    static void unregisterInternalMBeans(MBeanServer mbs) {
-    }
-
-    static {
-        jvm = new VMManagementImpl();
-    }
-
-    public static boolean isThreadSuspended(int state) {
-        return ((state & JMM_THREAD_STATE_FLAG_SUSPENDED) != 0);
-    }
-
-    public static boolean isThreadRunningNative(int state) {
-        return ((state & JMM_THREAD_STATE_FLAG_NATIVE) != 0);
-    }
-
-    public static Thread.State toThreadState(int state) {
-        // suspended and native bits may be set in state
-        int threadStatus = state & ~JMM_THREAD_STATE_FLAG_MASK;
-        return sun.misc.VM.toThreadState(threadStatus);
-    }
-
-    // These values are defined in jmm.h
-    private static final int JMM_THREAD_STATE_FLAG_MASK = 0xFFF00000;
-    private static final int JMM_THREAD_STATE_FLAG_SUSPENDED = 0x00100000;
-    private static final int JMM_THREAD_STATE_FLAG_NATIVE = 0x00400000;
-
-}
diff --git a/openjdk/sun/management/VMManagementImpl.java b/openjdk/sun/management/VMManagementImpl.java
deleted file mode 100644
index 351cf435..00000000
--- a/openjdk/sun/management/VMManagementImpl.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.management;
-
-import sun.misc.Perf;
-import sun.management.counter.*;
-import java.nio.ByteBuffer;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.List;
-import java.util.Arrays;
-import java.util.Collections;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import sun.security.action.GetPropertyAction;
-
-/**
- * Implementation of VMManagement interface that accesses the management
- * attributes and operations locally within the same Java virtual
- * machine.
- */
-class VMManagementImpl implements VMManagement {
-
-    private static String version = "1.2";
-
-    private static boolean compTimeMonitoringSupport;
-    private static boolean threadContentionMonitoringSupport;
-    private static boolean currentThreadCpuTimeSupport;
-    private static boolean otherThreadCpuTimeSupport;
-    private static boolean bootClassPathSupport;
-    private static boolean objectMonitorUsageSupport;
-    private static boolean synchronizerUsageSupport;
-    private static boolean threadAllocatedMemorySupport;
-    private static boolean gcNotificationSupport;
-
-    // Optional supports
-    public boolean isCompilationTimeMonitoringSupported() {
-        return compTimeMonitoringSupport;
-    }
-
-    public boolean isThreadContentionMonitoringSupported() {
-        return threadContentionMonitoringSupport;
-    }
-
-    public boolean isCurrentThreadCpuTimeSupported() {
-        return currentThreadCpuTimeSupport;
-    }
-
-    public boolean isOtherThreadCpuTimeSupported() {
-        return otherThreadCpuTimeSupport;
-    }
-
-    public boolean isBootClassPathSupported() {
-        return bootClassPathSupport;
-    }
-
-    public boolean isObjectMonitorUsageSupported() {
-        return objectMonitorUsageSupport;
-    }
-
-    public boolean isSynchronizerUsageSupported() {
-        return synchronizerUsageSupport;
-    }
-
-    public boolean isThreadAllocatedMemorySupported() {
-        return threadAllocatedMemorySupport;
-    }
-
-    public boolean isGcNotificationSupported() {
-        return gcNotificationSupport;
-    }
-
-    public boolean isThreadContentionMonitoringEnabled() {
-        return false;
-    }
-
-    public boolean isThreadCpuTimeEnabled() {
-        return false;
-    }
-
-    public boolean isThreadAllocatedMemoryEnabled() {
-        return false;
-    }
-
-    // Class Loading Subsystem
-    public int    getLoadedClassCount() {
-        long count = getTotalClassCount() - getUnloadedClassCount();
-        return (int) count;
-    }
-    public long getTotalClassCount() {
-        throw new Error("Not implemented");
-    }
-    public long getUnloadedClassCount() {
-        throw new Error("Not implemented");
-    }
-
-    public boolean getVerboseClass() {
-        return false;
-    }
-
-    // Memory Subsystem
-    public boolean getVerboseGC() {
-        return false;
-    }
-
-    // Runtime Subsystem
-    public String   getManagementVersion() {
-        return version;
-    }
-
-    public String getVmId() {
-        int pid = getProcessId();
-        String hostname = "localhost";
-        try {
-            hostname = InetAddress.getLocalHost().getHostName();
-        } catch (UnknownHostException e) {
-            // ignore
-        }
-
-        return pid + "@" + hostname;
-    }
-    private int getProcessId() {
-        return cli.System.Diagnostics.Process.GetCurrentProcess().get_Id();
-    }
-
-    public String   getVmName() {
-        return System.getProperty("java.vm.name");
-    }
-
-    public String   getVmVendor() {
-        return System.getProperty("java.vm.vendor");
-    }
-    public String   getVmVersion() {
-        return System.getProperty("java.vm.version");
-    }
-    public String   getVmSpecName()  {
-        return System.getProperty("java.vm.specification.name");
-    }
-    public String   getVmSpecVendor() {
-        return System.getProperty("java.vm.specification.vendor");
-    }
-    public String   getVmSpecVersion() {
-        return System.getProperty("java.vm.specification.version");
-    }
-    public String   getClassPath() {
-        return System.getProperty("java.class.path");
-    }
-    public String   getLibraryPath()  {
-        return System.getProperty("java.library.path");
-    }
-
-    public String   getBootClassPath( ) {
-        PrivilegedAction<String> pa
-            = new GetPropertyAction("sun.boot.class.path");
-        String result =  AccessController.doPrivileged(pa);
-        return result;
-    }
-
-    private List<String> vmArgs = null;
-    public synchronized List<String> getVmArguments() {
-        if (vmArgs == null) {
-            String[] args = getVmArguments0();
-            List<String> l = ((args != null && args.length != 0) ? Arrays.asList(args) :
-                                        Collections.<String>emptyList());
-            vmArgs = Collections.unmodifiableList(l);
-        }
-        return vmArgs;
-    }
-    public String[] getVmArguments0() {
-        return new String[0];
-    }
-
-    public long getStartupTime() {
-        return (long)(cli.System.Diagnostics.Process.GetCurrentProcess().get_StartTime().ToUniversalTime().Subtract(new cli.System.DateTime(1970, 1, 1))).get_TotalMilliseconds();
-    }
-    public int getAvailableProcessors() {
-        return cli.System.Environment.get_ProcessorCount();
-    }
-
-    // Compilation Subsystem
-    public String   getCompilerName() {
-        String name =  AccessController.doPrivileged(
-            new PrivilegedAction<String>() {
-                public String run() {
-                    return System.getProperty("sun.management.compiler");
-                }
-            });
-        return name;
-    }
-    public long getTotalCompileTime() {
-        throw new Error("Not implemented");
-    }
-
-    // Thread Subsystem
-    public long getTotalThreadCount() {
-        throw new Error("Not implemented");
-    }
-    public int  getLiveThreadCount() {
-        throw new Error("Not implemented");
-    }
-    public int  getPeakThreadCount() {
-        throw new Error("Not implemented");
-    }
-    public int  getDaemonThreadCount() {
-        throw new Error("Not implemented");
-    }
-
-    // Operating System
-    public String getOsName() {
-        return System.getProperty("os.name");
-    }
-    public String getOsArch() {
-        return System.getProperty("os.arch");
-    }
-    public String getOsVersion() {
-        return System.getProperty("os.version");
-    }
-
-    // Hotspot-specific runtime support
-    public long getSafepointCount() {
-        throw new Error("Not implemented");
-    }
-    public long getTotalSafepointTime() {
-        throw new Error("Not implemented");
-    }
-    public long getSafepointSyncTime() {
-        throw new Error("Not implemented");
-    }
-    public long getTotalApplicationNonStoppedTime() {
-        throw new Error("Not implemented");
-    }
-
-    public long getLoadedClassSize() {
-        throw new Error("Not implemented");
-    }
-    public long getUnloadedClassSize() {
-        throw new Error("Not implemented");
-    }
-    public long getClassLoadingTime() {
-        throw new Error("Not implemented");
-    }
-    public long getMethodDataSize() {
-        throw new Error("Not implemented");
-    }
-    public long getInitializedClassCount() {
-        throw new Error("Not implemented");
-    }
-    public long getClassInitializationTime() {
-        throw new Error("Not implemented");
-    }
-    public long getClassVerificationTime() {
-        throw new Error("Not implemented");
-    }
-
-    public List<Counter> getInternalCounters(String pattern) {
-        return Collections.emptyList();
-    }
-}
diff --git a/openjdk/sun/misc/FileURLMapper.java b/openjdk/sun/misc/FileURLMapper.java
deleted file mode 100644
index 3fd43e4f..00000000
--- a/openjdk/sun/misc/FileURLMapper.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*IKVM*/
-/*
- * Modified for IKVM by Jeroen Frijters on May 22, 2007.
- * 
- * This is a merged version of the Windows & Solaris platform specific versions.
- * Since the IKVM class library binary can be used both on Windows and on *nix,
- * I've merged the platform specific classes into a generic class that at
- * runtime determines if it runs on Windows or not.
- * 
-/*IKVM*/
-
-package sun.misc;
-
-import java.net.URL;
-import java.io.File;
-import sun.net.www.ParseUtil;
-
-/**
- * Platform specific handling for file: URLs . In particular deals
- * with network paths mapping them to UNCs.
- *
- * @author      Michael McMahon
- * @version     1.10, 07/05/05
- */
-
-public class FileURLMapper {
-    private static final boolean runningOnWindows = cli.System.Environment.get_OSVersion().ToString().indexOf("Unix") == -1;
-    URL url;
-    String file;
-
-    public FileURLMapper (URL url) {
-        this.url = url;
-    }
-
-    /**
-     * @returns the platform specific path corresponding to the URL, and in particular
-     *  returns a UNC when the authority contains a hostname
-     */
-
-    public String getPath () {
-        if (file != null) {
-            return file;
-        }
-        if (runningOnWindows) {
-            String host = url.getHost();
-            if (host != null && !host.equals("") &&
-                !"localhost".equalsIgnoreCase(host)) {
-                String rest = url.getFile();
-                String s = host + ParseUtil.decode (url.getFile());
-                file = "\\\\"+ s.replace('/', '\\');
-                return file;
-            }
-            String path = url.getFile().replace('/', '\\');
-            file = ParseUtil.decode(path);
-            return file;
-        } else {
-            String host = url.getHost();
-            if (host == null || "".equals(host) || "localhost".equalsIgnoreCase (host)) {
-                file = url.getFile();
-                file = ParseUtil.decode (file);
-            }
-            return file;
-        }
-    }
-
-    public boolean exists() {
-        String path = getPath();
-        if (path == null) {
-            return false;
-        }
-        File f = new File (path);
-        return f.exists();
-    }
-}
diff --git a/openjdk/sun/misc/IoTrace.java b/openjdk/sun/misc/IoTrace.java
deleted file mode 100644
index ab15ed16..00000000
--- a/openjdk/sun/misc/IoTrace.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.misc;
-
-import java.net.InetAddress;
-
-/**
- * Utility class used to identify trace points for I/O calls.
- * <p>
- * To use this class, a diagnostic tool must redefine this class with a version
- * that contains calls to the the diagnostic tool. This implementation will then
- * receive callbacks when file and socket operations are performed. The reason
- * for requiring a redefine of the class is to avoid any overhead caused by the
- * instrumentation.
- * <p>
- * The xxBegin() methods return a "context". This can be any Object. This
- * context will be passed to the corresponding xxEnd() method. This way, an
- * implementation can correlate the beginning of an operation with the end.
- * <p>
- * It is possible for a xxEnd() method to be called with a null handle. This
- * happens if tracing was started between the call to xxBegin() and xxEnd(), in
- * which case xxBegin() would not have been called. It is the implementation's
- * responsibility to not throw an exception in this case.
- * <p>
- * Only blocking I/O operations are identified with this facility.
- * <p>
- * <b>Warning</b>
- * <p>
- * These methods are called from sensitive points in the I/O subsystem. Great
- * care must be taken to not interfere with ongoing operations or cause
- * deadlocks. In particular:
- * <ul>
- * <li>Implementations must not throw exceptions since this will cause
- * disruptions to the I/O operations.
- * <li>Implementations must not do I/O operations since this will lead to an
- * endless loop.
- * <li>Since the hooks may be called while holding low-level locks in the I/O
- * subsystem, implementations must be careful with synchronization or
- * interaction with other threads to avoid deadlocks in the VM.
- * </ul>
- */
-public final class IoTrace {
-    private IoTrace() {
-    }
-
-    /**
-     * Called before data is read from a socket.
-     *
-     * @return a context object
-     */
-    public static Object socketReadBegin() {
-        return null;
-    }
-
-    /**
-     * Called after data is read from the socket.
-     *
-     * @param context
-     *            the context returned by the previous call to socketReadBegin()
-     * @param address
-     *            the remote address the socket is bound to
-     * @param port
-     *            the remote port the socket is bound to
-     * @param timeout
-     *            the SO_TIMEOUT value of the socket (in milliseconds) or 0 if
-     *            there is no timeout set
-     * @param bytesRead
-     *            the number of bytes read from the socket, 0 if there was an
-     *            error reading from the socket
-     */
-    public static void socketReadEnd(Object context, InetAddress address, int port,
-                                     int timeout, long bytesRead) {
-    }
-
-    /**
-     * Called before data is written to a socket.
-     *
-     * @return a context object
-     */
-    public static Object socketWriteBegin() {
-        return null;
-    }
-
-    /**
-     * Called after data is written to a socket.
-     *
-     * @param context
-     *            the context returned by the previous call to
-     *            socketWriteBegin()
-     * @param address
-     *            the remote address the socket is bound to
-     * @param port
-     *            the remote port the socket is bound to
-     * @param bytesWritten
-     *            the number of bytes written to the socket, 0 if there was an
-     *            error writing to the socket
-     */
-    public static void socketWriteEnd(Object context, InetAddress address, int port,
-                                      long bytesWritten) {
-    }
-
-    /**
-     * Called before data is read from a file.
-     *
-     * @param path
-     *            the path of the file
-     * @return a context object
-     */
-    public static Object fileReadBegin(String path) {
-        return null;
-    }
-
-    /**
-     * Called after data is read from a file.
-     *
-     * @param context
-     *            the context returned by the previous call to fileReadBegin()
-     * @param bytesRead
-     *            the number of bytes written to the file, 0 if there was an
-     *            error writing to the file
-     */
-    public static void fileReadEnd(Object context, long bytesRead) {
-    }
-
-    /**
-     * Called before data is written to a file.
-     *
-     * @param path
-     *            the path of the file
-     * @return a context object
-     */
-    public static Object fileWriteBegin(String path) {
-        return null;
-    }
-
-    /**
-     * Called after data is written to a file.
-     *
-     * @param context
-     *            the context returned by the previous call to fileReadBegin()
-     * @param bytesWritten
-     *            the number of bytes written to the file, 0 if there was an
-     *            error writing to the file
-     */
-    public static void fileWriteEnd(Object context, long bytesWritten) {
-    }
-}
diff --git a/openjdk/sun/misc/JavaAWTAccess.java b/openjdk/sun/misc/JavaAWTAccess.java
deleted file mode 100644
index 462eb9ab..00000000
--- a/openjdk/sun/misc/JavaAWTAccess.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.misc;
-
-public interface JavaAWTAccess {
-    public Object getContext();
-    public Object getExecutionContext();
-
-    public Object get(Object context, Object key);
-    public void put(Object context, Object key, Object value);
-    public void remove(Object context, Object key);
-
-    // convenience methods whose context is the object returned by getContext()
-    public Object get(Object key);
-    public void put(Object key, Object value);
-    public void remove(Object key);
-    public boolean isDisposed();
-    public boolean isMainAppContext();
-}
diff --git a/openjdk/sun/misc/MiscHelper.java b/openjdk/sun/misc/MiscHelper.java
deleted file mode 100644
index da8aae29..00000000
--- a/openjdk/sun/misc/MiscHelper.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-  Copyright (C) 2007 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-package sun.misc;
-
-import cli.System.Reflection.Assembly;
-import java.io.IOException;
-
-class MiscHelper
-{
-    // map.xml replaces ExtClassLoader.getExtClassLoader() invocation in Launcher constructor with a call to this method
-    static Launcher.ExtClassLoader getExtClassLoader() throws IOException
-    {
-        if ("".equals(System.getProperty("java.ext.dirs")) && "".equals(System.getProperty("java.class.path")))
-        {
-            return null;
-        }
-        return Launcher.ExtClassLoader.getExtClassLoader();
-    }
-
-    // map.xml replaces AppClassLoader.getAppClassLoader() invocation in Launcher constructor with a call to this method
-    static ClassLoader getAppClassLoader(ClassLoader extcl) throws IOException
-    {
-        Assembly entryAssembly = Assembly.GetEntryAssembly();
-        if (entryAssembly != null)
-        {
-            ClassLoader acl = getAssemblyClassLoader(entryAssembly, extcl);
-            if (acl != null)
-            {
-                // assembly has a custom assembly class loader,
-                // that overrides the Launcher.AppClassLoader
-                return acl;
-            }
-        }
-        return Launcher.AppClassLoader.getAppClassLoader(extcl);
-    }
-
-    private static native ClassLoader getAssemblyClassLoader(Assembly asm, ClassLoader extcl);
-}
diff --git a/openjdk/sun/misc/OSEnvironment.java b/openjdk/sun/misc/OSEnvironment.java
deleted file mode 100644
index d51ac0f1..00000000
--- a/openjdk/sun/misc/OSEnvironment.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-  Copyright (C) 2007 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-
-package sun.misc;
-
-public class OSEnvironment
-{
-    public static void initialize()
-    {
-    }
-}
diff --git a/openjdk/sun/misc/SharedSecrets.java b/openjdk/sun/misc/SharedSecrets.java
deleted file mode 100644
index 172c4c58..00000000
--- a/openjdk/sun/misc/SharedSecrets.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.misc;
-
-import java.util.jar.JarFile;
-import java.io.Console;
-import java.security.ProtectionDomain;
-import javax.security.auth.kerberos.KeyTab;
-
-import java.security.AccessController;
-
-/** A repository of "shared secrets", which are a mechanism for
-    calling implementation-private methods in another package without
-    using reflection. A package-private class implements a public
-    interface and provides the ability to call package-private methods
-    within that package; the object implementing that interface is
-    provided through a third package to which access is restricted.
-    This framework avoids the primary disadvantage of using reflection
-    for this purpose, namely the loss of compile-time checking. */
-
-public class SharedSecrets {
-    private static final Unsafe unsafe = Unsafe.getUnsafe();
-    private static JavaUtilJarAccess javaUtilJarAccess;
-    private static JavaLangAccess javaLangAccess = LangHelper.getJavaLangAccess();
-    private static JavaIOAccess javaIOAccess;
-    private static JavaNetAccess javaNetAccess;
-    private static JavaNetHttpCookieAccess javaNetHttpCookieAccess;
-    private static JavaNioAccess javaNioAccess;
-    private static JavaSecurityProtectionDomainAccess javaSecurityProtectionDomainAccess;
-    private static JavaSecurityAccess javaSecurityAccess;
-    private static JavaxSecurityAuthKerberosAccess javaxSecurityAuthKerberosAccess;
-    private static JavaAWTAccess javaAWTAccess;
-
-    public static JavaUtilJarAccess javaUtilJarAccess() {
-        if (javaUtilJarAccess == null) {
-            // Ensure JarFile is initialized; we know that that class
-            // provides the shared secret
-            unsafe.ensureClassInitialized(JarFile.class);
-        }
-        return javaUtilJarAccess;
-    }
-
-    public static void setJavaUtilJarAccess(JavaUtilJarAccess access) {
-        javaUtilJarAccess = access;
-    }
-
-    public static JavaLangAccess getJavaLangAccess() {
-        return javaLangAccess;
-    }
-
-    public static void setJavaNetAccess(JavaNetAccess jna) {
-        javaNetAccess = jna;
-    }
-
-    public static JavaNetAccess getJavaNetAccess() {
-        return javaNetAccess;
-    }
-
-    public static void setJavaNetHttpCookieAccess(JavaNetHttpCookieAccess a) {
-        javaNetHttpCookieAccess = a;
-    }
-
-    public static JavaNetHttpCookieAccess getJavaNetHttpCookieAccess() {
-        if (javaNetHttpCookieAccess == null)
-            unsafe.ensureClassInitialized(java.net.HttpCookie.class);
-        return javaNetHttpCookieAccess;
-    }
-
-    public static void setJavaNioAccess(JavaNioAccess jna) {
-        javaNioAccess = jna;
-    }
-
-    public static JavaNioAccess getJavaNioAccess() {
-        if (javaNioAccess == null) {
-            // [IKVM] OpenJDK initializes java.nio.ByteOrder here, but that doesn't work
-            java.nio.ByteOrder.nativeOrder();
-        }
-        return javaNioAccess;
-    }
-
-    public static void setJavaIOAccess(JavaIOAccess jia) {
-        javaIOAccess = jia;
-    }
-
-    public static JavaIOAccess getJavaIOAccess() {
-        if (javaIOAccess == null) {
-            unsafe.ensureClassInitialized(Console.class);
-        }
-        return javaIOAccess;
-    }
-
-    public static void setJavaSecurityProtectionDomainAccess
-        (JavaSecurityProtectionDomainAccess jspda) {
-            javaSecurityProtectionDomainAccess = jspda;
-    }
-
-    public static JavaSecurityProtectionDomainAccess
-        getJavaSecurityProtectionDomainAccess() {
-            if (javaSecurityProtectionDomainAccess == null)
-                unsafe.ensureClassInitialized(ProtectionDomain.class);
-            return javaSecurityProtectionDomainAccess;
-    }
-
-    public static void setJavaSecurityAccess(JavaSecurityAccess jsa) {
-        javaSecurityAccess = jsa;
-    }
-
-    public static JavaSecurityAccess getJavaSecurityAccess() {
-        if (javaSecurityAccess == null) {
-            // [IKVM] OpenJDK initializes AccessController here, but that's a bug
-            unsafe.ensureClassInitialized(ProtectionDomain.class);
-        }
-        return javaSecurityAccess;
-    }
-
-    public static void setJavaxSecurityAuthKerberosAccess
-            (JavaxSecurityAuthKerberosAccess jsaka) {
-        javaxSecurityAuthKerberosAccess = jsaka;
-    }
-
-    public static JavaxSecurityAuthKerberosAccess
-            getJavaxSecurityAuthKerberosAccess() {
-        if (javaxSecurityAuthKerberosAccess == null)
-            unsafe.ensureClassInitialized(KeyTab.class);
-        return javaxSecurityAuthKerberosAccess;
-    }
-
-    public static void setJavaAWTAccess(JavaAWTAccess jaa) {
-        javaAWTAccess = jaa;
-    }
-
-    public static JavaAWTAccess getJavaAWTAccess() {
-        // this may return null in which case calling code needs to
-        // provision for.
-        if (javaAWTAccess == null || javaAWTAccess.getContext() == null) {
-            return null;
-        }
-        return javaAWTAccess;
-    }
-}
diff --git a/openjdk/sun/misc/Unsafe.java b/openjdk/sun/misc/Unsafe.java
deleted file mode 100644
index df035e5c..00000000
--- a/openjdk/sun/misc/Unsafe.java
+++ /dev/null
@@ -1,1229 +0,0 @@
-/*
-  Copyright (C) 2006-2014 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-
-package sun.misc;
-
-import cli.System.Buffer;
-import cli.System.IntPtr;
-import cli.System.Runtime.InteropServices.Marshal;
-import cli.System.Security.Permissions.SecurityAction;
-import cli.System.Security.Permissions.SecurityPermissionAttribute;
-import ikvm.lang.Internal;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.ReflectHelper;
-import java.security.ProtectionDomain;
-import java.util.ArrayList;
-
-public final class Unsafe
-{
-    public static final int INVALID_FIELD_OFFSET = -1;
-    public static final int ARRAY_BYTE_BASE_OFFSET = 0;
-    // NOTE sun.corba.Bridge actually access this field directly (via reflection),
-    // so the name must match the JDK name.
-    private static final Unsafe theUnsafe = new Unsafe();
-    private static final ArrayList<Field> fields = new ArrayList<Field>();
-
-    private Unsafe() { }
-
-    @sun.reflect.CallerSensitive
-    public static Unsafe getUnsafe()
-    {
-        if(!VM.isSystemDomainLoader(ikvm.internal.CallerID.getCallerID().getCallerClassLoader()))
-        {
-            throw new SecurityException("Unsafe");
-        }
-        return theUnsafe;
-    }
-
-    // this is the intrinsified version of objectFieldOffset(XXX.class.getDeclaredField("xxx"))
-    public long objectFieldOffset(Class c, String field)
-    {
-        return allocateUnsafeFieldId(ReflectHelper.createFieldAndMakeAccessible(c, field));
-    }
-
-    // NOTE we have a really lame (and slow) implementation!
-    public long objectFieldOffset(Field field)
-    {
-        if(Modifier.isStatic(field.getModifiers()))
-        {
-            throw new IllegalArgumentException();
-        }
-        return allocateUnsafeFieldId(field);
-    }
-
-    @Deprecated
-    public int fieldOffset(Field original)
-    {
-        return allocateUnsafeFieldId(original);
-    }
-    
-    static int allocateUnsafeFieldId(Field original)
-    {
-        Field copy = ReflectHelper.copyFieldAndMakeAccessible(original);
-        synchronized(fields)
-        {
-            int id = fields.size();
-            fields.add(copy);
-            return id;
-        }
-    }
-
-    public int arrayBaseOffset(Class c)
-    {
-        // don't change this, the Unsafe intrinsics depend on this value
-        return 0;
-    }
-
-    public int arrayIndexScale(Class c)
-    {
-        if (c == byte[].class || c == boolean[].class)
-        {
-            return 1;
-        }
-        if (c == char[].class || c == short[].class)
-        {
-            return 2;
-        }
-        if (c == int[].class || c == float[].class)
-        {
-            return 4;
-        }
-        if (c == long[].class || c == double[].class)
-        {
-            return 8;
-        }
-        // don't change this, the Unsafe intrinsics depend on this value
-        return 1;
-    }
-
-    static Field getField(long offset)
-    {
-        synchronized(fields)
-        {
-            return fields.get((int)offset);
-        }
-    }
-
-    public final native boolean compareAndSwapObject(Object obj, long offset, Object expect, Object update);
-
-    public void putObjectVolatile(Object obj, long offset, Object newValue)
-    {
-        if(obj instanceof Object[])
-        {
-            synchronized(this)
-            {
-                ((Object[])obj)[(int)offset] = newValue;
-            }
-        }
-        else
-        {
-            Field field = getField(offset);
-            synchronized(field)
-            {
-                try
-                {
-                    field.set(obj, newValue);
-                }
-                catch(IllegalAccessException x)
-                {
-                    throw (InternalError)new InternalError().initCause(x);
-                }
-            }
-        }
-    }
-
-    public void putOrderedObject(Object obj, long offset, Object newValue)
-    {
-        putObjectVolatile(obj, offset, newValue);
-    }
-
-    public Object getObjectVolatile(Object obj, long offset)
-    {
-        if(obj instanceof Object[])
-        {
-            synchronized(this)
-            {
-                return ((Object[])obj)[(int)offset];
-            }
-        }
-        else
-        {
-            Field field = getField(offset);
-            synchronized(field)
-            {
-                try
-                {
-                    return field.get(obj);
-                }
-                catch(IllegalAccessException x)
-                {
-                    throw (InternalError)new InternalError().initCause(x);
-                }
-            }
-        }
-    }
-
-    private static native short ReadInt16(Object obj, long offset);
-    private static native int ReadInt32(Object obj, long offset);
-    private static native long ReadInt64(Object obj, long offset);
-    private static native void WriteInt16(Object obj, long offset, short value);
-    private static native void WriteInt32(Object obj, long offset, int value);
-    private static native void WriteInt64(Object obj, long offset, long value);
-
-    public final native boolean compareAndSwapInt(Object obj, long offset, int expect, int update);
-
-    public void putIntVolatile(Object obj, long offset, int newValue)
-    {
-        if (obj instanceof cli.System.Array)
-        {
-            synchronized(this)
-            {
-                WriteInt32(obj, offset, newValue);
-            }
-        }
-        else
-        {
-            Field field = getField(offset);
-            synchronized(field)
-            {
-                try
-                {
-                    field.setInt(obj, newValue);
-                }
-                catch(IllegalAccessException x)
-                {
-                    throw (InternalError)new InternalError().initCause(x);
-                }
-            }
-        }
-    }
-
-    public void putOrderedInt(Object obj, long offset, int newValue)
-    {
-        putIntVolatile(obj, offset, newValue);
-    }
-
-    public int getIntVolatile(Object obj, long offset)
-    {
-        if (obj instanceof cli.System.Array)
-        {
-            synchronized(this)
-            {
-                return ReadInt32(obj, offset);
-            }
-        }
-        else
-        {
-            Field field = getField(offset);
-            synchronized(field)
-            {
-                try
-                {
-                    return field.getInt(obj);
-                }
-                catch(IllegalAccessException x)
-                {
-                    throw (InternalError)new InternalError().initCause(x);
-                }
-            }
-        }
-    }
-
-    public final native boolean compareAndSwapLong(Object obj, long offset, long expect, long update);
-
-    public void putLongVolatile(Object obj, long offset, long newValue)
-    {
-        if (obj instanceof cli.System.Array)
-        {
-            synchronized(this)
-            {
-                WriteInt64(obj, offset, newValue);
-            }
-        }
-        else
-        {
-            Field field = getField(offset);
-            synchronized(field)
-            {
-                try
-                {
-                    field.setLong(obj, newValue);
-                }
-                catch(IllegalAccessException x)
-                {
-                    throw (InternalError)new InternalError().initCause(x);
-                }
-            }
-        }
-    }
-
-    public void putOrderedLong(Object obj, long offset, long newValue)
-    {
-        putLongVolatile(obj, offset, newValue);
-    }
-
-    public long getLongVolatile(Object obj, long offset)
-    {
-        if (obj instanceof cli.System.Array)
-        {
-            synchronized(this)
-            {
-                return ReadInt64(obj, offset);
-            }
-        }
-        else
-        {
-            Field field = getField(offset);
-            synchronized(field)
-            {
-                try
-                {
-                    return field.getLong(obj);
-                }
-                catch(IllegalAccessException x)
-                {
-                    throw (InternalError)new InternalError().initCause(x);
-                }
-            }
-        }
-    }
-
-    public void putBoolean(Object obj, long offset, boolean newValue)
-    {
-        if (obj instanceof cli.System.Array)
-        {
-            Buffer.SetByte((cli.System.Array)obj, (int)offset, newValue ? (byte)1 : (byte)0);
-        }
-        else
-        {
-            try
-            {
-                getField(offset).setBoolean(obj, newValue);
-            }
-            catch (IllegalAccessException x)
-            {
-                throw (InternalError)new InternalError().initCause(x);
-            }
-        }
-    }
-
-    public void putBooleanVolatile(Object obj, long offset, boolean newValue)
-    {
-        putBoolean(obj, offset, newValue);
-    }
-
-    public boolean getBoolean(Object obj, long offset)
-    {
-        if (obj instanceof cli.System.Array)
-        {
-            return Buffer.GetByte((cli.System.Array)obj, (int)offset) != 0;
-        }
-        else
-        {
-            try
-            {
-                return getField(offset).getBoolean(obj);
-            }
-            catch (IllegalAccessException x)
-            {
-                throw (InternalError)new InternalError().initCause(x);
-            }
-        }
-    }
-
-    public boolean getBooleanVolatile(Object obj, long offset)
-    {
-        return getBoolean(obj, offset);
-    }
-
-    public void putByte(Object obj, long offset, byte newValue)
-    {
-        if (obj instanceof cli.System.Array)
-        {
-            Buffer.SetByte((cli.System.Array)obj, (int)offset, newValue);
-        }
-        else
-        {
-            try
-            {
-                getField(offset).setByte(obj, newValue);
-            }
-            catch (IllegalAccessException x)
-            {
-                throw (InternalError)new InternalError().initCause(x);
-            }
-        }
-    }
-
-    public void putByteVolatile(Object obj, long offset, byte newValue)
-    {
-        putByte(obj, offset, newValue);
-    }
-
-    public byte getByte(Object obj, long offset)
-    {
-        if (obj instanceof cli.System.Array)
-        {
-            return Buffer.GetByte((cli.System.Array)obj, (int)offset);
-        }
-        else
-        {
-            try
-            {
-                return getField(offset).getByte(obj);
-            }
-            catch (IllegalAccessException x)
-            {
-                throw (InternalError)new InternalError().initCause(x);
-            }
-        }
-    }
-
-    public byte getByteVolatile(Object obj, long offset)
-    {
-        return getByte(obj, offset);
-    }
-
-    public void putChar(Object obj, long offset, char newValue)
-    {
-        if (obj instanceof cli.System.Array)
-        {
-            WriteInt16(obj, offset, (short)newValue);
-        }
-        else
-        {
-            try
-            {
-                getField(offset).setChar(obj, newValue);
-            }
-            catch (IllegalAccessException x)
-            {
-                throw (InternalError)new InternalError().initCause(x);
-            }
-        }
-    }
-
-    public void putCharVolatile(Object obj, long offset, char newValue)
-    {
-        putChar(obj, offset, newValue);
-    }
-
-    public char getChar(Object obj, long offset)
-    {
-        if (obj instanceof cli.System.Array)
-        {
-            return (char)ReadInt16(obj, offset);
-        }
-        else
-        {
-            try
-            {
-                return getField(offset).getChar(obj);
-            }
-            catch (IllegalAccessException x)
-            {
-                throw (InternalError)new InternalError().initCause(x);
-            }
-        }
-    }
-
-    public char getCharVolatile(Object obj, long offset)
-    {
-        return getChar(obj, offset);
-    }
-
-    public void putShort(Object obj, long offset, short newValue)
-    {
-        if (obj instanceof cli.System.Array)
-        {
-            WriteInt16(obj, offset, newValue);
-        }
-        else
-        {
-            try
-            {
-                getField(offset).setShort(obj, newValue);
-            }
-            catch (IllegalAccessException x)
-            {
-                throw (InternalError)new InternalError().initCause(x);
-            }
-        }
-    }
-
-    public void putShortVolatile(Object obj, long offset, short newValue)
-    {
-        putShort(obj, offset, newValue);
-    }
-
-    public short getShort(Object obj, long offset)
-    {
-        if (obj instanceof cli.System.Array)
-        {
-            return ReadInt16(obj, offset);
-        }
-        else
-        {
-            try
-            {
-                return getField(offset).getShort(obj);
-            }
-            catch (IllegalAccessException x)
-            {
-                throw (InternalError)new InternalError().initCause(x);
-            }
-        }
-    }
-
-    public short getShortVolatile(Object obj, long offset)
-    {
-        return getShort(obj, offset);
-    }
-
-    public void putInt(Object obj, long offset, int newValue)
-    {
-        if (obj instanceof cli.System.Array)
-        {
-            WriteInt32(obj, offset, newValue);
-        }
-        else
-        {
-            try
-            {
-                getField(offset).setInt(obj, newValue);
-            }
-            catch (IllegalAccessException x)
-            {
-                throw (InternalError)new InternalError().initCause(x);
-            }
-        }
-    }
-
-    public int getInt(Object obj, long offset)
-    {
-        if (obj instanceof cli.System.Array)
-        {
-            return ReadInt32(obj, offset);
-        }
-        else
-        {
-            try
-            {
-                return getField(offset).getInt(obj);
-            }
-            catch (IllegalAccessException x)
-            {
-                throw (InternalError)new InternalError().initCause(x);
-            }
-        }
-    }
-
-    public void putFloat(Object obj, long offset, float newValue)
-    {
-        if (obj instanceof cli.System.Array)
-        {
-            WriteInt32(obj, offset, Float.floatToRawIntBits(newValue));
-        }
-        else
-        {
-            try
-            {
-                getField(offset).setFloat(obj, newValue);
-            }
-            catch (IllegalAccessException x)
-            {
-                throw (InternalError)new InternalError().initCause(x);
-            }
-        }
-    }
-
-    public void putFloatVolatile(Object obj, long offset, float newValue)
-    {
-        putFloat(obj, offset, newValue);
-    }
-
-    public float getFloat(Object obj, long offset)
-    {
-        if (obj instanceof cli.System.Array)
-        {
-            return Float.intBitsToFloat(ReadInt32(obj, offset));
-        }
-        else
-        {
-            try
-            {
-                return getField(offset).getFloat(obj);
-            }
-            catch (IllegalAccessException x)
-            {
-                throw (InternalError)new InternalError().initCause(x);
-            }
-        }
-    }
-
-    public float getFloatVolatile(Object obj, long offset)
-    {
-        return getFloat(obj, offset);
-    }
-
-    public void putLong(Object obj, long offset, long newValue)
-    {
-        if (obj instanceof cli.System.Array)
-        {
-            WriteInt64(obj, offset, newValue);
-        }
-        else
-        {
-            try
-            {
-                getField(offset).setLong(obj, newValue);
-            }
-            catch (IllegalAccessException x)
-            {
-                throw (InternalError)new InternalError().initCause(x);
-            }
-        }
-    }
-
-    public long getLong(Object obj, long offset)
-    {
-        if (obj instanceof cli.System.Array)
-        {
-            return ReadInt64(obj, offset);
-        }
-        else
-        {
-            try
-            {
-                return getField(offset).getLong(obj);
-            }
-            catch (IllegalAccessException x)
-            {
-                throw (InternalError)new InternalError().initCause(x);
-            }
-        }
-    }
-
-    public void putDouble(Object obj, long offset, double newValue)
-    {
-        if (obj instanceof cli.System.Array)
-        {
-            WriteInt64(obj, offset, Double.doubleToRawLongBits(newValue));
-        }
-        else
-        {
-            try
-            {
-                getField(offset).setDouble(obj, newValue);
-            }
-            catch (IllegalAccessException x)
-            {
-                throw (InternalError)new InternalError().initCause(x);
-            }
-        }
-    }
-
-    public void putDoubleVolatile(Object obj, long offset, double newValue)
-    {
-        synchronized (this)
-        {
-            putDouble(obj, offset, newValue);
-        }
-    }
-
-    public double getDouble(Object obj, long offset)
-    {
-        if (obj instanceof cli.System.Array)
-        {
-            return Double.longBitsToDouble(ReadInt64(obj, offset));
-        }
-        else
-        {
-            try
-            {
-                return getField(offset).getDouble(obj);
-            }
-            catch (IllegalAccessException x)
-            {
-                throw (InternalError)new InternalError().initCause(x);
-            }
-        }
-    }
-
-    public double getDoubleVolatile(Object obj, long offset)
-    {
-        synchronized (this)
-        {
-            return getDouble(obj, offset);
-        }
-    }
-
-    public void putObject(Object obj, long offset, Object newValue)
-    {
-        if (obj instanceof Object[])
-        {
-            ((Object[])obj)[(int)offset] = newValue;
-        }
-        else
-        {
-            try
-            {
-                getField(offset).set(obj, newValue);
-            }
-            catch (IllegalAccessException x)
-            {
-                throw (InternalError)new InternalError().initCause(x);
-            }
-        }
-    }
-
-    public Object getObject(Object obj, long offset)
-    {
-        if (obj instanceof Object[])
-        {
-            return ((Object[])obj)[(int)offset];
-        }
-        else
-        {
-            try
-            {
-                return getField(offset).get(obj);
-            }
-            catch (IllegalAccessException x)
-            {
-                throw (InternalError)new InternalError().initCause(x);
-            }
-        }
-    }
-
-    @Deprecated
-    public int getInt(Object o, int offset)
-    {
-        return getInt(o, (long)offset);
-    }
-
-    @Deprecated
-    public void putInt(Object o, int offset, int x)
-    {
-        putInt(o, (long)offset, x);
-    }
-
-    @Deprecated
-    public Object getObject(Object o, int offset)
-    {
-        return getObject(o, (long)offset);
-    }
-
-    @Deprecated
-    public void putObject(Object o, int offset, Object x)
-    {
-        putObject(o, (long)offset, x);
-    }
-
-    @Deprecated
-    public boolean getBoolean(Object o, int offset)
-    {
-        return getBoolean(o, (long)offset);
-    }
-
-    @Deprecated
-    public void putBoolean(Object o, int offset, boolean x)
-    {
-        putBoolean(o, (long)offset, x);
-    }
-
-    @Deprecated
-    public byte getByte(Object o, int offset)
-    {
-        return getByte(o, (long)offset);
-    }
-
-    @Deprecated
-    public void putByte(Object o, int offset, byte x)
-    {
-        putByte(o, (long)offset, x);
-    }
-
-    @Deprecated
-    public short getShort(Object o, int offset)
-    {
-        return getShort(o, (long)offset);
-    }
-
-    @Deprecated
-    public void putShort(Object o, int offset, short x)
-    {
-        putShort(o, (long)offset, x);
-    }
-
-    @Deprecated
-    public char getChar(Object o, int offset)
-    {
-        return getChar(o, (long)offset);
-    }
-
-    @Deprecated
-    public void putChar(Object o, int offset, char x)
-    {
-        putChar(o, (long)offset, x);
-    }
-
-    @Deprecated
-    public long getLong(Object o, int offset)
-    {
-        return getLong(o, (long)offset);
-    }
-
-    @Deprecated
-    public void putLong(Object o, int offset, long x)
-    {
-        putLong(o, (long)offset, x);
-    }
-
-    @Deprecated
-    public float getFloat(Object o, int offset)
-    {
-        return getFloat(o, (long)offset);
-    }
-
-    @Deprecated
-    public void putFloat(Object o, int offset, float x)
-    {
-        putFloat(o, (long)offset, x);
-    }
-
-    @Deprecated
-    public double getDouble(Object o, int offset)
-    {
-        return getDouble(o, (long)offset);
-    }
-
-    @Deprecated
-    public void putDouble(Object o, int offset, double x)
-    {
-        putDouble(o, (long)offset, x);
-    }
-
-    public native void throwException(Throwable t);
-
-    public native void ensureClassInitialized(Class clazz);
-
-    @SecurityPermissionAttribute.Annotation(value = SecurityAction.__Enum.LinkDemand, SerializationFormatter = true)
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    public native Object allocateInstance(Class clazz) throws InstantiationException;
-
-    public int addressSize()
-    {
-        return IntPtr.get_Size();
-    }
-
-    public int pageSize()
-    {
-        return 4096;
-    }
-
-    // The really unsafe methods start here. They are all have a LinkDemand for unmanaged code.
-
-    @SecurityPermissionAttribute.Annotation(value = SecurityAction.__Enum.LinkDemand, UnmanagedCode = true)
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    public long allocateMemory(long bytes)
-    {
-        try
-        {
-            if (false) throw new cli.System.OutOfMemoryException();
-            return Marshal.AllocHGlobal(IntPtr.op_Explicit(bytes)).ToInt64();
-        }
-        catch (cli.System.OutOfMemoryException x)
-        {
-            throw new OutOfMemoryError(x.get_Message());
-        }
-    }
-
-    @SecurityPermissionAttribute.Annotation(value = SecurityAction.__Enum.LinkDemand, UnmanagedCode = true)
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    public void freeMemory(long address)
-    {
-        Marshal.FreeHGlobal(IntPtr.op_Explicit(address));
-    }
-
-    @SecurityPermissionAttribute.Annotation(value = SecurityAction.__Enum.LinkDemand, UnmanagedCode = true)
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    public void setMemory(long address, long bytes, byte value)
-    {
-        while (bytes-- > 0)
-        {
-            putByte(address++, value);
-        }
-    }
-
-    @SecurityPermissionAttribute.Annotation(value = SecurityAction.__Enum.LinkDemand, UnmanagedCode = true)
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    public void copyMemory(long srcAddress, long destAddress, long bytes)
-    {
-	while (bytes-- > 0)
-	{
-	    putByte(destAddress++, getByte(srcAddress++));
-	}
-    }
-    
-    @SecurityPermissionAttribute.Annotation(value = SecurityAction.__Enum.LinkDemand, UnmanagedCode = true)
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    public void copyMemory(Object srcBase, long srcOffset, Object destBase, long destOffset, long bytes)
-    {
-        if (srcBase == null)
-        {
-            if (destBase instanceof byte[])
-            {
-                cli.System.Runtime.InteropServices.Marshal.Copy(IntPtr.op_Explicit(srcOffset), (byte[])destBase, (int)destOffset, (int)bytes);
-            }
-            else if (destBase instanceof boolean[])
-            {
-                byte[] tmp = new byte[(int)bytes];
-                copyMemory(srcBase, srcOffset, tmp, 0, bytes);
-                copyMemory(tmp, 0, destBase, destOffset, bytes);
-            }
-            else if (destBase instanceof short[])
-            {
-                cli.System.Runtime.InteropServices.Marshal.Copy(IntPtr.op_Explicit(srcOffset), (short[])destBase, (int)(destOffset >> 1), (int)(bytes >> 1));
-            }
-            else if (destBase instanceof char[])
-            {
-                cli.System.Runtime.InteropServices.Marshal.Copy(IntPtr.op_Explicit(srcOffset), (char[])destBase, (int)(destOffset >> 1), (int)(bytes >> 1));
-            }
-            else if (destBase instanceof int[])
-            {
-                cli.System.Runtime.InteropServices.Marshal.Copy(IntPtr.op_Explicit(srcOffset), (int[])destBase, (int)(destOffset >> 2), (int)(bytes >> 2));
-            }
-            else if (destBase instanceof float[])
-            {
-                cli.System.Runtime.InteropServices.Marshal.Copy(IntPtr.op_Explicit(srcOffset), (float[])destBase, (int)(destOffset >> 2), (int)(bytes >> 2));
-            }
-            else if (destBase instanceof long[])
-            {
-                cli.System.Runtime.InteropServices.Marshal.Copy(IntPtr.op_Explicit(srcOffset), (long[])destBase, (int)(destOffset >> 3), (int)(bytes >> 3));
-            }
-            else if (destBase instanceof double[])
-            {
-                cli.System.Runtime.InteropServices.Marshal.Copy(IntPtr.op_Explicit(srcOffset), (double[])destBase, (int)(destOffset >> 3), (int)(bytes >> 3));
-            }
-            else if (destBase == null)
-            {
-                copyMemory(srcOffset, destOffset, bytes);
-            }
-            else
-            {
-                throw new IllegalArgumentException();
-            }
-        }
-        else if (srcBase instanceof cli.System.Array && destBase instanceof cli.System.Array)
-        {
-            cli.System.Buffer.BlockCopy((cli.System.Array)srcBase, (int)srcOffset, (cli.System.Array)destBase, (int)destOffset, (int)bytes);
-        }
-        else
-        {
-            if (srcBase instanceof byte[])
-            {
-                cli.System.Runtime.InteropServices.Marshal.Copy((byte[])srcBase, (int)srcOffset, IntPtr.op_Explicit(destOffset), (int)bytes);
-            }
-            else if (srcBase instanceof boolean[])
-            {
-                byte[] tmp = new byte[(int)bytes];
-                copyMemory(srcBase, srcOffset, tmp, 0, bytes);
-                copyMemory(tmp, 0, destBase, destOffset, bytes);
-            }
-            else if (srcBase instanceof short[])
-            {
-                cli.System.Runtime.InteropServices.Marshal.Copy((short[])srcBase, (int)(srcOffset >> 1), IntPtr.op_Explicit(destOffset), (int)(bytes >> 1));
-            }
-            else if (srcBase instanceof char[])
-            {
-                cli.System.Runtime.InteropServices.Marshal.Copy((char[])srcBase, (int)(srcOffset >> 1), IntPtr.op_Explicit(destOffset), (int)(bytes >> 1));
-            }
-            else if (srcBase instanceof int[])
-            {
-                cli.System.Runtime.InteropServices.Marshal.Copy((int[])srcBase, (int)(srcOffset >> 2), IntPtr.op_Explicit(destOffset), (int)(bytes >> 2));
-            }
-            else if (srcBase instanceof float[])
-            {
-                cli.System.Runtime.InteropServices.Marshal.Copy((float[])srcBase, (int)(srcOffset >> 2), IntPtr.op_Explicit(destOffset), (int)(bytes >> 2));
-            }
-            else if (srcBase instanceof long[])
-            {
-                cli.System.Runtime.InteropServices.Marshal.Copy((long[])srcBase, (int)(srcOffset >> 3), IntPtr.op_Explicit(destOffset), (int)(bytes >> 3));
-            }
-            else if (srcBase instanceof double[])
-            {
-                cli.System.Runtime.InteropServices.Marshal.Copy((double[])srcBase, (int)(srcOffset >> 3), IntPtr.op_Explicit(destOffset), (int)(bytes >> 3));
-            }
-            else
-            {
-                throw new IllegalArgumentException();
-            }
-        }
-    }
-
-    @SecurityPermissionAttribute.Annotation(value = SecurityAction.__Enum.LinkDemand, UnmanagedCode = true)
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    public byte getByte(long address)
-    {
-	return cli.System.Runtime.InteropServices.Marshal.ReadByte(IntPtr.op_Explicit(address));
-    }
-
-    @SecurityPermissionAttribute.Annotation(value = SecurityAction.__Enum.LinkDemand, UnmanagedCode = true)
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    public void putByte(long address, byte x)
-    {
-	cli.System.Runtime.InteropServices.Marshal.WriteByte(IntPtr.op_Explicit(address), x);
-    }
-
-    @SecurityPermissionAttribute.Annotation(value = SecurityAction.__Enum.LinkDemand, UnmanagedCode = true)
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    public short getShort(long address)
-    {
-	return cli.System.Runtime.InteropServices.Marshal.ReadInt16(IntPtr.op_Explicit(address));
-    }
-
-    @SecurityPermissionAttribute.Annotation(value = SecurityAction.__Enum.LinkDemand, UnmanagedCode = true)
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    public void putShort(long address, short x)
-    {
-	cli.System.Runtime.InteropServices.Marshal.WriteInt16(IntPtr.op_Explicit(address), x);
-    }
-
-    @SecurityPermissionAttribute.Annotation(value = SecurityAction.__Enum.LinkDemand, UnmanagedCode = true)
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    public char getChar(long address)
-    {
-        return (char)cli.System.Runtime.InteropServices.Marshal.ReadInt16(IntPtr.op_Explicit(address));
-    }
-
-    @SecurityPermissionAttribute.Annotation(value = SecurityAction.__Enum.LinkDemand, UnmanagedCode = true)
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    public void putChar(long address, char x)
-    {
-        cli.System.Runtime.InteropServices.Marshal.WriteInt16(IntPtr.op_Explicit(address), (short)x);
-    }
-
-    @SecurityPermissionAttribute.Annotation(value = SecurityAction.__Enum.LinkDemand, UnmanagedCode = true)
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    public int getInt(long address)
-    {
-	return cli.System.Runtime.InteropServices.Marshal.ReadInt32(IntPtr.op_Explicit(address));
-    }
-
-    @SecurityPermissionAttribute.Annotation(value = SecurityAction.__Enum.LinkDemand, UnmanagedCode = true)
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    public void putInt(long address, int x)
-    {
-	cli.System.Runtime.InteropServices.Marshal.WriteInt32(IntPtr.op_Explicit(address), x);
-    }
-
-    @SecurityPermissionAttribute.Annotation(value = SecurityAction.__Enum.LinkDemand, UnmanagedCode = true)
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    public long getLong(long address)
-    {
-	return cli.System.Runtime.InteropServices.Marshal.ReadInt64(IntPtr.op_Explicit(address));
-    }
-
-    @SecurityPermissionAttribute.Annotation(value = SecurityAction.__Enum.LinkDemand, UnmanagedCode = true)
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    public void putLong(long address, long x)
-    {
-	cli.System.Runtime.InteropServices.Marshal.WriteInt64(IntPtr.op_Explicit(address), x);
-    }
-
-    @SecurityPermissionAttribute.Annotation(value = SecurityAction.__Enum.LinkDemand, UnmanagedCode = true)
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    public long getAddress(long address)
-    {
-	return cli.System.Runtime.InteropServices.Marshal.ReadIntPtr(IntPtr.op_Explicit(address)).ToInt64();
-    }
-
-    @SecurityPermissionAttribute.Annotation(value = SecurityAction.__Enum.LinkDemand, UnmanagedCode = true)
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    public void putAddress(long address, long x)
-    {
-	cli.System.Runtime.InteropServices.Marshal.WriteIntPtr(IntPtr.op_Explicit(address), IntPtr.op_Explicit(x));
-    }
-
-    @SecurityPermissionAttribute.Annotation(value = SecurityAction.__Enum.LinkDemand, UnmanagedCode = true)
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    public float getFloat(long address)
-    {
-        return Float.intBitsToFloat(getInt(address));
-    }
-
-    @SecurityPermissionAttribute.Annotation(value = SecurityAction.__Enum.LinkDemand, UnmanagedCode = true)
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    public void putFloat(long address, float x)
-    {
-        putInt(address, Float.floatToIntBits(x));
-    }
-
-    @SecurityPermissionAttribute.Annotation(value = SecurityAction.__Enum.LinkDemand, UnmanagedCode = true)
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    public double getDouble(long address)
-    {
-        return Double.longBitsToDouble(getLong(address));
-    }
-
-    @SecurityPermissionAttribute.Annotation(value = SecurityAction.__Enum.LinkDemand, UnmanagedCode = true)
-    @cli.System.Security.SecurityCriticalAttribute.Annotation
-    public void putDouble(long address, double x)
-    {
-        putLong(address, Double.doubleToLongBits(x));
-    }
-    
-    public int getLoadAverage(double[] loadavg, int nelems)
-    {
-        return -1;
-    }
-
-    public void park(boolean isAbsolute, long time)
-    {
-        if (isAbsolute)
-        {
-            java.util.concurrent.locks.LockSupport.parkUntil(time);
-        }
-        else
-        {
-            if (time == 0)
-            {
-                time = Long.MAX_VALUE;
-            }
-            java.util.concurrent.locks.LockSupport.parkNanos(time);
-        }
-    }
-
-    public void unpark(Object thread)
-    {
-        java.util.concurrent.locks.LockSupport.unpark((Thread)thread);
-    }
-
-    public Object staticFieldBase(Field f)
-    {
-        return null;
-    }
-
-    public native boolean shouldBeInitialized(Class<?> c);
-
-    public native Class defineClass(String name, byte[] buf, int offset, int length, ClassLoader cl, ProtectionDomain pd);
-
-    @Deprecated
-    @sun.reflect.CallerSensitive
-    public native Class defineClass(String name, byte[] b, int off, int len);
-
-    public native Class defineAnonymousClass(Class hostClass, byte[] data, Object[] cpPatches);
-
-    public void monitorEnter(Object o)
-    {
-        cli.System.Threading.Monitor.Enter(o);
-    }
-
-    public void monitorExit(Object o)
-    {
-        cli.System.Threading.Monitor.Exit(o);
-    }
-
-    public boolean tryMonitorEnter(Object o)
-    {
-        return cli.System.Threading.Monitor.TryEnter(o);
-    }
-
-    public final int getAndAddInt(Object o, long offset, int delta)
-    {
-        for (;;)
-        {
-            int value = getIntVolatile(o, offset);
-            if (compareAndSwapInt(o, offset, value, value + delta))
-            {
-                return value;
-            }
-        }
-    }
-
-    public final long getAndAddLong(Object o, long offset, long delta)
-    {
-        for (;;)
-        {
-            long value = getLongVolatile(o, offset);
-            if (compareAndSwapLong(o, offset, value, value + delta))
-            {
-                return value;
-            }
-        }
-    }
-
-    public final int getAndSetInt(Object o, long offset, int newValue)
-    {
-        for (;;)
-        {
-            int value = getIntVolatile(o, offset);
-            if (compareAndSwapInt(o, offset, value, newValue))
-            {
-                return value;
-            }
-        }
-    }
-
-    public final long getAndSetLong(Object o, long offset, long newValue)
-    {
-        for (;;)
-        {
-            long value = getLongVolatile(o, offset);
-            if (compareAndSwapLong(o, offset, value, newValue))
-            {
-                return value;
-            }
-        }
-    }
-
-    public final Object getAndSetObject(Object o, long offset, Object newValue)
-    {
-        for (;;)
-        {
-            Object value = getObjectVolatile(o, offset);
-            if (compareAndSwapObject(o, offset, value, newValue))
-            {
-                return value;
-            }
-        }
-    }
-
-    public void loadFence()
-    {
-        cli.System.Threading.Thread.MemoryBarrier();
-    }
-
-    public void storeFence()
-    {
-        cli.System.Threading.Thread.MemoryBarrier();
-    }
-
-    public void fullFence()
-    {
-        cli.System.Threading.Thread.MemoryBarrier();
-    }
-}
diff --git a/openjdk/sun/misc/VM.java b/openjdk/sun/misc/VM.java
deleted file mode 100644
index 6cfa7fbe..00000000
--- a/openjdk/sun/misc/VM.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.misc;
-
-import static java.lang.Thread.State.*;
-import java.util.Properties;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-public class VM {
-
-    /* The following methods used to be native methods that instruct
-     * the VM to selectively suspend certain threads in low-memory
-     * situations. They are inherently dangerous and not implementable
-     * on native threads. We removed them in JDK 1.2. The skeletons
-     * remain so that existing applications that use these methods
-     * will still work.
-     */
-    private static boolean suspended = false;
-
-    /** @deprecated */
-    @Deprecated
-    public static boolean threadsSuspended() {
-        return suspended;
-    }
-
-    public static boolean allowThreadSuspension(ThreadGroup g, boolean b) {
-        return g.allowThreadSuspension(b);
-    }
-
-    /** @deprecated */
-    @Deprecated
-    public static boolean suspendThreads() {
-        suspended = true;
-        return true;
-    }
-
-    // Causes any suspended threadgroups to be resumed.
-    /** @deprecated */
-    @Deprecated
-    public static void unsuspendThreads() {
-        suspended = false;
-    }
-
-    // Causes threadgroups no longer marked suspendable to be resumed.
-    /** @deprecated */
-    @Deprecated
-    public static void unsuspendSomeThreads() {
-    }
-
-    /* Deprecated fields and methods -- Memory advice not supported in 1.2 */
-
-    /** @deprecated */
-    @Deprecated
-    public static final int STATE_GREEN = 1;
-
-    /** @deprecated */
-    @Deprecated
-    public static final int STATE_YELLOW = 2;
-
-    /** @deprecated */
-    @Deprecated
-    public static final int STATE_RED = 3;
-
-    /** @deprecated */
-    @Deprecated
-    public static final int getState() {
-        return STATE_GREEN;
-    }
-
-    /** @deprecated */
-    @Deprecated
-    public static void registerVMNotification(VMNotification n) { }
-
-    /** @deprecated */
-    @Deprecated
-    public static void asChange(int as_old, int as_new) { }
-
-    /** @deprecated */
-    @Deprecated
-    public static void asChange_otherthread(int as_old, int as_new) { }
-
-    /*
-     * Not supported in 1.2 because these will have to be exported as
-     * JVM functions, and we are not sure we want do that. Leaving
-     * here so it can be easily resurrected -- just remove the //
-     * comments.
-     */
-
-    /**
-     * Resume Java profiling.  All profiling data is added to any
-     * earlier profiling, unless <code>resetJavaProfiler</code> is
-     * called in between.  If profiling was not started from the
-     * command line, <code>resumeJavaProfiler</code> will start it.
-     * <p>
-     *
-     * NOTE: Profiling must be enabled from the command line for a
-     * java.prof report to be automatically generated on exit; if not,
-     * writeJavaProfilerReport must be invoked to write a report.
-     *
-     * @see     resetJavaProfiler
-     * @see     writeJavaProfilerReport
-     */
-
-    // public native static void resumeJavaProfiler();
-
-    /**
-     * Suspend Java profiling.
-     */
-    // public native static void suspendJavaProfiler();
-
-    /**
-     * Initialize Java profiling.  Any accumulated profiling
-     * information is discarded.
-     */
-    // public native static void resetJavaProfiler();
-
-    /**
-     * Write the current profiling contents to the file "java.prof".
-     * If the file already exists, it will be overwritten.
-     */
-    // public native static void writeJavaProfilerReport();
-
-    private static volatile boolean booted = false;
-
-    static {
-        // [IKVM] force System properties initialization ("booting")
-        System.lineSeparator();
-    }
-
-    // Invoked by by System.initializeSystemClass just before returning.
-    // Subsystems that are invoked during initialization can check this
-    // property in order to avoid doing things that should wait until the
-    // application class loader has been set up.
-    //
-    // [IKVM] The above isn't applicable. We only use the booted flag
-    // for the system properties (this is required because the system properties
-    // use java.util.Hashtable (via java.util.Properties) and it relies on
-    // the booted flag to determine whether it is safe to query the system
-    // properties).
-    public static void booted() {
-        booted = true;
-    }
-
-    public static boolean isBooted() {
-        return booted;
-    }
-
-    // Returns the maximum amount of allocatable direct buffer memory.
-    // The directMemory variable is initialized during system initialization
-    // in the saveAndRemoveProperties method.
-    //
-    public static long maxDirectMemory() {
-        // we don't support -XX:MaxDirectMemorySize
-        return Long.MAX_VALUE;
-    }
-
-    // User-controllable flag that determines if direct buffers should be page
-    // aligned. The "-XX:+PageAlignDirectMemory" option can be used to force
-    // buffers, allocated by ByteBuffer.allocateDirect, to be page aligned.
-    private static boolean pageAlignDirectMemory;
-
-    // Returns {@code true} if the direct buffers should be page aligned. This
-    // variable is initialized by saveAndRemoveProperties.
-    public static boolean isDirectMemoryPageAligned() {
-        return pageAlignDirectMemory;
-    }
-
-    // A user-settable boolean to determine whether ClassLoader.loadClass should
-    // accept array syntax.  This value may be changed during VM initialization
-    // via the system property "sun.lang.ClassLoader.allowArraySyntax".
-    //
-    // The default for 1.5 is "true", array syntax is allowed.  In 1.6, the
-    // default will be "false".  The presence of this system property to
-    // control array syntax allows applications the ability to preview this new
-    // behaviour.
-    //
-    private static boolean defaultAllowArraySyntax = false;
-    private static boolean allowArraySyntax = defaultAllowArraySyntax;
-
-    // The allowArraySyntax boolean is initialized during system initialization
-    // in the saveAndRemoveProperties method.
-    //
-    // It is initialized based on the value of the system property
-    // "sun.lang.ClassLoader.allowArraySyntax".  If the system property is not
-    // provided, the default for 1.5 is "true".  In 1.6, the default will be
-    // "false".  If the system property is provided, then the value of
-    // allowArraySyntax will be equal to "true" if Boolean.parseBoolean()
-    // returns "true".   Otherwise, the field will be set to "false".
-    //
-    public static boolean allowArraySyntax() {
-        return allowArraySyntax;
-    }
-
-    /**
-     * Returns the system property of the specified key saved at
-     * system initialization time.  This method should only be used
-     * for the system properties that are not changed during runtime.
-     * It accesses a private copy of the system properties so
-     * that user's locking of the system properties object will not
-     * cause the library to deadlock.
-     *
-     * Note that the saved system properties do not include
-     * the ones set by sun.misc.Version.init().
-     *
-     */
-    public static String getSavedProperty(String key) {
-        if (Lazy.savedProps.isEmpty())
-            throw new IllegalStateException("Should be non-empty if initialized");
-
-        return Lazy.savedProps.getProperty(key);
-    }
-
-    // TODO: the Property Management needs to be refactored and
-    // the appropriate prop keys need to be accessible to the
-    // calling classes to avoid duplication of keys.
-    static final class Lazy {
-        static final Properties savedProps = new Properties();
-    }
-
-    // Save a private copy of the system properties and remove
-    // the system properties that are not intended for public access.
-    //
-    // This method can only be invoked during system initialization.
-    public static void saveAndRemoveProperties(Properties props) {
-        if (booted)
-            throw new IllegalStateException("System initialization has completed");
-
-        Lazy.savedProps.putAll(props);
-
-        // Set the maximum amount of direct memory.  This value is controlled
-        // by the vm option -XX:MaxDirectMemorySize=<size>.
-        // The maximum amount of allocatable direct buffer memory (in bytes)
-        // from the system property sun.nio.MaxDirectMemorySize set by the VM.
-        // The system property will be removed.
-        String s = (String)props.remove("sun.nio.MaxDirectMemorySize");
-        // [IKVM] we don't support the -XX:MaxDirectMemorySize=<size> option.
-
-        // Check if direct buffers should be page aligned
-        s = (String)props.remove("sun.nio.PageAlignDirectMemory");
-        if ("true".equals(s))
-            pageAlignDirectMemory = true;
-
-        // Set a boolean to determine whether ClassLoader.loadClass accepts
-        // array syntax.  This value is controlled by the system property
-        // "sun.lang.ClassLoader.allowArraySyntax".
-        s = props.getProperty("sun.lang.ClassLoader.allowArraySyntax");
-        allowArraySyntax = (s == null
-                               ? defaultAllowArraySyntax
-                               : Boolean.parseBoolean(s));
-
-        // Remove other private system properties
-        // used by java.lang.Integer.IntegerCache
-        props.remove("java.lang.Integer.IntegerCache.high");
-
-        // used by java.util.zip.ZipFile
-        props.remove("sun.zip.disableMemoryMapping");
-
-        // used by sun.launcher.LauncherHelper
-        props.remove("sun.java.launcher.diag");
-    }
-
-    // Initialize any miscellenous operating system settings that need to be
-    // set for the class libraries.
-    //
-    public static void initializeOSEnvironment() {
-    }
-
-    /* Current count of objects pending for finalization */
-    private static volatile int finalRefCount = 0;
-
-    /* Peak count of objects pending for finalization */
-    private static volatile int peakFinalRefCount = 0;
-
-    /*
-     * Gets the number of objects pending for finalization.
-     *
-     * @return the number of objects pending for finalization.
-     */
-    public static int getFinalRefCount() {
-        return finalRefCount;
-    }
-
-    /*
-     * Gets the peak number of objects pending for finalization.
-     *
-     * @return the peak number of objects pending for finalization.
-     */
-    public static int getPeakFinalRefCount() {
-        return peakFinalRefCount;
-    }
-
-    /*
-     * Add <tt>n</tt> to the objects pending for finalization count.
-     *
-     * @param n an integer value to be added to the objects pending
-     * for finalization count
-     */
-    public static void addFinalRefCount(int n) {
-        // The caller must hold lock to synchronize the update.
-
-        finalRefCount += n;
-        if (finalRefCount > peakFinalRefCount) {
-            peakFinalRefCount = finalRefCount;
-        }
-    }
-
-    /**
-     * Returns Thread.State for the given threadStatus
-     */
-    public static Thread.State toThreadState(int threadStatus) {
-        if ((threadStatus & JVMTI_THREAD_STATE_RUNNABLE) != 0) {
-            return RUNNABLE;
-        } else if ((threadStatus & JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER) != 0) {
-            return BLOCKED;
-        } else if ((threadStatus & JVMTI_THREAD_STATE_WAITING_INDEFINITELY) != 0) {
-            return WAITING;
-        } else if ((threadStatus & JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT) != 0) {
-            return TIMED_WAITING;
-        } else if ((threadStatus & JVMTI_THREAD_STATE_TERMINATED) != 0) {
-            return TERMINATED;
-        } else if ((threadStatus & JVMTI_THREAD_STATE_ALIVE) == 0) {
-            return NEW;
-        } else {
-            return RUNNABLE;
-        }
-    }
-
-    /* The threadStatus field is set by the VM at state transition
-     * in the hotspot implementation. Its value is set according to
-     * the JVM TI specification GetThreadState function.
-     */
-    private final static int JVMTI_THREAD_STATE_ALIVE = 0x0001;
-    private final static int JVMTI_THREAD_STATE_TERMINATED = 0x0002;
-    private final static int JVMTI_THREAD_STATE_RUNNABLE = 0x0004;
-    private final static int JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER = 0x0400;
-    private final static int JVMTI_THREAD_STATE_WAITING_INDEFINITELY = 0x0010;
-    private final static int JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT = 0x0020;
-
-    static {
-        initialize();
-    }
-    private native static void initialize();
-}
diff --git a/openjdk/sun/misc/Version.java b/openjdk/sun/misc/Version.java
deleted file mode 100644
index 7e0f3724..00000000
--- a/openjdk/sun/misc/Version.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.misc;
-import java.io.PrintStream;
-
-public class Version {
-
-
-    private static final String launcher_name =
-        "openjdk";
-
-    private static final String java_version =
-        "1.7.0-internal";
-
-    private static final String java_runtime_name =
-	"OpenJDK Runtime Environment";
- 
-    private static final String java_runtime_version =
-        "1.7.0-internal-jeroen_2012_05_22_06_05-b00";
-
-    static {
-        init();
-    }
-
-    public static void init() {
-    }
-
-    private static boolean versionsInitialized = false;
-    private static int jvm_major_version = 0;
-    private static int jvm_minor_version = 0;
-    private static int jvm_micro_version = 0;
-    private static int jvm_update_version = 0;
-    private static int jvm_build_number = 0;
-    private static String jvm_special_version = null;
-    private static int jdk_major_version = 0;
-    private static int jdk_minor_version = 0;
-    private static int jdk_micro_version = 0;
-    private static int jdk_update_version = 0;
-    private static int jdk_build_number = 0;
-    private static String jdk_special_version = null;
-
-    /**
-     * In case you were wondering this method is called by java -version.
-     * Sad that it prints to stderr; would be nicer if default printed on
-     * stdout.
-     */
-    public static void print() {
-        print(System.err);
-    }
-
-    /**
-     * This is the same as print except that it adds an extra line-feed
-     * at the end, typically used by the -showversion in the launcher
-     */
-    public static void println() {
-        print(System.err);
-        System.err.println();
-    }
-
-    /**
-     * Give a stream, it will print version info on it.
-     */
-    public static void print(PrintStream ps) {
-        boolean isHeadless = false;
-
-        /* Report that we're running headless if the property is true */
-	String headless = System.getProperty("java.awt.headless");
-	if ( (headless != null) && (headless.equalsIgnoreCase("true")) ) {
-            isHeadless = true;
-	} 
-
-        /* First line: platform version. */
-        ps.println(launcher_name + " version \"" + java_version + "\"");
-
-        /* Second line: runtime version (ie, libraries). */
-
-	ps.print(java_runtime_name + " (build " + java_runtime_version);
-
-	if (java_runtime_name.indexOf("Embedded") != -1 && isHeadless) {
-	    // embedded builds report headless state
-	    ps.print(", headless");
-	}
-	ps.println(')');
-
-        /* Third line: JVM information. */
-        String java_vm_name    = System.getProperty("java.vm.name");
-        String java_vm_version = System.getProperty("java.vm.version");
-        String java_vm_info    = System.getProperty("java.vm.info");
-        ps.println(java_vm_name + " (build " + java_vm_version + ", " +
-                   java_vm_info + ")");
-    }
-
-
-    /**
-     * Returns the major version of the running JVM if it's 1.6 or newer
-     * or any RE VM build. It will return 0 if it's an internal 1.5 or
-     * 1.4.x build.
-     *
-     * @since 1.6
-     */
-    public static synchronized int jvmMajorVersion() {
-        if (!versionsInitialized) {
-            initVersions();
-        }
-        return jvm_major_version;
-    }
-
-    /**
-     * Returns the minor version of the running JVM if it's 1.6 or newer
-     * or any RE VM build. It will return 0 if it's an internal 1.5 or
-     * 1.4.x build.
-     * @since 1.6
-     */
-    public static synchronized int jvmMinorVersion() {
-        if (!versionsInitialized) {
-            initVersions();
-        }
-        return jvm_minor_version;
-    }
-
-
-    /**
-     * Returns the micro version of the running JVM if it's 1.6 or newer
-     * or any RE VM build. It will return 0 if it's an internal 1.5 or
-     * 1.4.x build.
-     * @since 1.6
-     */
-    public static synchronized int jvmMicroVersion() {
-        if (!versionsInitialized) {
-            initVersions();
-        }
-        return jvm_micro_version;
-    }
-
-    /**
-     * Returns the update release version of the running JVM if it's
-     * a RE build. It will return 0 if it's an internal build.
-     * @since 1.6
-     */
-    public static synchronized int jvmUpdateVersion() {
-        if (!versionsInitialized) {
-            initVersions();
-        }
-        return jvm_update_version;
-    }
-
-    public static synchronized String jvmSpecialVersion() {
-        if (!versionsInitialized) {
-            initVersions();
-        }
-        if (jvm_special_version == null) {
-            jvm_special_version = getJvmSpecialVersion();
-        }
-        return jvm_special_version;
-    }
-    public static native String getJvmSpecialVersion();
-
-    /**
-     * Returns the build number of the running JVM if it's a RE build
-     * It will return 0 if it's an internal build.
-     * @since 1.6
-     */
-    public static synchronized int jvmBuildNumber() {
-        if (!versionsInitialized) {
-            initVersions();
-        }
-        return jvm_build_number;
-    }
-
-    /**
-     * Returns the major version of the running JDK.
-     *
-     * @since 1.6
-     */
-    public static synchronized int jdkMajorVersion() {
-        if (!versionsInitialized) {
-            initVersions();
-        }
-        return jdk_major_version;
-    }
-
-    /**
-     * Returns the minor version of the running JDK.
-     * @since 1.6
-     */
-    public static synchronized int jdkMinorVersion() {
-        if (!versionsInitialized) {
-            initVersions();
-        }
-        return jdk_minor_version;
-    }
-
-    /**
-     * Returns the micro version of the running JDK.
-     * @since 1.6
-     */
-    public static synchronized int jdkMicroVersion() {
-        if (!versionsInitialized) {
-            initVersions();
-        }
-        return jdk_micro_version;
-    }
-
-    /**
-     * Returns the update release version of the running JDK if it's
-     * a RE build. It will return 0 if it's an internal build.
-     * @since 1.6
-     */
-    public static synchronized int jdkUpdateVersion() {
-        if (!versionsInitialized) {
-            initVersions();
-        }
-        return jdk_update_version;
-    }
-
-    public static synchronized String jdkSpecialVersion() {
-        if (!versionsInitialized) {
-            initVersions();
-        }
-        if (jdk_special_version == null) {
-            jdk_special_version = getJdkSpecialVersion();
-        }
-        return jdk_special_version;
-    }
-    public static native String getJdkSpecialVersion();
-
-    /**
-     * Returns the build number of the running JDK if it's a RE build
-     * It will return 0 if it's an internal build.
-     * @since 1.6
-     */
-    public static synchronized int jdkBuildNumber() {
-        if (!versionsInitialized) {
-            initVersions();
-        }
-        return jdk_build_number;
-    }
-
-    // true if JVM exports the version info including the capabilities
-    private static boolean jvmVersionInfoAvailable;
-    private static synchronized void initVersions() {
-        if (versionsInitialized) {
-            return;
-        }
-        jvmVersionInfoAvailable = getJvmVersionInfo();
-        if (!jvmVersionInfoAvailable) {
-            // parse java.vm.version for older JVM before the
-            // new JVM_GetVersionInfo is added.
-            // valid format of the version string is:
-            // n.n.n[_uu[c]][-<identifer>]-bxx
-            CharSequence cs = System.getProperty("java.vm.version");
-            if (cs.length() >= 5 &&
-                Character.isDigit(cs.charAt(0)) && cs.charAt(1) == '.' &&
-                Character.isDigit(cs.charAt(2)) && cs.charAt(3) == '.' &&
-                Character.isDigit(cs.charAt(4))) {
-                jvm_major_version = Character.digit(cs.charAt(0), 10);
-                jvm_minor_version = Character.digit(cs.charAt(2), 10);
-                jvm_micro_version = Character.digit(cs.charAt(4), 10);
-                cs = cs.subSequence(5, cs.length());
-                if (cs.charAt(0) == '_' && cs.length() >= 3 &&
-                    Character.isDigit(cs.charAt(1)) &&
-                    Character.isDigit(cs.charAt(2))) {
-                    int nextChar = 3;
-                    try {
-                        String uu = cs.subSequence(1, 3).toString();
-                        jvm_update_version = Integer.valueOf(uu).intValue();
-                        if (cs.length() >= 4) {
-                            char c = cs.charAt(3);
-                            if (c >= 'a' && c <= 'z') {
-                                jvm_special_version = Character.toString(c);
-                                nextChar++;
-                            }
-                        }
-                    } catch (NumberFormatException e) {
-                        // not conforming to the naming convention
-                        return;
-                    }
-                    cs = cs.subSequence(nextChar, cs.length());
-                }
-                if (cs.charAt(0) == '-') {
-                    // skip the first character
-                    // valid format: <identifier>-bxx or bxx
-                    // non-product VM will have -debug|-release appended
-                    cs = cs.subSequence(1, cs.length());
-                    String[] res = cs.toString().split("-");
-                    for (String s : res) {
-                        if (s.charAt(0) == 'b' && s.length() == 3 &&
-                            Character.isDigit(s.charAt(1)) &&
-                            Character.isDigit(s.charAt(2))) {
-                            jvm_build_number =
-                                Integer.valueOf(s.substring(1, 3)).intValue();
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-        getJdkVersionInfo();
-        versionsInitialized = true;
-    }
-
-    // Gets the JVM version info if available and sets the jvm_*_version fields
-    // and its capabilities.
-    //
-    // Return false if not available which implies an old VM (Tiger or before).
-    private static native boolean getJvmVersionInfo();
-    private static native void getJdkVersionInfo();
-
-}
-
-// Help Emacs a little because this file doesn't end in .java.
-//
-// Local Variables: ***
-// mode: java ***
-// End: ***
diff --git a/openjdk/sun/net/dns/ResolverConfigurationImpl.java b/openjdk/sun/net/dns/ResolverConfigurationImpl.java
deleted file mode 100644
index 167faad9..00000000
--- a/openjdk/sun/net/dns/ResolverConfigurationImpl.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.net.dns;
-
-import java.util.List;
-import java.util.LinkedList;
-import java.util.StringTokenizer;
-import java.io.IOException;
-import cli.System.Net.NetworkInformation.IPAddressCollection;
-import cli.System.Net.NetworkInformation.IPInterfaceProperties;
-import cli.System.Net.NetworkInformation.NetworkInterface;
-
-/*
- * An implementation of sun.net.ResolverConfiguration for Windows.
- */
-
-public class ResolverConfigurationImpl
-    extends ResolverConfiguration
-{
-    // Lock helds whilst loading configuration or checking
-    private static Object lock = new Object();
-
-    // Resolver options
-    private final Options opts;
-
-    // Addreses have changed
-    private static boolean changed = false;
-
-    // Time of last refresh.
-    private static long lastRefresh = -1;
-
-    // Cache timeout (120 seconds) - should be converted into property
-    // or configured as preference in the future.
-    private static final int TIMEOUT = 120000;
-
-    // DNS suffix list and name servers populated by native method
-    private static String os_searchlist;
-    private static String os_nameservers;
-
-    // Cached lists
-    private static LinkedList searchlist;
-    private static LinkedList nameservers;
-
-    // Parse string that consists of token delimited by space or commas
-    // and return LinkedHashMap
-    private LinkedList<String> stringToList(String str) {
-        LinkedList<String> ll = new LinkedList<>();
-
-        // comma and space are valid delimites
-        StringTokenizer st = new StringTokenizer(str, ", ");
-        while (st.hasMoreTokens()) {
-            String s = st.nextToken();
-            if (!ll.contains(s)) {
-                ll.add(s);
-            }
-        }
-        return ll;
-    }
-
-    // Load DNS configuration from OS
-
-    private void loadConfig() {
-        assert Thread.holdsLock(lock);
-
-        // if address have changed then DNS probably changed aswell;
-        // otherwise check if cached settings have expired.
-        //
-        if (changed) {
-            changed = false;
-        } else {
-            if (lastRefresh >= 0) {
-                long currTime = System.currentTimeMillis();
-                if ((currTime - lastRefresh) < TIMEOUT) {
-                    return;
-                }
-            }
-        }
-
-        // load DNS configuration, update timestamp, create
-        // new HashMaps from the loaded configuration
-        //
-        loadDNSconfig0();
-
-        lastRefresh = System.currentTimeMillis();
-        searchlist = stringToList(os_searchlist);
-        nameservers = stringToList(os_nameservers);
-        os_searchlist = null;                       // can be GC'ed
-        os_nameservers = null;
-    }
-
-    ResolverConfigurationImpl() {
-        opts = new OptionsImpl();
-    }
-
-    public List<String> searchlist() {
-        synchronized (lock) {
-            loadConfig();
-
-            // List is mutable so return a shallow copy
-            return (List)searchlist.clone();
-        }
-    }
-
-    public List<String> nameservers() {
-        synchronized (lock) {
-            loadConfig();
-
-            // List is mutable so return a shallow copy
-            return (List)nameservers.clone();
-         }
-    }
-
-    public Options options() {
-        return opts;
-    }
-
-    // --- Address Change Listener
-
-    static class AddressChangeListener extends Thread {
-        public void run() {
-            for (;;) {
-                // wait for configuration to change
-                if (notifyAddrChange0() != 0)
-                    return;
-                synchronized (lock) {
-                    changed = true;
-                }
-            }
-        }
-    }
-
-
-    // --- Native methods --
-
-    static void init0() {
-    }
-
-    static void loadDNSconfig0() {
-	String searchlist = "";
-	String nameservers = "";
-	for (NetworkInterface iface : NetworkInterface.GetAllNetworkInterfaces()) {
-	    IPInterfaceProperties props = iface.GetIPProperties();
-	    IPAddressCollection addresses = props.get_DnsAddresses();
-	    for (int i = 0; i < addresses.get_Count(); i++) {
-	        cli.System.Net.IPAddress addr = addresses.get_Item(i);
-	        // no IPv6 support
-	        if (addr.get_AddressFamily().Value == cli.System.Net.Sockets.AddressFamily.InterNetwork) {
-                    nameservers = strAppend(nameservers, addr.toString());
-	        }
-	    }
-	    try {
-	        if (false) throw new cli.System.PlatformNotSupportedException();
-		searchlist = strAppend(searchlist, props.get_DnsSuffix());
-	    }
-	    catch (cli.System.PlatformNotSupportedException _) {
-	    }
-	}
-	os_searchlist = searchlist;
-	os_nameservers = nameservers;
-    }
-    
-    private static String strAppend(String s, String app) {
-        if (s.equals("")) {
-            return app;
-        }
-        if (app.equals("")) {
-            return s;
-        }
-        return s + " " + app;
-    }
-
-    static int notifyAddrChange0() {
-        // TODO we could use System.Net.NetworkInformation.NetworkChange to detect changes
-        return -1;
-    }
-
-    static {
-        java.security.AccessController.doPrivileged(
-            new sun.security.action.LoadLibraryAction("net"));
-        init0();
-
-        // start the address listener thread
-        AddressChangeListener thr = new AddressChangeListener();
-        thr.setDaemon(true);
-        thr.start();
-    }
-}
-
-/**
- * Implementation of {@link ResolverConfiguration.Options}
- */
-class OptionsImpl extends ResolverConfiguration.Options {
-}
diff --git a/openjdk/sun/net/sdp/SdpSupport.java b/openjdk/sun/net/sdp/SdpSupport.java
deleted file mode 100644
index 6784ab01..00000000
--- a/openjdk/sun/net/sdp/SdpSupport.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.net.sdp;
-
-import java.io.IOException;
-import java.io.FileDescriptor;
-
-
-/**
- * This class defines methods for creating SDP sockets or "converting" existing
- * file descriptors, referencing (unbound) TCP sockets, to SDP.
- */
-
-public final class SdpSupport {
-
-    private SdpSupport() { }
-
-    /**
-     * Creates a SDP socket, returning file descriptor referencing the socket.
-     */
-    public static FileDescriptor createSocket() throws IOException {
-        throw new UnsupportedOperationException("SDP not supported on this platform");
-    }
-
-    /**
-     * Converts an existing file descriptor, that references an unbound TCP socket,
-     * to SDP.
-     */
-    public static void convertSocket(FileDescriptor fd) throws IOException {
-        throw new UnsupportedOperationException("SDP not supported on this platform");
-    }
-}
diff --git a/openjdk/sun/net/www/protocol/file/FileURLConnection.java b/openjdk/sun/net/www/protocol/file/FileURLConnection.java
deleted file mode 100644
index 43c94b31..00000000
--- a/openjdk/sun/net/www/protocol/file/FileURLConnection.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * Open an file input stream given a URL.
- * @author      James Gosling
- * @author      Steven B. Byrne
- */
-
-package sun.net.www.protocol.file;
-
-import java.net.URL;
-import java.net.FileNameMap;
-import java.io.*;
-import java.text.Collator;
-import java.security.Permission;
-import sun.net.*;
-import sun.net.www.*;
-import java.util.*;
-import java.text.SimpleDateFormat;
-
-import sun.security.action.GetPropertyAction;
-import sun.security.action.GetIntegerAction;
-import sun.security.action.GetBooleanAction;
-
-public class FileURLConnection extends URLConnection {
-
-    static String CONTENT_LENGTH = "content-length";
-    static String CONTENT_TYPE = "content-type";
-    static String TEXT_PLAIN = "text/plain";
-    static String LAST_MODIFIED = "last-modified";
-
-    String contentType;
-    InputStream is;
-
-    File file;
-    String filename;
-    boolean isDirectory = false;
-    boolean exists = false;
-    List<String> files;
-
-    long length = -1;
-    long lastModified = 0;
-
-    protected FileURLConnection(URL u, File file) {
-        super(u);
-        this.file = file;
-    }
-
-    /*
-     * Note: the semantics of FileURLConnection object is that the
-     * results of the various URLConnection calls, such as
-     * getContentType, getInputStream or getContentLength reflect
-     * whatever was true when connect was called.
-     */
-    public void connect() throws IOException {
-        if (!connected) {
-            try {
-                filename = file.toString();
-                isDirectory = file.isDirectory();
-                if (isDirectory) {
-                    String[] fileList = file.list();
-                    if (fileList == null)
-                        throw new FileNotFoundException(filename + " exists, but is not accessible");
-                    files = Arrays.<String>asList(fileList);
-                } else {
-
-                    is = new BufferedInputStream(new FileInputStream(filename));
-
-                    // Check if URL should be metered
-                    boolean meteredInput = ProgressMonitor.getDefault().shouldMeterInput(url, "GET");
-                    if (meteredInput)   {
-                        ProgressSource pi = new ProgressSource(url, "GET", file.length());
-                        is = new MeteredStream(is, pi, file.length());
-                    }
-                }
-            } catch (IOException e) {
-                throw e;
-            }
-            connected = true;
-        }
-    }
-
-    private boolean initializedHeaders = false;
-
-    private void initializeHeaders() {
-        try {
-            connect();
-            exists = file.exists();
-        } catch (IOException e) {
-        }
-        if (!initializedHeaders || !exists) {
-            length = file.length();
-            lastModified = file.lastModified();
-
-            if (!isDirectory) {
-                FileNameMap map = java.net.URLConnection.getFileNameMap();
-                contentType = map.getContentTypeFor(filename);
-                if (contentType != null) {
-                    properties.add(CONTENT_TYPE, contentType);
-                }
-                properties.add(CONTENT_LENGTH, String.valueOf(length));
-
-                /*
-                 * Format the last-modified field into the preferred
-                 * Internet standard - ie: fixed-length subset of that
-                 * defined by RFC 1123
-                 */
-                if (lastModified != 0) {
-                    Date date = new Date(lastModified);
-                    SimpleDateFormat fo =
-                        new SimpleDateFormat ("EEE, dd MMM yyyy HH:mm:ss 'GMT'", Locale.US);
-                    fo.setTimeZone(TimeZone.getTimeZone("GMT"));
-                    properties.add(LAST_MODIFIED, fo.format(date));
-                }
-            } else {
-                properties.add(CONTENT_TYPE, TEXT_PLAIN);
-            }
-            initializedHeaders = true;
-        }
-    }
-
-    public String getHeaderField(String name) {
-        initializeHeaders();
-        return super.getHeaderField(name);
-    }
-
-    public String getHeaderField(int n) {
-        initializeHeaders();
-        return super.getHeaderField(n);
-    }
-
-    public int getContentLength() {
-        initializeHeaders();
-        if (length > Integer.MAX_VALUE)
-            return -1;
-        return (int) length;
-    }
-
-    public long getContentLengthLong() {
-        initializeHeaders();
-        return length;
-    }
-
-    public String getHeaderFieldKey(int n) {
-        initializeHeaders();
-        return super.getHeaderFieldKey(n);
-    }
-
-    public MessageHeader getProperties() {
-        initializeHeaders();
-        return super.getProperties();
-    }
-
-    public long getLastModified() {
-        initializeHeaders();
-        return lastModified;
-    }
-
-    public synchronized InputStream getInputStream()
-        throws IOException {
-
-        int iconHeight;
-        int iconWidth;
-
-        connect();
-
-        if (is == null) {
-            if (isDirectory) {
-                FileNameMap map = java.net.URLConnection.getFileNameMap();
-
-                StringBuffer buf = new StringBuffer();
-
-                if (files == null) {
-                    throw new FileNotFoundException(filename);
-                }
-
-                sort(files);
-
-                for (int i = 0 ; i < files.size() ; i++) {
-                    String fileName = files.get(i);
-                    buf.append(fileName);
-                    buf.append("\n");
-                }
-                // Put it into a (default) locale-specific byte-stream.
-                is = new ByteArrayInputStream(buf.toString().getBytes());
-            } else {
-                throw new FileNotFoundException(filename);
-            }
-        }
-        return is;
-    }
-
-    // IKVM specific method (sorting moved here to delay java.text.Collator dependency)
-    private static void sort(List files) {
-        Collections.sort(files, Collator.getInstance());
-    }
-
-    Permission permission;
-
-    /* since getOutputStream isn't supported, only read permission is
-     * relevant
-     */
-    public Permission getPermission() throws IOException {
-        if (permission == null) {
-            String decodedPath = ParseUtil.decode(url.getPath());
-            if (File.separatorChar == '/') {
-                permission = new FilePermission(decodedPath, "read");
-            } else {
-                permission = new FilePermission(
-                        decodedPath.replace('/',File.separatorChar), "read");
-            }
-        }
-        return permission;
-    }
-}
diff --git a/openjdk/sun/net/www/protocol/file/Handler.java b/openjdk/sun/net/www/protocol/file/Handler.java
deleted file mode 100644
index 88688c38..00000000
--- a/openjdk/sun/net/www/protocol/file/Handler.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.net.www.protocol.file;
-
-import java.net.InetAddress;
-import java.net.URLConnection;
-import java.net.URL;
-import java.net.Proxy;
-import java.net.MalformedURLException;
-import java.net.URLStreamHandler;
-import java.io.InputStream;
-import java.io.IOException;
-import sun.net.www.ParseUtil;
-import java.io.File;
-
-/**
- * Open an file input stream given a URL.
- * @author      James Gosling
- */
-public class Handler extends URLStreamHandler {
-
-    private String getHost(URL url) {
-        String host = url.getHost();
-        if (host == null)
-            host = "";
-        return host;
-    }
-
-
-    protected void parseURL(URL u, String spec, int start, int limit) {
-        /*
-         * Ugly backwards compatibility. Flip any file separator
-         * characters to be forward slashes. This is a nop on Unix
-         * and "fixes" win32 file paths. According to RFC 2396,
-         * only forward slashes may be used to represent hierarchy
-         * separation in a URL but previous releases unfortunately
-         * performed this "fixup" behavior in the file URL parsing code
-         * rather than forcing this to be fixed in the caller of the URL
-         * class where it belongs. Since backslash is an "unwise"
-         * character that would normally be encoded if literally intended
-         * as a non-seperator character the damage of veering away from the
-         * specification is presumably limited.
-         */
-        super.parseURL(u, spec.replace(File.separatorChar, '/'), start, limit);
-    }
-
-    public synchronized URLConnection openConnection(URL url)
-        throws IOException {
-        return openConnection(url, null);
-    }
-
-    public synchronized URLConnection openConnection(URL url, Proxy p)
-           throws IOException {
-
-        String path;
-        String file = url.getFile();
-        String host = url.getHost();
-
-        if (ikvm.internal.Util.WINDOWS) {
-            path = ParseUtil.decode(file);
-            path = path.replace('/', '\\');
-            path = path.replace('|', ':');
-        } else {
-            path = ParseUtil.decode(url.getPath());
-        }
-
-        if ((host == null) || host.equals("") ||
-                host.equalsIgnoreCase("localhost") ||
-                host.equals("~")) {
-           return createFileURLConnection(url, new File(path));
-        }
-
-        /*
-         * attempt to treat this as a UNC path. See 4180841
-         */
-        if (ikvm.internal.Util.WINDOWS) {
-            path = "\\\\" + host + path;
-            File f = new File(path);
-            if (f.exists()) {
-                return createFileURLConnection(url, f);
-            }
-        }
-
-        /*
-         * Now attempt an ftp connection.
-         */
-        URLConnection uc;
-        URL newurl;
-
-        try {
-            newurl = new URL("ftp", host, file +
-                            (url.getRef() == null ? "":
-                            "#" + url.getRef()));
-            if (p != null) {
-                uc = newurl.openConnection(p);
-            } else {
-                uc = newurl.openConnection();
-            }
-        } catch (IOException e) {
-            uc = null;
-        }
-        if (uc == null) {
-            throw new IOException("Unable to connect to: " +
-                                        url.toExternalForm());
-        }
-        return uc;
-    }
-
-    /**
-     * Template method to be overriden by Java Plug-in. [stanleyh]
-     */
-    protected URLConnection createFileURLConnection(URL url, File file) {
-        return new FileURLConnection(url, file);
-    }
-
-    /**
-     * Compares the host components of two URLs.
-     * @param u1 the URL of the first host to compare 
-     * @param u2 the URL of the second host to compare 
-     * @return  <tt>true</tt> if and only if they 
-     * are equal, <tt>false</tt> otherwise.
-     */
-    protected boolean hostsEqual(URL u1, URL u2) {
-        /*
-         * Special case for file: URLs
-         * per RFC 1738 no hostname is equivalent to 'localhost'
-         * i.e. file:///path is equal to file://localhost/path
-         */
-        String s1 = u1.getHost();
-        String s2 = u2.getHost();
-        if ("localhost".equalsIgnoreCase(s1) && ( s2 == null || "".equals(s2)))
-            return true;
-        if ("localhost".equalsIgnoreCase(s2) && ( s1 == null || "".equals(s1)))
-            return true;
-        return super.hostsEqual(u1, u2);
-    }
-}
diff --git a/openjdk/sun/net/www/protocol/ikvmres/Handler.java b/openjdk/sun/net/www/protocol/ikvmres/Handler.java
deleted file mode 100644
index 972ca315..00000000
--- a/openjdk/sun/net/www/protocol/ikvmres/Handler.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-  Copyright (C) 2007 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-
-package sun.net.www.protocol.ikvmres;
-
-public class Handler extends gnu.java.net.protocol.ikvmres.Handler
-{
-}
diff --git a/openjdk/sun/net/www/protocol/jar/JarFileFactory.java b/openjdk/sun/net/www/protocol/jar/JarFileFactory.java
deleted file mode 100644
index af9f676f..00000000
--- a/openjdk/sun/net/www/protocol/jar/JarFileFactory.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*IKVM*/
-/*
- * Modified for IKVM by Jeroen Frijters on May 22, 2007.
- * 
- * This is a merged version of the Windows & Solaris platform specific versions.
- * Since the IKVM class library binary can be used both on Windows and on *nix,
- * I've merged the platform specific classes into a generic class that at
- * runtime determines if it runs on Windows or not.
- * 
-/*IKVM*/
-
-package sun.net.www.protocol.jar;
-
-import java.io.IOException;
-import java.io.FileNotFoundException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.HashMap;
-import java.util.jar.JarFile;
-import java.security.Permission;
-import sun.net.util.URLUtil;
-
-/* A factory for cached JAR file. This class is used to both retrieve
- * and cache Jar files.
- *
- * @author Benjamin Renaud
- * @since JDK1.2
- */
-class JarFileFactory implements URLJarFile.URLJarFileCloseController {
-
-    /* the url to file cache */
-    private static HashMap<String, JarFile> fileCache = new HashMap<String, JarFile>();
-
-    /* the file to url cache */
-    private static HashMap<JarFile, URL> urlCache = new HashMap<JarFile, URL>();
-
-    URLConnection getConnection(JarFile jarFile) throws IOException {
-        URL u = urlCache.get(jarFile);
-        if (u != null)
-            return u.openConnection();
-
-        return null;
-    }
-
-    public JarFile get(URL url) throws IOException {
-        return get(url, true);
-    }
-
-    JarFile get(URL url, boolean useCaches) throws IOException {
-        if (ikvm.internal.Util.WINDOWS && url.getProtocol().equalsIgnoreCase("file")) {
-            // Deal with UNC pathnames specially. See 4180841
-
-            String host = url.getHost();
-            if (host != null && !host.equals("") &&
-                !host.equalsIgnoreCase("localhost")) {
-
-                url = new URL("file", "", "//" + host + url.getPath());
-            }
-        }
-
-        JarFile result = null;
-        JarFile local_result = null;
-
-        if (useCaches) {
-            synchronized (this) {
-                result = getCachedJarFile(url);
-            }
-            if (result == null) {
-                local_result = URLJarFile.getJarFile(url, this);
-                synchronized (this) {
-                    result = getCachedJarFile(url);
-                    if (result == null) {
-                        fileCache.put(URLUtil.urlNoFragString(url), local_result);
-                        urlCache.put(local_result, url);
-                        result = local_result;
-                    } else {
-                        if (local_result != null) {
-                            local_result.close();
-                        }
-                    }
-                }
-            }
-        } else {
-            result = URLJarFile.getJarFile(url, this);
-        }
-        if (result == null)
-            throw new FileNotFoundException(url.toString());
-
-        return result;
-    }
-
-    /**
-     * Callback method of the URLJarFileCloseController to
-     * indicate that the JarFile is close. This way we can
-     * remove the JarFile from the cache
-     */
-    public void close(JarFile jarFile) {
-        URL urlRemoved = urlCache.remove(jarFile);
-        if( urlRemoved != null) {
-                fileCache.remove(URLUtil.urlNoFragString(urlRemoved));
-        }
-    }
-
-    private JarFile getCachedJarFile(URL url) {
-        JarFile result = fileCache.get(URLUtil.urlNoFragString(url));
-
-        /* if the JAR file is cached, the permission will always be there */
-        if (result != null) {
-            Permission perm = getPermission(result);
-            if (perm != null) {
-                SecurityManager sm = System.getSecurityManager();
-                if (sm != null) {
-                    try {
-                        sm.checkPermission(perm);
-                    } catch (SecurityException se) {
-                        // fallback to checkRead/checkConnect for pre 1.2
-                        // security managers
-                        if ((perm instanceof java.io.FilePermission) &&
-                            perm.getActions().indexOf("read") != -1) {
-                            sm.checkRead(perm.getName());
-                        } else if ((perm instanceof
-                            java.net.SocketPermission) &&
-                            perm.getActions().indexOf("connect") != -1) {
-                            sm.checkConnect(url.getHost(), url.getPort());
-                        } else {
-                            throw se;
-                        }
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-    private Permission getPermission(JarFile jarFile) {
-        try {
-            URLConnection uc = (URLConnection)getConnection(jarFile);
-            if (uc != null)
-                return uc.getPermission();
-        } catch (IOException ioe) {
-            // gulp
-        }
-
-        return null;
-    }
-}
diff --git a/openjdk/sun/nio/ch/DatagramChannelImpl.java b/openjdk/sun/nio/ch/DatagramChannelImpl.java
deleted file mode 100644
index 08cc5c95..00000000
--- a/openjdk/sun/nio/ch/DatagramChannelImpl.java
+++ /dev/null
@@ -1,1113 +0,0 @@
-/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.nio.ch;
-
-import java.io.FileDescriptor;
-import java.io.IOException;
-import java.net.*;
-import java.nio.ByteBuffer;
-import java.nio.channels.*;
-import java.nio.channels.spi.*;
-import java.util.*;
-import sun.net.ResourceManager;
-
-
-/**
- * An implementation of DatagramChannels.
- */
-
-class DatagramChannelImpl
-    extends DatagramChannel
-    implements SelChImpl
-{
-
-    // Used to make native read and write calls
-    private static NativeDispatcher nd = new SocketDispatcher();
-
-    // Our file descriptor
-    private final FileDescriptor fd;
-
-    // fd value needed for dev/poll. This value will remain valid
-    // even after the value in the file descriptor object has been set to -1
-    private final int fdVal;
-
-    // The protocol family of the socket
-    private final ProtocolFamily family;
-
-    // IDs of native threads doing reads and writes, for signalling
-    private volatile long readerThread = 0;
-    private volatile long writerThread = 0;
-
-    // Cached InetAddress and port for unconnected DatagramChannels
-    // used by receive0
-    private InetAddress cachedSenderInetAddress;
-    private int cachedSenderPort;
-
-    // Lock held by current reading or connecting thread
-    private final Object readLock = new Object();
-
-    // Lock held by current writing or connecting thread
-    private final Object writeLock = new Object();
-
-    // Lock held by any thread that modifies the state fields declared below
-    // DO NOT invoke a blocking I/O operation while holding this lock!
-    private final Object stateLock = new Object();
-
-    // -- The following fields are protected by stateLock
-
-    // State (does not necessarily increase monotonically)
-    private static final int ST_UNINITIALIZED = -1;
-    private static final int ST_UNCONNECTED = 0;
-    private static final int ST_CONNECTED = 1;
-    private static final int ST_KILLED = 2;
-    private int state = ST_UNINITIALIZED;
-
-    // Binding
-    private InetSocketAddress localAddress;
-    private InetSocketAddress remoteAddress;
-
-    // Our socket adaptor, if any
-    private DatagramSocket socket;
-
-    // Multicast support
-    private MembershipRegistry registry;
-
-    // set true when socket is bound and SO_REUSEADDRESS is emulated
-    private boolean reuseAddressEmulated;
-
-    // set true/false when socket is already bound and SO_REUSEADDR is emulated
-    private boolean isReuseAddress;
-
-    // -- End of fields protected by stateLock
-
-
-    public DatagramChannelImpl(SelectorProvider sp)
-        throws IOException
-    {
-        super(sp);
-        ResourceManager.beforeUdpCreate();
-        try {
-            this.family = Net.isIPv6Available() ?
-                StandardProtocolFamily.INET6 : StandardProtocolFamily.INET;
-            this.fd = Net.socket(family, false);
-            this.fdVal = IOUtil.fdVal(fd);
-            this.state = ST_UNCONNECTED;
-        } catch (IOException ioe) {
-            ResourceManager.afterUdpClose();
-            throw ioe;
-        }
-    }
-
-    public DatagramChannelImpl(SelectorProvider sp, ProtocolFamily family)
-        throws IOException
-    {
-        super(sp);
-        if ((family != StandardProtocolFamily.INET) &&
-            (family != StandardProtocolFamily.INET6))
-        {
-            if (family == null)
-                throw new NullPointerException("'family' is null");
-            else
-                throw new UnsupportedOperationException("Protocol family not supported");
-        }
-        if (family == StandardProtocolFamily.INET6) {
-            if (!Net.isIPv6Available()) {
-                throw new UnsupportedOperationException("IPv6 not available");
-            }
-        }
-        this.family = family;
-        this.fd = Net.socket(family, false);
-        this.fdVal = IOUtil.fdVal(fd);
-        this.state = ST_UNCONNECTED;
-    }
-
-    public DatagramChannelImpl(SelectorProvider sp, FileDescriptor fd)
-        throws IOException
-    {
-        super(sp);
-        this.family = Net.isIPv6Available() ?
-            StandardProtocolFamily.INET6 : StandardProtocolFamily.INET;
-        this.fd = fd;
-        this.fdVal = IOUtil.fdVal(fd);
-        this.state = ST_UNCONNECTED;
-        this.localAddress = Net.localAddress(fd);
-    }
-
-    public DatagramSocket socket() {
-        synchronized (stateLock) {
-            if (socket == null)
-                socket = DatagramSocketAdaptor.create(this);
-            return socket;
-        }
-    }
-
-    @Override
-    public SocketAddress getLocalAddress() throws IOException {
-        synchronized (stateLock) {
-            if (!isOpen())
-                throw new ClosedChannelException();
-            return Net.getRevealedLocalAddress(localAddress);
-        }
-    }
-
-    @Override
-    public SocketAddress getRemoteAddress() throws IOException {
-        synchronized (stateLock) {
-            if (!isOpen())
-                throw new ClosedChannelException();
-            return remoteAddress;
-        }
-    }
-
-    @Override
-    public <T> DatagramChannel setOption(SocketOption<T> name, T value)
-        throws IOException
-    {
-        if (name == null)
-            throw new NullPointerException();
-        if (!supportedOptions().contains(name))
-            throw new UnsupportedOperationException("'" + name + "' not supported");
-
-        synchronized (stateLock) {
-            ensureOpen();
-
-            if (name == StandardSocketOptions.IP_TOS) {
-                // IPv4 only; no-op for IPv6
-                if (family == StandardProtocolFamily.INET) {
-                    Net.setSocketOption(fd, family, name, value);
-                }
-                return this;
-            }
-
-            if (name == StandardSocketOptions.IP_MULTICAST_TTL ||
-                name == StandardSocketOptions.IP_MULTICAST_LOOP)
-            {
-                // options are protocol dependent
-                Net.setSocketOption(fd, family, name, value);
-                return this;
-            }
-
-            if (name == StandardSocketOptions.IP_MULTICAST_IF) {
-                if (value == null)
-                    throw new IllegalArgumentException("Cannot set IP_MULTICAST_IF to 'null'");
-                NetworkInterface interf = (NetworkInterface)value;
-                if (family == StandardProtocolFamily.INET6) {
-                    int index = interf.getIndex();
-                    if (index == -1)
-                        throw new IOException("Network interface cannot be identified");
-                    Net.setInterface6(fd, index);
-                } else {
-                    // need IPv4 address to identify interface
-                    Inet4Address target = Net.anyInet4Address(interf);
-                    if (target == null)
-                        throw new IOException("Network interface not configured for IPv4");
-                    int targetAddress = Net.inet4AsInt(target);
-                    Net.setInterface4(fd, targetAddress);
-                }
-                return this;
-            }
-            if (name == StandardSocketOptions.SO_REUSEADDR &&
-                    Net.useExclusiveBind() && localAddress != null)
-            {
-                reuseAddressEmulated = true;
-                this.isReuseAddress = (Boolean)value;
-            }
-
-            // remaining options don't need any special handling
-            Net.setSocketOption(fd, Net.UNSPEC, name, value);
-            return this;
-        }
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public <T> T getOption(SocketOption<T> name)
-        throws IOException
-    {
-        if (name == null)
-            throw new NullPointerException();
-        if (!supportedOptions().contains(name))
-            throw new UnsupportedOperationException("'" + name + "' not supported");
-
-        synchronized (stateLock) {
-            ensureOpen();
-
-            if (name == StandardSocketOptions.IP_TOS) {
-                // IPv4 only; always return 0 on IPv6
-                if (family == StandardProtocolFamily.INET) {
-                    return (T) Net.getSocketOption(fd, family, name);
-                } else {
-                    return (T) Integer.valueOf(0);
-                }
-            }
-
-            if (name == StandardSocketOptions.IP_MULTICAST_TTL ||
-                name == StandardSocketOptions.IP_MULTICAST_LOOP)
-            {
-                return (T) Net.getSocketOption(fd, family, name);
-            }
-
-            if (name == StandardSocketOptions.IP_MULTICAST_IF) {
-                if (family == StandardProtocolFamily.INET) {
-                    int address = Net.getInterface4(fd);
-                    if (address == 0)
-                        return null;    // default interface
-
-                    InetAddress ia = Net.inet4FromInt(address);
-                    NetworkInterface ni = NetworkInterface.getByInetAddress(ia);
-                    if (ni == null)
-                        throw new IOException("Unable to map address to interface");
-                    return (T) ni;
-                } else {
-                    int index = Net.getInterface6(fd);
-                    if (index == 0)
-                        return null;    // default interface
-
-                    NetworkInterface ni = NetworkInterface.getByIndex(index);
-                    if (ni == null)
-                        throw new IOException("Unable to map index to interface");
-                    return (T) ni;
-                }
-            }
-
-            if (name == StandardSocketOptions.SO_REUSEADDR &&
-                    reuseAddressEmulated)
-            {
-                return (T)Boolean.valueOf(isReuseAddress);
-            }
-
-            // no special handling
-            return (T) Net.getSocketOption(fd, Net.UNSPEC, name);
-        }
-    }
-
-    private static class DefaultOptionsHolder {
-        static final Set<SocketOption<?>> defaultOptions = defaultOptions();
-
-        private static Set<SocketOption<?>> defaultOptions() {
-            HashSet<SocketOption<?>> set = new HashSet<SocketOption<?>>(8);
-            set.add(StandardSocketOptions.SO_SNDBUF);
-            set.add(StandardSocketOptions.SO_RCVBUF);
-            set.add(StandardSocketOptions.SO_REUSEADDR);
-            set.add(StandardSocketOptions.SO_BROADCAST);
-            set.add(StandardSocketOptions.IP_TOS);
-            set.add(StandardSocketOptions.IP_MULTICAST_IF);
-            set.add(StandardSocketOptions.IP_MULTICAST_TTL);
-            set.add(StandardSocketOptions.IP_MULTICAST_LOOP);
-            return Collections.unmodifiableSet(set);
-        }
-    }
-
-    @Override
-    public final Set<SocketOption<?>> supportedOptions() {
-        return DefaultOptionsHolder.defaultOptions;
-    }
-
-    private void ensureOpen() throws ClosedChannelException {
-        if (!isOpen())
-            throw new ClosedChannelException();
-    }
-
-    SocketAddress sender;       // Set by receive0 (## ugh)
-
-    public SocketAddress receive(ByteBuffer dst) throws IOException {
-        if (dst.isReadOnly())
-            throw new IllegalArgumentException("Read-only buffer");
-        if (dst == null)
-            throw new NullPointerException();
-        synchronized (readLock) {
-            ensureOpen();
-            // Socket was not bound before attempting receive
-            if (localAddress() == null)
-                bind(null);
-            int n = 0;
-            ByteBuffer bb = null;
-            try {
-                begin();
-                if (!isOpen())
-                    return null;
-                SecurityManager security = System.getSecurityManager();
-                readerThread = NativeThread.current();
-                if (isConnected() || (security == null)) {
-                    do {
-                        n = receive(fd, dst);
-                    } while ((n == IOStatus.INTERRUPTED) && isOpen());
-                    if (n == IOStatus.UNAVAILABLE)
-                        return null;
-                } else {
-                    bb = ByteBuffer.allocate(dst.remaining());
-                    for (;;) {
-                        do {
-                            n = receive(fd, bb);
-                        } while ((n == IOStatus.INTERRUPTED) && isOpen());
-                        if (n == IOStatus.UNAVAILABLE)
-                            return null;
-                        InetSocketAddress isa = (InetSocketAddress)sender;
-                        try {
-                            security.checkAccept(
-                                isa.getAddress().getHostAddress(),
-                                isa.getPort());
-                        } catch (SecurityException se) {
-                            // Ignore packet
-                            bb.clear();
-                            n = 0;
-                            continue;
-                        }
-                        bb.flip();
-                        dst.put(bb);
-                        break;
-                    }
-                }
-                return sender;
-            } finally {
-                readerThread = 0;
-                end((n > 0) || (n == IOStatus.UNAVAILABLE));
-                assert IOStatus.check(n);
-            }
-        }
-    }
-
-    private int receive(FileDescriptor fd, ByteBuffer dst)
-        throws IOException
-    {
-        int pos = dst.position();
-        int lim = dst.limit();
-        assert (pos <= lim);
-        int rem = (pos <= lim ? lim - pos : 0);
-        if (dst.hasArray() && rem > 0)
-            return receiveIntoManagedBuffer(fd, dst, rem, pos);
-
-        // Substitute a managed buffer. If the supplied buffer is empty
-        // we must instead use a nonempty buffer, otherwise the call
-        // will not block waiting for a datagram on some platforms.
-        int newSize = Math.max(rem, 1);
-        ByteBuffer bb = ByteBuffer.allocate(newSize);
-        try {
-            int n = receiveIntoManagedBuffer(fd, bb, newSize, 0);
-            bb.flip();
-            if (n > 0 && rem > 0)
-                dst.put(bb);
-            return n;
-        } finally {
-        }
-    }
-
-    private int receiveIntoManagedBuffer(FileDescriptor fd, ByteBuffer bb,
-                                        int rem, int pos)
-        throws IOException
-    {
-        int n = receive0(fd, bb.array(), bb.arrayOffset() + pos, rem,
-                         isConnected());
-        if (n > 0)
-            bb.position(pos + n);
-        return n;
-    }
-
-    public int send(ByteBuffer src, SocketAddress target)
-        throws IOException
-    {
-        if (src == null)
-            throw new NullPointerException();
-
-        synchronized (writeLock) {
-            ensureOpen();
-            InetSocketAddress isa = Net.checkAddress(target);
-            InetAddress ia = isa.getAddress();
-            if (ia == null)
-                throw new IOException("Target address not resolved");
-            synchronized (stateLock) {
-                if (!isConnected()) {
-                    if (target == null)
-                        throw new NullPointerException();
-                    SecurityManager sm = System.getSecurityManager();
-                    if (sm != null) {
-                        if (ia.isMulticastAddress()) {
-                            sm.checkMulticast(ia);
-                        } else {
-                            sm.checkConnect(ia.getHostAddress(),
-                                            isa.getPort());
-                        }
-                    }
-                } else { // Connected case; Check address then write
-                    if (!target.equals(remoteAddress)) {
-                        throw new IllegalArgumentException(
-                            "Connected address not equal to target address");
-                    }
-                    return write(src);
-                }
-            }
-
-            int n = 0;
-            try {
-                begin();
-                if (!isOpen())
-                    return 0;
-                writerThread = NativeThread.current();
-                do {
-                    n = send(fd, src, isa);
-                } while ((n == IOStatus.INTERRUPTED) && isOpen());
-
-                synchronized (stateLock) {
-                    if (isOpen() && (localAddress == null)) {
-                        localAddress = Net.localAddress(fd);
-                    }
-                }
-                return IOStatus.normalize(n);
-            } finally {
-                writerThread = 0;
-                end((n > 0) || (n == IOStatus.UNAVAILABLE));
-                assert IOStatus.check(n);
-            }
-        }
-    }
-
-    private int send(FileDescriptor fd, ByteBuffer src, InetSocketAddress target)
-        throws IOException
-    {
-        if (src.hasArray())
-            return sendFromManagedBuffer(fd, src, target);
-
-        // Substitute a managed buffer
-        int pos = src.position();
-        int lim = src.limit();
-        assert (pos <= lim);
-        int rem = (pos <= lim ? lim - pos : 0);
-
-        ByteBuffer bb = ByteBuffer.allocate(rem);
-        try {
-            bb.put(src);
-            bb.flip();
-            // Do not update src until we see how many bytes were written
-            src.position(pos);
-
-            int n = sendFromManagedBuffer(fd, bb, target);
-            if (n > 0) {
-                // now update src
-                src.position(pos + n);
-            }
-            return n;
-        } finally {
-        }
-    }
-
-    private int sendFromManagedBuffer(FileDescriptor fd, ByteBuffer bb,
-                                     InetSocketAddress target)
-        throws IOException
-    {
-        int pos = bb.position();
-        int lim = bb.limit();
-        assert (pos <= lim);
-        int rem = (pos <= lim ? lim - pos : 0);
-
-        boolean preferIPv6 = (family != StandardProtocolFamily.INET);
-        int written;
-        try {
-            written = send0(preferIPv6, fd, bb.array(), bb.arrayOffset() + pos,
-                            rem, target.getAddress(), target.getPort());
-        } catch (PortUnreachableException pue) {
-            if (isConnected())
-                throw pue;
-            written = rem;
-        }
-        if (written > 0)
-            bb.position(pos + written);
-        return written;
-    }
-
-    public int read(ByteBuffer buf) throws IOException {
-        if (buf == null)
-            throw new NullPointerException();
-        synchronized (readLock) {
-            synchronized (stateLock) {
-                ensureOpen();
-                if (!isConnected())
-                    throw new NotYetConnectedException();
-            }
-            int n = 0;
-            try {
-                begin();
-                if (!isOpen())
-                    return 0;
-                readerThread = NativeThread.current();
-                do {
-                    n = IOUtil.read(fd, buf, -1, nd, readLock);
-                } while ((n == IOStatus.INTERRUPTED) && isOpen());
-                return IOStatus.normalize(n);
-            } finally {
-                readerThread = 0;
-                end((n > 0) || (n == IOStatus.UNAVAILABLE));
-                assert IOStatus.check(n);
-            }
-        }
-    }
-
-    public long read(ByteBuffer[] dsts, int offset, int length)
-        throws IOException
-    {
-        if ((offset < 0) || (length < 0) || (offset > dsts.length - length))
-            throw new IndexOutOfBoundsException();
-        synchronized (readLock) {
-            synchronized (stateLock) {
-                ensureOpen();
-                if (!isConnected())
-                    throw new NotYetConnectedException();
-            }
-            long n = 0;
-            try {
-                begin();
-                if (!isOpen())
-                    return 0;
-                readerThread = NativeThread.current();
-                do {
-                    n = IOUtil.read(fd, dsts, offset, length, nd);
-                } while ((n == IOStatus.INTERRUPTED) && isOpen());
-                return IOStatus.normalize(n);
-            } finally {
-                readerThread = 0;
-                end((n > 0) || (n == IOStatus.UNAVAILABLE));
-                assert IOStatus.check(n);
-            }
-        }
-    }
-
-    public int write(ByteBuffer buf) throws IOException {
-        if (buf == null)
-            throw new NullPointerException();
-        synchronized (writeLock) {
-            synchronized (stateLock) {
-                ensureOpen();
-                if (!isConnected())
-                    throw new NotYetConnectedException();
-            }
-            int n = 0;
-            try {
-                begin();
-                if (!isOpen())
-                    return 0;
-                writerThread = NativeThread.current();
-                do {
-                    n = IOUtil.write(fd, buf, -1, nd, writeLock);
-                } while ((n == IOStatus.INTERRUPTED) && isOpen());
-                return IOStatus.normalize(n);
-            } finally {
-                writerThread = 0;
-                end((n > 0) || (n == IOStatus.UNAVAILABLE));
-                assert IOStatus.check(n);
-            }
-        }
-    }
-
-    public long write(ByteBuffer[] srcs, int offset, int length)
-        throws IOException
-    {
-        if ((offset < 0) || (length < 0) || (offset > srcs.length - length))
-            throw new IndexOutOfBoundsException();
-        synchronized (writeLock) {
-            synchronized (stateLock) {
-                ensureOpen();
-                if (!isConnected())
-                    throw new NotYetConnectedException();
-            }
-            long n = 0;
-            try {
-                begin();
-                if (!isOpen())
-                    return 0;
-                writerThread = NativeThread.current();
-                do {
-                    n = IOUtil.write(fd, srcs, offset, length, nd);
-                } while ((n == IOStatus.INTERRUPTED) && isOpen());
-                return IOStatus.normalize(n);
-            } finally {
-                writerThread = 0;
-                end((n > 0) || (n == IOStatus.UNAVAILABLE));
-                assert IOStatus.check(n);
-            }
-        }
-    }
-
-    protected void implConfigureBlocking(boolean block) throws IOException {
-        IOUtil.configureBlocking(fd, block);
-    }
-
-    public SocketAddress localAddress() {
-        synchronized (stateLock) {
-            return localAddress;
-        }
-    }
-
-    public SocketAddress remoteAddress() {
-        synchronized (stateLock) {
-            return remoteAddress;
-        }
-    }
-
-    @Override
-    public DatagramChannel bind(SocketAddress local) throws IOException {
-        synchronized (readLock) {
-            synchronized (writeLock) {
-                synchronized (stateLock) {
-                    ensureOpen();
-                    if (localAddress != null)
-                        throw new AlreadyBoundException();
-                    InetSocketAddress isa;
-                    if (local == null) {
-                        // only Inet4Address allowed with IPv4 socket
-                        if (family == StandardProtocolFamily.INET) {
-                            isa = new InetSocketAddress(InetAddress.getByName("0.0.0.0"), 0);
-                        } else {
-                            isa = new InetSocketAddress(0);
-                        }
-                    } else {
-                        isa = Net.checkAddress(local);
-
-                        // only Inet4Address allowed with IPv4 socket
-                        if (family == StandardProtocolFamily.INET) {
-                            InetAddress addr = isa.getAddress();
-                            if (!(addr instanceof Inet4Address))
-                                throw new UnsupportedAddressTypeException();
-                        }
-                    }
-                    SecurityManager sm = System.getSecurityManager();
-                    if (sm != null) {
-                        sm.checkListen(isa.getPort());
-                    }
-                    Net.bind(family, fd, isa.getAddress(), isa.getPort());
-                    localAddress = Net.localAddress(fd);
-                }
-            }
-        }
-        return this;
-    }
-
-    public boolean isConnected() {
-        synchronized (stateLock) {
-            return (state == ST_CONNECTED);
-        }
-    }
-
-    void ensureOpenAndUnconnected() throws IOException { // package-private
-        synchronized (stateLock) {
-            if (!isOpen())
-                throw new ClosedChannelException();
-            if (state != ST_UNCONNECTED)
-                throw new IllegalStateException("Connect already invoked");
-        }
-    }
-
-    @Override
-    public DatagramChannel connect(SocketAddress sa) throws IOException {
-        int localPort = 0;
-
-        synchronized(readLock) {
-            synchronized(writeLock) {
-                synchronized (stateLock) {
-                    ensureOpenAndUnconnected();
-                    InetSocketAddress isa = Net.checkAddress(sa);
-                    SecurityManager sm = System.getSecurityManager();
-                    if (sm != null)
-                        sm.checkConnect(isa.getAddress().getHostAddress(),
-                                        isa.getPort());
-                    int n = Net.connect(family,
-                                        fd,
-                                        isa.getAddress(),
-                                        isa.getPort());
-                    if (n <= 0)
-                        throw new Error();      // Can't happen
-
-                    // Connection succeeded; disallow further invocation
-                    state = ST_CONNECTED;
-                    remoteAddress = isa;
-                    sender = isa;
-                    cachedSenderInetAddress = isa.getAddress();
-                    cachedSenderPort = isa.getPort();
-
-                    // set or refresh local address
-                    localAddress = Net.localAddress(fd);
-                }
-            }
-        }
-        return this;
-    }
-
-    public DatagramChannel disconnect() throws IOException {
-        synchronized(readLock) {
-            synchronized(writeLock) {
-                synchronized (stateLock) {
-                    if (!isConnected() || !isOpen())
-                        return this;
-                    InetSocketAddress isa = remoteAddress;
-                    SecurityManager sm = System.getSecurityManager();
-                    if (sm != null)
-                        sm.checkConnect(isa.getAddress().getHostAddress(),
-                                        isa.getPort());
-                    boolean isIPv6 = (family == StandardProtocolFamily.INET6);
-                    disconnect0(fd, isIPv6);
-                    remoteAddress = null;
-                    state = ST_UNCONNECTED;
-
-                    // refresh local address
-                    localAddress = Net.localAddress(fd);
-                }
-            }
-        }
-        return this;
-    }
-
-    /**
-     * Joins channel's socket to the given group/interface and
-     * optional source address.
-     */
-    private MembershipKey innerJoin(InetAddress group,
-                                    NetworkInterface interf,
-                                    InetAddress source)
-        throws IOException
-    {
-        if (!group.isMulticastAddress())
-            throw new IllegalArgumentException("Group not a multicast address");
-
-        // check multicast address is compatible with this socket
-        if (group instanceof Inet4Address) {
-            if (family == StandardProtocolFamily.INET6 && !Net.canIPv6SocketJoinIPv4Group())
-                throw new IllegalArgumentException("IPv6 socket cannot join IPv4 multicast group");
-        } else if (group instanceof Inet6Address) {
-            if (family != StandardProtocolFamily.INET6)
-                throw new IllegalArgumentException("Only IPv6 sockets can join IPv6 multicast group");
-        } else {
-            throw new IllegalArgumentException("Address type not supported");
-        }
-
-        // check source address
-        if (source != null) {
-            if (source.isAnyLocalAddress())
-                throw new IllegalArgumentException("Source address is a wildcard address");
-            if (source.isMulticastAddress())
-                throw new IllegalArgumentException("Source address is multicast address");
-            if (source.getClass() != group.getClass())
-                throw new IllegalArgumentException("Source address is different type to group");
-        }
-
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null)
-            sm.checkMulticast(group);
-
-        synchronized (stateLock) {
-            if (!isOpen())
-                throw new ClosedChannelException();
-
-            // check the registry to see if we are already a member of the group
-            if (registry == null) {
-                registry = new MembershipRegistry();
-            } else {
-                // return existing membership key
-                MembershipKey key = registry.checkMembership(group, interf, source);
-                if (key != null)
-                    return key;
-            }
-
-            MembershipKeyImpl key;
-            if ((family == StandardProtocolFamily.INET6) &&
-                ((group instanceof Inet6Address) || Net.canJoin6WithIPv4Group()))
-            {
-                int index = interf.getIndex();
-                if (index == -1)
-                    throw new IOException("Network interface cannot be identified");
-
-                // need multicast and source address as byte arrays
-                byte[] groupAddress = Net.inet6AsByteArray(group);
-                byte[] sourceAddress = (source == null) ? null :
-                    Net.inet6AsByteArray(source);
-
-                // join the group
-                int n = Net.join6(fd, groupAddress, index, sourceAddress);
-                if (n == IOStatus.UNAVAILABLE)
-                    throw new UnsupportedOperationException();
-
-                key = new MembershipKeyImpl.Type6(this, group, interf, source,
-                                                  groupAddress, index, sourceAddress);
-
-            } else {
-                // need IPv4 address to identify interface
-                Inet4Address target = Net.anyInet4Address(interf);
-                if (target == null)
-                    throw new IOException("Network interface not configured for IPv4");
-
-                int groupAddress = Net.inet4AsInt(group);
-                int targetAddress = Net.inet4AsInt(target);
-                int sourceAddress = (source == null) ? 0 : Net.inet4AsInt(source);
-
-                // join the group
-                int n = Net.join4(fd, groupAddress, targetAddress, sourceAddress);
-                if (n == IOStatus.UNAVAILABLE)
-                    throw new UnsupportedOperationException();
-
-                key = new MembershipKeyImpl.Type4(this, group, interf, source,
-                                                  groupAddress, targetAddress, sourceAddress);
-            }
-
-            registry.add(key);
-            return key;
-        }
-    }
-
-    @Override
-    public MembershipKey join(InetAddress group,
-                              NetworkInterface interf)
-        throws IOException
-    {
-        return innerJoin(group, interf, null);
-    }
-
-    @Override
-    public MembershipKey join(InetAddress group,
-                              NetworkInterface interf,
-                              InetAddress source)
-        throws IOException
-    {
-        if (source == null)
-            throw new NullPointerException("source address is null");
-        return innerJoin(group, interf, source);
-    }
-
-    // package-private
-    void drop(MembershipKeyImpl key) {
-        assert key.channel() == this;
-
-        synchronized (stateLock) {
-            if (!key.isValid())
-                return;
-
-            try {
-                if (key instanceof MembershipKeyImpl.Type6) {
-                    MembershipKeyImpl.Type6 key6 =
-                        (MembershipKeyImpl.Type6)key;
-                    Net.drop6(fd, key6.groupAddress(), key6.index(), key6.source());
-                } else {
-                    MembershipKeyImpl.Type4 key4 = (MembershipKeyImpl.Type4)key;
-                    Net.drop4(fd, key4.groupAddress(), key4.interfaceAddress(),
-                        key4.source());
-                }
-            } catch (IOException ioe) {
-                // should not happen
-                throw new AssertionError(ioe);
-            }
-
-            key.invalidate();
-            registry.remove(key);
-        }
-    }
-
-    /**
-     * Block datagrams from given source if a memory to receive all
-     * datagrams.
-     */
-    void block(MembershipKeyImpl key, InetAddress source)
-        throws IOException
-    {
-        assert key.channel() == this;
-        assert key.sourceAddress() == null;
-
-        synchronized (stateLock) {
-            if (!key.isValid())
-                throw new IllegalStateException("key is no longer valid");
-            if (source.isAnyLocalAddress())
-                throw new IllegalArgumentException("Source address is a wildcard address");
-            if (source.isMulticastAddress())
-                throw new IllegalArgumentException("Source address is multicast address");
-            if (source.getClass() != key.group().getClass())
-                throw new IllegalArgumentException("Source address is different type to group");
-
-            int n;
-            if (key instanceof MembershipKeyImpl.Type6) {
-                 MembershipKeyImpl.Type6 key6 =
-                    (MembershipKeyImpl.Type6)key;
-                n = Net.block6(fd, key6.groupAddress(), key6.index(),
-                               Net.inet6AsByteArray(source));
-            } else {
-                MembershipKeyImpl.Type4 key4 =
-                    (MembershipKeyImpl.Type4)key;
-                n = Net.block4(fd, key4.groupAddress(), key4.interfaceAddress(),
-                               Net.inet4AsInt(source));
-            }
-            if (n == IOStatus.UNAVAILABLE) {
-                // ancient kernel
-                throw new UnsupportedOperationException();
-            }
-        }
-    }
-
-    /**
-     * Unblock given source.
-     */
-    void unblock(MembershipKeyImpl key, InetAddress source) {
-        assert key.channel() == this;
-        assert key.sourceAddress() == null;
-
-        synchronized (stateLock) {
-            if (!key.isValid())
-                throw new IllegalStateException("key is no longer valid");
-
-            try {
-                if (key instanceof MembershipKeyImpl.Type6) {
-                    MembershipKeyImpl.Type6 key6 =
-                        (MembershipKeyImpl.Type6)key;
-                    Net.unblock6(fd, key6.groupAddress(), key6.index(),
-                                 Net.inet6AsByteArray(source));
-                } else {
-                    MembershipKeyImpl.Type4 key4 =
-                        (MembershipKeyImpl.Type4)key;
-                    Net.unblock4(fd, key4.groupAddress(), key4.interfaceAddress(),
-                                 Net.inet4AsInt(source));
-                }
-            } catch (IOException ioe) {
-                // should not happen
-                throw new AssertionError(ioe);
-            }
-        }
-    }
-
-    protected void implCloseSelectableChannel() throws IOException {
-        synchronized (stateLock) {
-            if (state != ST_KILLED)
-                nd.preClose(fd);
-            ResourceManager.afterUdpClose();
-
-            // if member of mulitcast group then invalidate all keys
-            if (registry != null)
-                registry.invalidateAll();
-
-            long th;
-            if ((th = readerThread) != 0)
-                NativeThread.signal(th);
-            if ((th = writerThread) != 0)
-                NativeThread.signal(th);
-            if (!isRegistered())
-                kill();
-        }
-    }
-
-    public void kill() throws IOException {
-        synchronized (stateLock) {
-            if (state == ST_KILLED)
-                return;
-            if (state == ST_UNINITIALIZED) {
-                state = ST_KILLED;
-                return;
-            }
-            assert !isOpen() && !isRegistered();
-            nd.close(fd);
-            state = ST_KILLED;
-        }
-    }
-
-    /**
-     * Translates native poll revent set into a ready operation set
-     */
-    public boolean translateReadyOps(int ops, int initialOps,
-                                     SelectionKeyImpl sk) {
-        int intOps = sk.nioInterestOps(); // Do this just once, it synchronizes
-        int oldOps = sk.nioReadyOps();
-        int newOps = initialOps;
-
-        if ((ops & PollArrayWrapper.POLLNVAL) != 0) {
-            // This should only happen if this channel is pre-closed while a
-            // selection operation is in progress
-            // ## Throw an error if this channel has not been pre-closed
-            return false;
-        }
-
-        if ((ops & (PollArrayWrapper.POLLERR
-                    | PollArrayWrapper.POLLHUP)) != 0) {
-            newOps = intOps;
-            sk.nioReadyOps(newOps);
-            return (newOps & ~oldOps) != 0;
-        }
-
-        if (((ops & PollArrayWrapper.POLLIN) != 0) &&
-            ((intOps & SelectionKey.OP_READ) != 0))
-            newOps |= SelectionKey.OP_READ;
-
-        if (((ops & PollArrayWrapper.POLLOUT) != 0) &&
-            ((intOps & SelectionKey.OP_WRITE) != 0))
-            newOps |= SelectionKey.OP_WRITE;
-
-        sk.nioReadyOps(newOps);
-        return (newOps & ~oldOps) != 0;
-    }
-
-    public boolean translateAndUpdateReadyOps(int ops, SelectionKeyImpl sk) {
-        return translateReadyOps(ops, sk.nioReadyOps(), sk);
-    }
-
-    public boolean translateAndSetReadyOps(int ops, SelectionKeyImpl sk) {
-        return translateReadyOps(ops, 0, sk);
-    }
-
-    /**
-     * Translates an interest operation set into a native poll event set
-     */
-    public void translateAndSetInterestOps(int ops, SelectionKeyImpl sk) {
-        int newOps = 0;
-
-        if ((ops & SelectionKey.OP_READ) != 0)
-            newOps |= PollArrayWrapper.POLLIN;
-        if ((ops & SelectionKey.OP_WRITE) != 0)
-            newOps |= PollArrayWrapper.POLLOUT;
-        if ((ops & SelectionKey.OP_CONNECT) != 0)
-            newOps |= PollArrayWrapper.POLLIN;
-        sk.selector.putEventOps(sk, newOps);
-    }
-
-    public FileDescriptor getFD() {
-        return fd;
-    }
-
-    public int getFDVal() {
-        return fdVal;
-    }
-
-
-    // -- Native methods --
-
-    private static native void initIDs();
-
-    private static native void disconnect0(FileDescriptor fd, boolean isIPv6)
-        throws IOException;
-
-    private native int receive0(FileDescriptor fd, byte[] buf, int pos, int len,
-                                boolean connected)
-        throws IOException;
-
-    private native int send0(boolean preferIPv6, FileDescriptor fd, byte[] buf, int pos,
-                             int len, InetAddress addr, int port)
-        throws IOException;
-
-    static {
-        Util.load();
-        initIDs();
-    }
-
-}
diff --git a/openjdk/sun/nio/ch/DefaultSelectorProvider.java b/openjdk/sun/nio/ch/DefaultSelectorProvider.java
deleted file mode 100644
index 8c5cf037..00000000
--- a/openjdk/sun/nio/ch/DefaultSelectorProvider.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.nio.ch;
-
-import java.io.IOException;
-import java.nio.channels.spi.AbstractSelector;
-import java.nio.channels.spi.SelectorProvider;
-
-
-/**
- * Creates this platform's default SelectorProvider
- */
-
-public class DefaultSelectorProvider {
-
-    /**
-     * Prevent instantiation.
-     */
-    private DefaultSelectorProvider() { }
-
-    /**
-     * Returns the default SelectorProvider.
-     */
-    public static SelectorProvider create() {
-        return new SelectorProviderImpl() {
-            public AbstractSelector openSelector() throws IOException {
-                return new DotNetSelectorImpl(this);
-            }
-        };
-    }
-
-}
diff --git a/openjdk/sun/nio/ch/DotNetSelectorImpl.java b/openjdk/sun/nio/ch/DotNetSelectorImpl.java
deleted file mode 100644
index 897cf9a1..00000000
--- a/openjdk/sun/nio/ch/DotNetSelectorImpl.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-// Parts Copyright (C) 2002-2007 Jeroen Frijters
-
-package sun.nio.ch;
-
-import cli.System.Net.Sockets.Socket;
-import cli.System.Net.Sockets.SocketException;
-import cli.System.Net.Sockets.AddressFamily;
-import cli.System.Net.Sockets.SocketType;
-import cli.System.Net.Sockets.ProtocolType;
-import cli.System.Net.Sockets.SelectMode;
-import cli.System.Collections.ArrayList;
-import java.io.IOException;
-import java.nio.channels.ClosedSelectorException;
-import java.nio.channels.Pipe;
-import java.nio.channels.SelectableChannel;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.nio.channels.spi.AbstractSelectableChannel;
-import java.nio.channels.spi.AbstractSelector;
-import java.nio.channels.spi.SelectorProvider;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-final class DotNetSelectorImpl extends SelectorImpl
-{
-    private ArrayList channelArray = new ArrayList();
-    private long updateCount = 0;
-
-    //Pipe used as a wakeup object.
-    private final Pipe wakeupPipe;
-
-    // File descriptors corresponding to source and sink
-    private final Socket wakeupSourceFd, wakeupSinkFd;
-
-    // Lock for interrupt triggering and clearing
-    private final Object interruptLock = new Object();
-    private volatile boolean interruptTriggered = false;
-
-    // class for fdMap entries
-    private final static class MapEntry
-    {
-        SelectionKeyImpl ski;
-        long updateCount = 0;
-        long clearedCount = 0;
-        MapEntry(SelectionKeyImpl ski)
-        {
-            this.ski = ski;
-        }
-    }
-    private final HashMap<Socket, MapEntry> fdMap = new HashMap<Socket, MapEntry>();
-
-    DotNetSelectorImpl(SelectorProvider sp) throws IOException
-    {
-        super(sp);
-        wakeupPipe = Pipe.open();
-        wakeupSourceFd = ((SelChImpl)wakeupPipe.source()).getFD().getSocket();
-
-        // Disable the Nagle algorithm so that the wakeup is more immediate
-        SinkChannelImpl sink = (SinkChannelImpl)wakeupPipe.sink();
-        (sink.sc).socket().setTcpNoDelay(true);
-        wakeupSinkFd = ((SelChImpl)sink).getFD().getSocket();
-    }
-
-    protected int doSelect(long timeout) throws IOException
-    {
-        if (channelArray == null)
-            throw new ClosedSelectorException();
-        processDeregisterQueue();
-        if (interruptTriggered)
-        {
-            resetWakeupSocket();
-            return 0;
-        }
-
-        ArrayList read = new ArrayList();
-        ArrayList write = new ArrayList();
-        ArrayList error = new ArrayList();
-        for (int i = 0; i < channelArray.get_Count(); i++)
-        {
-            SelectionKeyImpl ski = (SelectionKeyImpl)channelArray.get_Item(i);
-            int ops = ski.interestOps();
-            if (ski.channel() instanceof SocketChannelImpl)
-            {
-                // TODO there's a race condition here...
-                if (((SocketChannelImpl)ski.channel()).isConnected())
-                {
-                    ops &= SelectionKey.OP_READ | SelectionKey.OP_WRITE;
-                }
-                else
-                {
-                    ops &= SelectionKey.OP_CONNECT;
-                }
-            }
-            if ((ops & (SelectionKey.OP_READ | SelectionKey.OP_ACCEPT)) != 0)
-            {
-                read.Add(ski.getSocket());
-            }
-            if ((ops & (SelectionKey.OP_WRITE | SelectionKey.OP_CONNECT)) != 0)
-            {
-                write.Add(ski.getSocket());
-            }
-            if ((ops & SelectionKey.OP_CONNECT) != 0)
-            {
-                error.Add(ski.getSocket());
-            }
-        }
-        read.Add(wakeupSourceFd);
-        try
-        {
-            begin();
-            int microSeconds = 1000 * (int)Math.min(Integer.MAX_VALUE / 1000, timeout);
-            try
-            {
-                if (false) throw new SocketException();
-                // FXBUG docs say that -1 is infinite timeout, but that doesn't appear to work
-                Socket.Select(read, write, error, timeout < 0 ? Integer.MAX_VALUE : microSeconds);
-            }
-            catch (SocketException _)
-            {
-                read.Clear();
-                write.Clear();
-                error.Clear();
-            }
-        }
-        finally
-        {
-            end();
-        }
-        processDeregisterQueue();
-        int updated = updateSelectedKeys(read, write, error);
-        // Done with poll(). Set wakeupSocket to nonsignaled  for the next run.
-        resetWakeupSocket();
-        return updated;
-    }
-
-    private int updateSelectedKeys(ArrayList read, ArrayList write, ArrayList error)
-    {
-        updateCount++;
-        int keys = processFDSet(updateCount, read, PollArrayWrapper.POLLIN);
-        keys += processFDSet(updateCount, write, PollArrayWrapper.POLLCONN | PollArrayWrapper.POLLOUT);
-        keys += processFDSet(updateCount, error, PollArrayWrapper.POLLIN | PollArrayWrapper.POLLCONN | PollArrayWrapper.POLLOUT);
-        return keys;
-    }
-
-    private int processFDSet(long updateCount, ArrayList sockets, int rOps)
-    {
-        int numKeysUpdated = 0;
-        for (int i = 0; i < sockets.get_Count(); i++)
-        {
-            Socket desc = (Socket)sockets.get_Item(i);
-            if (desc == wakeupSourceFd)
-            {
-                synchronized (interruptLock)
-                {
-                    interruptTriggered = true;
-                }
-                continue;
-            }
-            MapEntry me = fdMap.get(desc);
-            // If me is null, the key was deregistered in the previous
-            // processDeregisterQueue.
-            if (me == null)
-                continue;
-            SelectionKeyImpl sk = me.ski;
-            if (selectedKeys.contains(sk))
-            { // Key in selected set
-                if (me.clearedCount != updateCount)
-                {
-                    if (sk.channel.translateAndSetReadyOps(rOps, sk) &&
-                        (me.updateCount != updateCount))
-                    {
-                        me.updateCount = updateCount;
-                        numKeysUpdated++;
-                    }
-                }
-                else
-                { // The readyOps have been set; now add
-                    if (sk.channel.translateAndUpdateReadyOps(rOps, sk) &&
-                        (me.updateCount != updateCount))
-                    {
-                        me.updateCount = updateCount;
-                        numKeysUpdated++;
-                    }
-                }
-                me.clearedCount = updateCount;
-            }
-            else
-            { // Key is not in selected set yet
-                if (me.clearedCount != updateCount)
-                {
-                    sk.channel.translateAndSetReadyOps(rOps, sk);
-                    if ((sk.nioReadyOps() & sk.nioInterestOps()) != 0)
-                    {
-                        selectedKeys.add(sk);
-                        me.updateCount = updateCount;
-                        numKeysUpdated++;
-                    }
-                }
-                else
-                { // The readyOps have been set; now add
-                    sk.channel.translateAndUpdateReadyOps(rOps, sk);
-                    if ((sk.nioReadyOps() & sk.nioInterestOps()) != 0)
-                    {
-                        selectedKeys.add(sk);
-                        me.updateCount = updateCount;
-                        numKeysUpdated++;
-                    }
-                }
-                me.clearedCount = updateCount;
-            }
-        }
-        return numKeysUpdated;
-    }
-
-    protected void implClose() throws IOException
-    {
-        if (channelArray != null)
-        {
-            // prevent further wakeup
-            synchronized (interruptLock) {
-                interruptTriggered = true;
-            }
-            wakeupPipe.sink().close();
-            wakeupPipe.source().close();
-            for (int i = 0; i < channelArray.get_Count(); i++)
-            { // Deregister channels
-                SelectionKeyImpl ski = (SelectionKeyImpl)channelArray.get_Item(i);
-                deregister(ski);
-                SelectableChannel selch = ski.channel();
-                if (!selch.isOpen() && !selch.isRegistered())
-                    ((SelChImpl)selch).kill();
-            }
-            selectedKeys = null;
-            channelArray = null;
-        }
-    }
-
-    protected void implRegister(SelectionKeyImpl ski)
-    {
-        channelArray.Add(ski);
-        fdMap.put(ski.getSocket(), new MapEntry(ski));
-        keys.add(ski);
-    }
-
-    protected void implDereg(SelectionKeyImpl ski) throws IOException
-    {
-        channelArray.Remove(ski);
-        fdMap.remove(ski.getSocket());
-        keys.remove(ski);
-        selectedKeys.remove(ski);
-        deregister(ski);
-        SelectableChannel selch = ski.channel();
-        if (!selch.isOpen() && !selch.isRegistered())
-        {
-            ((SelChImpl)selch).kill();
-        }
-    }
-
-    public Selector wakeup()
-    {
-        synchronized (interruptLock)
-        {
-            if (!interruptTriggered)
-            {
-                setWakeupSocket();
-                interruptTriggered = true;
-            }
-        }
-        return this;
-    }
-
-    // Sets Windows wakeup socket to a signaled state.
-    private void setWakeupSocket() {
-        wakeupSinkFd.Send(new byte[1]);
-    }
-
-    // Sets Windows wakeup socket to a non-signaled state.
-    private void resetWakeupSocket() {
-        synchronized (interruptLock)
-        {
-            if (interruptTriggered == false)
-                return;
-            resetWakeupSocket0(wakeupSourceFd);
-            interruptTriggered = false;
-        }
-    }
-
-    private static void resetWakeupSocket0(Socket wakeupSourceFd)
-    {
-        while (wakeupSourceFd.get_Available() > 0)
-        {
-            wakeupSourceFd.Receive(new byte[1]);
-        }
-    }
-}
diff --git a/openjdk/sun/nio/ch/FileChannelImpl.java b/openjdk/sun/nio/ch/FileChannelImpl.java
deleted file mode 100644
index 902509bd..00000000
--- a/openjdk/sun/nio/ch/FileChannelImpl.java
+++ /dev/null
@@ -1,1104 +0,0 @@
-/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.nio.ch;
-
-import cli.Microsoft.Win32.SafeHandles.SafeFileHandle;
-import cli.System.IntPtr;
-import cli.System.IO.FileStream;
-import cli.System.Runtime.InteropServices.DllImportAttribute;
-import java.io.FileDescriptor;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.MappedByteBuffer;
-import java.nio.channels.*;
-import java.util.ArrayList;
-import java.util.List;
-import java.security.AccessController;
-import sun.misc.Cleaner;
-import sun.misc.IoTrace;
-import sun.security.action.GetPropertyAction;
-
-public class FileChannelImpl
-    extends FileChannel
-{
-    private static final boolean win32 = ikvm.internal.Util.WINDOWS;
-
-    // Memory allocation size for mapping buffers
-    private static final long allocationGranularity = 64 * 1024;    // HACK we're using a hard coded value here that works on all mainstream platforms
-
-    // Used to make native read and write calls
-    private final FileDispatcher nd;
-
-    // File descriptor
-    private final FileDescriptor fd;
-
-    // File access mode (immutable)
-    private final boolean writable;
-    private final boolean readable;
-    private final boolean append;
-
-    // Required to prevent finalization of creating stream (immutable)
-    private final Object parent;
-
-    // The path of the referenced file (null if the parent stream is created with a file descriptor)
-    private final String path;
-
-    // Thread-safe set of IDs of native threads, for signalling
-    private final NativeThreadSet threads = new NativeThreadSet(2);
-
-    // Lock for operations involving position and size
-    private final Object positionLock = new Object();
-
-    private FileChannelImpl(FileDescriptor fd, String path, boolean readable,
-                            boolean writable, boolean append, Object parent)
-    {
-        this.fd = fd;
-        this.readable = readable;
-        this.writable = writable;
-        this.append = append;
-        this.parent = parent;
-        this.path = path;
-        this.nd = new FileDispatcherImpl(append);
-    }
-
-    // Used by FileInputStream.getChannel() and RandomAccessFile.getChannel()
-    public static FileChannel open(FileDescriptor fd, String path,
-                                   boolean readable, boolean writable,
-                                   Object parent)
-    {
-        return new FileChannelImpl(fd, path, readable, writable, false, parent);
-    }
-
-    // Used by FileOutputStream.getChannel
-    public static FileChannel open(FileDescriptor fd, String path,
-                                   boolean readable, boolean writable,
-                                   boolean append, Object parent)
-    {
-        return new FileChannelImpl(fd, path, readable, writable, append, parent);
-    }
-
-    private void ensureOpen() throws IOException {
-        if (!isOpen())
-            throw new ClosedChannelException();
-    }
-
-
-    // -- Standard channel operations --
-
-    protected void implCloseChannel() throws IOException {
-        // Release and invalidate any locks that we still hold
-        if (fileLockTable != null) {
-            for (FileLock fl: fileLockTable.removeAll()) {
-                synchronized (fl) {
-                    if (fl.isValid()) {
-                        nd.release(fd, fl.position(), fl.size());
-                        ((FileLockImpl)fl).invalidate();
-                    }
-                }
-            }
-        }
-
-        nd.preClose(fd);
-        threads.signalAndWait();
-
-        if (parent != null) {
-
-            // Close the fd via the parent stream's close method.  The parent
-            // will reinvoke our close method, which is defined in the
-            // superclass AbstractInterruptibleChannel, but the isOpen logic in
-            // that method will prevent this method from being reinvoked.
-            //
-            ((java.io.Closeable)parent).close();
-        } else {
-            nd.close(fd);
-        }
-
-    }
-
-    public int read(ByteBuffer dst) throws IOException {
-        ensureOpen();
-        if (!readable)
-            throw new NonReadableChannelException();
-        synchronized (positionLock) {
-            int n = 0;
-            int ti = -1;
-            Object traceContext = IoTrace.fileReadBegin(path);
-            try {
-                begin();
-                ti = threads.add();
-                if (!isOpen())
-                    return 0;
-                do {
-                    n = IOUtil.read(fd, dst, -1, nd, positionLock);
-                } while ((n == IOStatus.INTERRUPTED) && isOpen());
-                return IOStatus.normalize(n);
-            } finally {
-                threads.remove(ti);
-                IoTrace.fileReadEnd(traceContext, n > 0 ? n : 0);
-                end(n > 0);
-                assert IOStatus.check(n);
-            }
-        }
-    }
-
-    public long read(ByteBuffer[] dsts, int offset, int length)
-        throws IOException
-    {
-        if ((offset < 0) || (length < 0) || (offset > dsts.length - length))
-            throw new IndexOutOfBoundsException();
-        ensureOpen();
-        if (!readable)
-            throw new NonReadableChannelException();
-        synchronized (positionLock) {
-            long n = 0;
-            int ti = -1;
-            Object traceContext = IoTrace.fileReadBegin(path);
-            try {
-                begin();
-                ti = threads.add();
-                if (!isOpen())
-                    return 0;
-                do {
-                    n = IOUtil.read(fd, dsts, offset, length, nd);
-                } while ((n == IOStatus.INTERRUPTED) && isOpen());
-                return IOStatus.normalize(n);
-            } finally {
-                threads.remove(ti);
-                IoTrace.fileReadEnd(traceContext, n > 0 ? n : 0);
-                end(n > 0);
-                assert IOStatus.check(n);
-            }
-        }
-    }
-
-    public int write(ByteBuffer src) throws IOException {
-        ensureOpen();
-        if (!writable)
-            throw new NonWritableChannelException();
-        synchronized (positionLock) {
-            int n = 0;
-            int ti = -1;
-            Object traceContext = IoTrace.fileWriteBegin(path);
-            try {
-                begin();
-                ti = threads.add();
-                if (!isOpen())
-                    return 0;
-                do {
-                    n = IOUtil.write(fd, src, -1, nd, positionLock);
-                } while ((n == IOStatus.INTERRUPTED) && isOpen());
-                return IOStatus.normalize(n);
-            } finally {
-                threads.remove(ti);
-                end(n > 0);
-                IoTrace.fileWriteEnd(traceContext, n > 0 ? n : 0);
-                assert IOStatus.check(n);
-            }
-        }
-    }
-
-    public long write(ByteBuffer[] srcs, int offset, int length)
-        throws IOException
-    {
-        if ((offset < 0) || (length < 0) || (offset > srcs.length - length))
-            throw new IndexOutOfBoundsException();
-        ensureOpen();
-        if (!writable)
-            throw new NonWritableChannelException();
-        synchronized (positionLock) {
-            long n = 0;
-            int ti = -1;
-            Object traceContext = IoTrace.fileWriteBegin(path);
-            try {
-                begin();
-                ti = threads.add();
-                if (!isOpen())
-                    return 0;
-                do {
-                    n = IOUtil.write(fd, srcs, offset, length, nd);
-                } while ((n == IOStatus.INTERRUPTED) && isOpen());
-                return IOStatus.normalize(n);
-            } finally {
-                threads.remove(ti);
-                IoTrace.fileWriteEnd(traceContext, n > 0 ? n : 0);
-                end(n > 0);
-                assert IOStatus.check(n);
-            }
-        }
-    }
-
-    // -- Other operations --
-
-    public long position() throws IOException {
-        ensureOpen();
-        synchronized (positionLock) {
-            long p = -1;
-            int ti = -1;
-            try {
-                begin();
-                ti = threads.add();
-                if (!isOpen())
-                    return 0;
-                do {
-                    // in append-mode then position is advanced to end before writing
-                    p = (append) ? nd.size(fd) : position0(fd, -1);
-                } while ((p == IOStatus.INTERRUPTED) && isOpen());
-                return IOStatus.normalize(p);
-            } finally {
-                threads.remove(ti);
-                end(p > -1);
-                assert IOStatus.check(p);
-            }
-        }
-    }
-
-    public FileChannel position(long newPosition) throws IOException {
-        ensureOpen();
-        if (newPosition < 0)
-            throw new IllegalArgumentException();
-        synchronized (positionLock) {
-            long p = -1;
-            int ti = -1;
-            try {
-                begin();
-                ti = threads.add();
-                if (!isOpen())
-                    return null;
-                do {
-                    p  = position0(fd, newPosition);
-                } while ((p == IOStatus.INTERRUPTED) && isOpen());
-                return this;
-            } finally {
-                threads.remove(ti);
-                end(p > -1);
-                assert IOStatus.check(p);
-            }
-        }
-    }
-
-    public long size() throws IOException {
-        ensureOpen();
-        synchronized (positionLock) {
-            long s = -1;
-            int ti = -1;
-            try {
-                begin();
-                ti = threads.add();
-                if (!isOpen())
-                    return -1;
-                do {
-                    s = nd.size(fd);
-                } while ((s == IOStatus.INTERRUPTED) && isOpen());
-                return IOStatus.normalize(s);
-            } finally {
-                threads.remove(ti);
-                end(s > -1);
-                assert IOStatus.check(s);
-            }
-        }
-    }
-
-    public FileChannel truncate(long size) throws IOException {
-        ensureOpen();
-        if (size < 0)
-            throw new IllegalArgumentException();
-        if (size > size())
-            return this;
-        if (!writable)
-            throw new NonWritableChannelException();
-        synchronized (positionLock) {
-            int rv = -1;
-            long p = -1;
-            int ti = -1;
-            try {
-                begin();
-                ti = threads.add();
-                if (!isOpen())
-                    return null;
-
-                // get current position
-                do {
-                    p = position0(fd, -1);
-                } while ((p == IOStatus.INTERRUPTED) && isOpen());
-                if (!isOpen())
-                    return null;
-                assert p >= 0;
-
-                // truncate file
-                do {
-                    rv = nd.truncate(fd, size);
-                } while ((rv == IOStatus.INTERRUPTED) && isOpen());
-                if (!isOpen())
-                    return null;
-
-                // [IKVM] in append mode we're not allowed to seek backwards, but the atomic append will honor the new file size
-                if (append)
-                    return this;
-
-                // set position to size if greater than size
-                if (p > size)
-                    p = size;
-                do {
-                    rv = (int)position0(fd, p);
-                } while ((rv == IOStatus.INTERRUPTED) && isOpen());
-                return this;
-            } finally {
-                threads.remove(ti);
-                end(rv > -1);
-                assert IOStatus.check(rv);
-            }
-        }
-    }
-
-    public void force(boolean metaData) throws IOException {
-        ensureOpen();
-        int rv = -1;
-        int ti = -1;
-        try {
-            begin();
-            ti = threads.add();
-            if (!isOpen())
-                return;
-            do {
-                rv = nd.force(fd, metaData);
-            } while ((rv == IOStatus.INTERRUPTED) && isOpen());
-        } finally {
-            threads.remove(ti);
-            end(rv > -1);
-            assert IOStatus.check(rv);
-        }
-    }
-
-    private long transferToArbitraryChannel(long position, int icount,
-                                            WritableByteChannel target)
-        throws IOException
-    {
-        // Untrusted target: Use a newly-erased buffer
-        int c = Math.min(icount, TRANSFER_SIZE);
-        ByteBuffer bb = ByteBuffer.allocate(c);
-        long tw = 0;                    // Total bytes written
-        long pos = position;
-        try {
-            while (tw < icount) {
-                bb.limit(Math.min((int)(icount - tw), TRANSFER_SIZE));
-                int nr = read(bb, pos);
-                if (nr <= 0)
-                    break;
-                bb.flip();
-                // ## Bug: Will block writing target if this channel
-                // ##      is asynchronously closed
-                int nw = target.write(bb);
-                tw += nw;
-                if (nw != nr)
-                    break;
-                pos += nw;
-                bb.clear();
-            }
-            return tw;
-        } catch (IOException x) {
-            if (tw > 0)
-                return tw;
-            throw x;
-        }
-    }
-
-    public long transferTo(long position, long count,
-                           WritableByteChannel target)
-        throws IOException
-    {
-        ensureOpen();
-        if (!target.isOpen())
-            throw new ClosedChannelException();
-        if (!readable)
-            throw new NonReadableChannelException();
-        if (target instanceof FileChannelImpl &&
-            !((FileChannelImpl)target).writable)
-            throw new NonWritableChannelException();
-        if ((position < 0) || (count < 0))
-            throw new IllegalArgumentException();
-        long sz = size();
-        if (position > sz)
-            return 0;
-        int icount = (int)Math.min(count, Integer.MAX_VALUE);
-        if ((sz - position) < icount)
-            icount = (int)(sz - position);
-
-        // Slow path for untrusted targets
-        return transferToArbitraryChannel(position, icount, target);
-    }
-
-    private long transferFromFileChannel(FileChannelImpl src,
-                                         long position, long count)
-        throws IOException
-    {
-        if (!src.readable)
-            throw new NonReadableChannelException();
-        return transferFromArbitraryChannel(src, position, count);
-    }
-
-    private static final int TRANSFER_SIZE = 8192;
-
-    private long transferFromArbitraryChannel(ReadableByteChannel src,
-                                              long position, long count)
-        throws IOException
-    {
-        // Untrusted target: Use a newly-erased buffer
-        int c = (int)Math.min(count, TRANSFER_SIZE);
-        ByteBuffer bb = ByteBuffer.allocate(c);
-        long tw = 0;                    // Total bytes written
-        long pos = position;
-        try {
-            while (tw < count) {
-                bb.limit((int)Math.min((count - tw), (long)TRANSFER_SIZE));
-                // ## Bug: Will block reading src if this channel
-                // ##      is asynchronously closed
-                int nr = src.read(bb);
-                if (nr <= 0)
-                    break;
-                bb.flip();
-                int nw = write(bb, pos);
-                tw += nw;
-                if (nw != nr)
-                    break;
-                pos += nw;
-                bb.clear();
-            }
-            return tw;
-        } catch (IOException x) {
-            if (tw > 0)
-                return tw;
-            throw x;
-        }
-    }
-
-    public long transferFrom(ReadableByteChannel src,
-                             long position, long count)
-        throws IOException
-    {
-        ensureOpen();
-        if (!src.isOpen())
-            throw new ClosedChannelException();
-        if (!writable)
-            throw new NonWritableChannelException();
-        if ((position < 0) || (count < 0))
-            throw new IllegalArgumentException();
-        if (position > size())
-            return 0;
-        if (src instanceof FileChannelImpl)
-           return transferFromFileChannel((FileChannelImpl)src,
-                                          position, count);
-
-        return transferFromArbitraryChannel(src, position, count);
-    }
-
-    public int read(ByteBuffer dst, long position) throws IOException {
-        if (dst == null)
-            throw new NullPointerException();
-        if (position < 0)
-            throw new IllegalArgumentException("Negative position");
-        if (!readable)
-            throw new NonReadableChannelException();
-        ensureOpen();
-        int n = 0;
-        int ti = -1;
-        Object traceContext = IoTrace.fileReadBegin(path);
-        try {
-            begin();
-            ti = threads.add();
-            if (!isOpen())
-                return -1;
-            do {
-                n = IOUtil.read(fd, dst, position, nd, positionLock);
-            } while ((n == IOStatus.INTERRUPTED) && isOpen());
-            return IOStatus.normalize(n);
-        } finally {
-            threads.remove(ti);
-            IoTrace.fileReadEnd(traceContext, n > 0 ? n : 0);
-            end(n > 0);
-            assert IOStatus.check(n);
-        }
-    }
-
-    public int write(ByteBuffer src, long position) throws IOException {
-        if (src == null)
-            throw new NullPointerException();
-        if (position < 0)
-            throw new IllegalArgumentException("Negative position");
-        if (!writable)
-            throw new NonWritableChannelException();
-        ensureOpen();
-        int n = 0;
-        int ti = -1;
-        Object traceContext = IoTrace.fileWriteBegin(path);
-        try {
-            begin();
-            ti = threads.add();
-            if (!isOpen())
-                return -1;
-            do {
-                n = IOUtil.write(fd, src, position, nd, positionLock);
-            } while ((n == IOStatus.INTERRUPTED) && isOpen());
-            return IOStatus.normalize(n);
-        } finally {
-            threads.remove(ti);
-            end(n > 0);
-            IoTrace.fileWriteEnd(traceContext, n > 0 ? n : 0);
-            assert IOStatus.check(n);
-        }
-    }
-
-
-    // -- Memory-mapped buffers --
-
-    private static class Unmapper
-        implements Runnable
-    {
-        // may be required to close file
-        private static final NativeDispatcher nd = new FileDispatcherImpl();
-
-        // keep track of mapped buffer usage
-        static volatile int count;
-        static volatile long totalSize;
-        static volatile long totalCapacity;
-
-        private volatile long address;
-        private final long size;
-        private final int cap;
-        private final FileDescriptor fd;
-
-        private Unmapper(long address, long size, int cap,
-                         FileDescriptor fd)
-        {
-            assert (address != 0);
-            this.address = address;
-            this.size = size;
-            this.cap = cap;
-            this.fd = fd;
-
-            synchronized (Unmapper.class) {
-                count++;
-                totalSize += size;
-                totalCapacity += cap;
-            }
-        }
-
-        public void run() {
-            if (address == 0)
-                return;
-            unmap0(address, size);
-            address = 0;
-
-            // if this mapping has a valid file descriptor then we close it
-            if (fd.valid()) {
-                try {
-                    nd.close(fd);
-                } catch (IOException ignore) {
-                    // nothing we can do
-                }
-            }
-
-            synchronized (Unmapper.class) {
-                count--;
-                totalSize -= size;
-                totalCapacity -= cap;
-            }
-        }
-    }
-
-    private static void unmap(MappedByteBuffer bb) {
-        Cleaner cl = ((DirectBuffer)bb).cleaner();
-        if (cl != null)
-            cl.clean();
-    }
-
-    private static final int MAP_RO = 0;
-    private static final int MAP_RW = 1;
-    private static final int MAP_PV = 2;
-
-    public MappedByteBuffer map(MapMode mode, long position, long size)
-        throws IOException
-    {
-        ensureOpen();
-        if (position < 0L)
-            throw new IllegalArgumentException("Negative position");
-        if (size < 0L)
-            throw new IllegalArgumentException("Negative size");
-        if (position + size < 0)
-            throw new IllegalArgumentException("Position + size overflow");
-        if (size > Integer.MAX_VALUE)
-            throw new IllegalArgumentException("Size exceeds Integer.MAX_VALUE");
-        int imode = -1;
-        if (mode == MapMode.READ_ONLY)
-            imode = MAP_RO;
-        else if (mode == MapMode.READ_WRITE)
-            imode = MAP_RW;
-        else if (mode == MapMode.PRIVATE)
-            imode = MAP_PV;
-        assert (imode >= 0);
-        if ((mode != MapMode.READ_ONLY) && !writable)
-            throw new NonWritableChannelException();
-        if (!readable)
-            throw new NonReadableChannelException();
-
-        long addr = -1;
-        int ti = -1;
-        try {
-            begin();
-            ti = threads.add();
-            if (!isOpen())
-                return null;
-            if (size() < position + size) { // Extend file size
-                if (!writable) {
-                    throw new IOException("Channel not open for writing " +
-                        "- cannot extend file to required size");
-                }
-                int rv;
-                do {
-                    rv = nd.truncate(fd, position + size);
-                } while ((rv == IOStatus.INTERRUPTED) && isOpen());
-            }
-            if (size == 0) {
-                addr = 0;
-                // a valid file descriptor is not required
-                FileDescriptor dummy = new FileDescriptor();
-                if ((!writable) || (imode == MAP_RO))
-                    return Util.newMappedByteBufferR(0, 0, dummy, null);
-                else
-                    return Util.newMappedByteBuffer(0, 0, dummy, null);
-            }
-
-            int pagePosition = (int)(position % allocationGranularity);
-            long mapPosition = position - pagePosition;
-            long mapSize = size + pagePosition;
-            try {
-                // If no exception was thrown from map0, the address is valid
-                addr = map0(imode, mapPosition, mapSize);
-            } catch (OutOfMemoryError x) {
-                // An OutOfMemoryError may indicate that we've exhausted memory
-                // so force gc and re-attempt map
-                System.gc();
-                try {
-                    Thread.sleep(100);
-                } catch (InterruptedException y) {
-                    Thread.currentThread().interrupt();
-                }
-                try {
-                    addr = map0(imode, mapPosition, mapSize);
-                } catch (OutOfMemoryError y) {
-                    // After a second OOME, fail
-                    throw new IOException("Map failed", y);
-                }
-            }
-
-            // On Windows, and potentially other platforms, we need an open
-            // file descriptor for some mapping operations.
-            FileDescriptor mfd;
-            try {
-                mfd = nd.duplicateForMapping(fd);
-            } catch (IOException ioe) {
-                unmap0(addr, mapSize);
-                throw ioe;
-            }
-
-            assert (IOStatus.checkAll(addr));
-            assert (addr % allocationGranularity == 0);
-            int isize = (int)size;
-            Unmapper um = new Unmapper(addr, mapSize, isize, mfd);
-            if ((!writable) || (imode == MAP_RO)) {
-                return Util.newMappedByteBufferR(isize,
-                                                 addr + pagePosition,
-                                                 mfd,
-                                                 um);
-            } else {
-                return Util.newMappedByteBuffer(isize,
-                                                addr + pagePosition,
-                                                mfd,
-                                                um);
-            }
-        } finally {
-            threads.remove(ti);
-            end(IOStatus.checkAll(addr));
-        }
-    }
-
-    /**
-     * Invoked by sun.management.ManagementFactoryHelper to create the management
-     * interface for mapped buffers.
-     */
-    public static sun.misc.JavaNioAccess.BufferPool getMappedBufferPool() {
-        return new sun.misc.JavaNioAccess.BufferPool() {
-            @Override
-            public String getName() {
-                return "mapped";
-            }
-            @Override
-            public long getCount() {
-                return Unmapper.count;
-            }
-            @Override
-            public long getTotalCapacity() {
-                return Unmapper.totalCapacity;
-            }
-            @Override
-            public long getMemoryUsed() {
-                return Unmapper.totalSize;
-            }
-        };
-    }
-
-    // -- Locks --
-
-
-
-    // keeps track of locks on this file
-    private volatile FileLockTable fileLockTable;
-
-    // indicates if file locks are maintained system-wide (as per spec)
-    private static boolean isSharedFileLockTable;
-
-    // indicates if the disableSystemWideOverlappingFileLockCheck property
-    // has been checked
-    private static volatile boolean propertyChecked;
-
-    // The lock list in J2SE 1.4/5.0 was local to each FileChannel instance so
-    // the overlap check wasn't system wide when there were multiple channels to
-    // the same file. This property is used to get 1.4/5.0 behavior if desired.
-    private static boolean isSharedFileLockTable() {
-        if (!propertyChecked) {
-            synchronized (FileChannelImpl.class) {
-                if (!propertyChecked) {
-                    String value = AccessController.doPrivileged(
-                        new GetPropertyAction(
-                            "sun.nio.ch.disableSystemWideOverlappingFileLockCheck"));
-                    isSharedFileLockTable = ((value == null) || value.equals("false"));
-                    propertyChecked = true;
-                }
-            }
-        }
-        return isSharedFileLockTable;
-    }
-
-    private FileLockTable fileLockTable() throws IOException {
-        if (fileLockTable == null) {
-            synchronized (this) {
-                if (fileLockTable == null) {
-                    if (isSharedFileLockTable()) {
-                        int ti = threads.add();
-                        try {
-                            ensureOpen();
-                            fileLockTable = FileLockTable.newSharedFileLockTable(this, fd);
-                        } finally {
-                            threads.remove(ti);
-                        }
-                    } else {
-                        fileLockTable = new SimpleFileLockTable();
-                    }
-                }
-            }
-        }
-        return fileLockTable;
-    }
-
-    public FileLock lock(long position, long size, boolean shared)
-        throws IOException
-    {
-        ensureOpen();
-        if (shared && !readable)
-            throw new NonReadableChannelException();
-        if (!shared && !writable)
-            throw new NonWritableChannelException();
-        FileLockImpl fli = new FileLockImpl(this, position, size, shared);
-        FileLockTable flt = fileLockTable();
-        flt.add(fli);
-        boolean completed = false;
-        int ti = -1;
-        try {
-            begin();
-            ti = threads.add();
-            if (!isOpen())
-                return null;
-            int n;
-            do {
-                n = nd.lock(fd, true, position, size, shared);
-            } while ((n == FileDispatcher.INTERRUPTED) && isOpen());
-            if (isOpen()) {
-                if (n == FileDispatcher.RET_EX_LOCK) {
-                    assert shared;
-                    FileLockImpl fli2 = new FileLockImpl(this, position, size,
-                                                         false);
-                    flt.replace(fli, fli2);
-                    fli = fli2;
-                }
-                completed = true;
-            }
-        } finally {
-            if (!completed)
-                flt.remove(fli);
-            threads.remove(ti);
-            try {
-                end(completed);
-            } catch (ClosedByInterruptException e) {
-                throw new FileLockInterruptionException();
-            }
-        }
-        return fli;
-    }
-
-    public FileLock tryLock(long position, long size, boolean shared)
-        throws IOException
-    {
-        ensureOpen();
-        if (shared && !readable)
-            throw new NonReadableChannelException();
-        if (!shared && !writable)
-            throw new NonWritableChannelException();
-        FileLockImpl fli = new FileLockImpl(this, position, size, shared);
-        FileLockTable flt = fileLockTable();
-        flt.add(fli);
-        int result;
-
-        int ti = threads.add();
-        try {
-            try {
-                ensureOpen();
-                result = nd.lock(fd, false, position, size, shared);
-            } catch (IOException e) {
-                flt.remove(fli);
-                throw e;
-            }
-            if (result == FileDispatcher.NO_LOCK) {
-                flt.remove(fli);
-                return null;
-            }
-            if (result == FileDispatcher.RET_EX_LOCK) {
-                assert shared;
-                FileLockImpl fli2 = new FileLockImpl(this, position, size,
-                                                     false);
-                flt.replace(fli, fli2);
-                return fli2;
-            }
-            return fli;
-        } finally {
-            threads.remove(ti);
-        }
-    }
-
-    void release(FileLockImpl fli) throws IOException {
-        int ti = threads.add();
-        try {
-            ensureOpen();
-            nd.release(fd, fli.position(), fli.size());
-        } finally {
-            threads.remove(ti);
-        }
-        assert fileLockTable != null;
-        fileLockTable.remove(fli);
-    }
-
-    // -- File lock support --
-
-    /**
-     * A simple file lock table that maintains a list of FileLocks obtained by a
-     * FileChannel. Use to get 1.4/5.0 behaviour.
-     */
-    private static class SimpleFileLockTable extends FileLockTable {
-        // synchronize on list for access
-        private final List<FileLock> lockList = new ArrayList<FileLock>(2);
-
-        public SimpleFileLockTable() {
-        }
-
-        private void checkList(long position, long size)
-            throws OverlappingFileLockException
-        {
-            assert Thread.holdsLock(lockList);
-            for (FileLock fl: lockList) {
-                if (fl.overlaps(position, size)) {
-                    throw new OverlappingFileLockException();
-                }
-            }
-        }
-
-        public void add(FileLock fl) throws OverlappingFileLockException {
-            synchronized (lockList) {
-                checkList(fl.position(), fl.size());
-                lockList.add(fl);
-            }
-        }
-
-        public void remove(FileLock fl) {
-            synchronized (lockList) {
-                lockList.remove(fl);
-            }
-        }
-
-        public List<FileLock> removeAll() {
-            synchronized(lockList) {
-                List<FileLock> result = new ArrayList<FileLock>(lockList);
-                lockList.clear();
-                return result;
-            }
-        }
-
-        public void replace(FileLock fl1, FileLock fl2) {
-            synchronized (lockList) {
-                lockList.remove(fl1);
-                lockList.add(fl2);
-            }
-        }
-    }
-
-    // -- Native methods --
-
-    // Creates a new mapping
-    private long map0(int prot, long position, long length) throws IOException
-    {
-        FileStream fs = (FileStream)fd.getStream();
-        if (win32)
-            return mapViewOfFileWin32(fs, prot, position, length);
-        else
-            return mapViewOfFilePosix(fs, prot, position, length);
-    }
-
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    private static long mapViewOfFileWin32(FileStream fs, int prot, long position, long length) throws IOException
-    {
-        try
-        {
-            int PAGE_READONLY = 2;
-            int PAGE_READWRITE = 4;
-            int PAGE_WRITECOPY = 8;
-            
-            int FILE_MAP_WRITE = 2;
-            int FILE_MAP_READ = 4;
-            int FILE_MAP_COPY = 1;
-
-            int fileProtect;
-            int mapAccess;
-
-            switch (prot)
-            {
-                case MAP_RO:
-                    fileProtect = PAGE_READONLY;
-                    mapAccess = FILE_MAP_READ;
-                    break;
-                case MAP_RW:
-                    fileProtect = PAGE_READWRITE;
-                    mapAccess = FILE_MAP_WRITE;
-                    break;
-                case MAP_PV:
-                    fileProtect = PAGE_WRITECOPY;
-                    mapAccess = FILE_MAP_COPY;
-                    break;
-                default:
-                    throw new Error();
-            }
-
-            long maxSize = length + position;
-            SafeFileHandle hFileMapping = CreateFileMapping(fs.get_SafeFileHandle(), IntPtr.Zero, fileProtect, (int)(maxSize >> 32), (int)maxSize, null);
-            int err = cli.System.Runtime.InteropServices.Marshal.GetLastWin32Error();
-            if (hFileMapping.get_IsInvalid())
-            {
-                throw new IOException("Win32 error " + err);
-            }
-            IntPtr p = MapViewOfFile(hFileMapping, mapAccess, (int)(position >> 32), (int)position, IntPtr.op_Explicit(length));
-            err = cli.System.Runtime.InteropServices.Marshal.GetLastWin32Error();
-            hFileMapping.Close();
-            if (p.Equals(IntPtr.Zero))
-            {
-                if (err == 8 /*ERROR_NOT_ENOUGH_MEMORY*/)
-                {
-                    throw new OutOfMemoryError("Map failed");
-                }
-                throw new IOException("Win32 error " + err);
-            }
-            cli.System.GC.AddMemoryPressure(length);
-            return p.ToInt64();
-        }
-        finally
-        {
-            cli.System.GC.KeepAlive(fs);
-        }
-    }
-
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    private static long mapViewOfFilePosix(FileStream fs, int prot, long position, long length) throws IOException
-    {
-        byte writeable = prot != MAP_RO ? (byte)1 : (byte)0;
-        byte copy_on_write = prot == MAP_PV ? (byte)1 : (byte)0;
-        IntPtr p = ikvm_mmap(fs.get_SafeFileHandle(), writeable, copy_on_write, position, (int)length);
-        cli.System.GC.KeepAlive(fs);
-        // HACK ikvm_mmap should really be changed to return a null pointer on failure,
-        // instead of whatever MAP_FAILED is defined to on the particular system we're running on,
-        // common values for MAP_FAILED are 0 and -1, so we test for these.
-        if (p.Equals(IntPtr.Zero) || p.Equals(new IntPtr(-1)))
-        {
-            throw new IOException("file mapping failed");
-        }
-        cli.System.GC.AddMemoryPressure(length);
-        return p.ToInt64();
-    }
-
-    @DllImportAttribute.Annotation(value="kernel32", SetLastError=true)
-    private static native SafeFileHandle CreateFileMapping(SafeFileHandle hFile, IntPtr lpAttributes, int flProtect, int dwMaximumSizeHigh, int dwMaximumSizeLow, String lpName);
-
-    @DllImportAttribute.Annotation(value="kernel32", SetLastError=true)
-    private static native IntPtr MapViewOfFile(SafeFileHandle hFileMapping, int dwDesiredAccess, int dwFileOffsetHigh, int dwFileOffsetLow, IntPtr dwNumberOfBytesToMap);
-
-    @DllImportAttribute.Annotation("kernel32")
-    private static native int UnmapViewOfFile(IntPtr lpBaseAddress);
-
-    @DllImportAttribute.Annotation("ikvm-native")
-    private static native int ikvm_munmap(IntPtr address, int size);
-
-    @DllImportAttribute.Annotation("ikvm-native")
-    private static native IntPtr ikvm_mmap(SafeFileHandle handle, byte writeable, byte copy_on_write, long position, int size);
-
-    // Removes an existing mapping
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    static int unmap0(long address, long length)
-    {
-        if (win32)
-            UnmapViewOfFile(IntPtr.op_Explicit(address));
-        else
-            ikvm_munmap(IntPtr.op_Explicit(address), (int)length);
-        cli.System.GC.RemoveMemoryPressure(length);
-        return 0;
-    }
-
-    // Sets or reports this file's position
-    // If offset is -1, the current position is returned
-    // otherwise the position is set to offset
-    private static long position0(FileDescriptor fd, long offset) throws IOException
-    {
-        if (offset == -1)
-        {
-            return fd.getFilePointer();
-        }
-        fd.seek(offset);
-        return offset;
-    }
-}
diff --git a/openjdk/sun/nio/ch/FileDispatcherImpl.java b/openjdk/sun/nio/ch/FileDispatcherImpl.java
deleted file mode 100644
index 971df81b..00000000
--- a/openjdk/sun/nio/ch/FileDispatcherImpl.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.nio.ch;
-
-import java.io.*;
-import java.nio.ByteBuffer;
-import cli.Microsoft.Win32.SafeHandles.SafeFileHandle;
-import cli.System.IntPtr;
-import cli.System.IO.FileStream;
-import cli.System.Runtime.InteropServices.DllImportAttribute;
-import cli.System.Runtime.InteropServices.StructLayoutAttribute;
-import cli.System.Runtime.InteropServices.LayoutKind;
-import cli.System.Runtime.InteropServices.Marshal;
-import static ikvm.internal.Util.WINDOWS;
-
-class FileDispatcherImpl extends FileDispatcher
-{
-    /**
-     * Indicates if the dispatcher should first advance the file position
-     * to the end of file when writing.
-     */
-    private final boolean append;
-
-    FileDispatcherImpl(boolean append) {
-        this.append = append;
-    }
-
-    FileDispatcherImpl() {
-        this(false);
-    }
-
-    int read(FileDescriptor fd, byte[] buf, int offset, int length) throws IOException {
-        return fd.readBytes(buf, offset, length);
-    }
-
-    int write(FileDescriptor fd, byte[] buf, int offset, int length) throws IOException {
-        fd.writeBytes(buf, offset, length);
-        return length;
-    }
-
-    long read(FileDescriptor fd, ByteBuffer[] bufs, int offset, int length) throws IOException {
-        long totalRead = 0;
-        try
-        {
-            for (int i = offset; i < offset + length; i++)
-            {
-                int size = bufs[i].remaining();
-                if (size > 0)
-                {
-                    int read = IOUtil.read(fd, bufs[i], -1, this, this);
-                    if (read < 0)
-                    {
-                        break;
-                    }
-                    totalRead += read;
-                    if (read < size || fd.available() == 0)
-                    {
-                        break;
-                    }
-                }
-            }
-        }
-        catch (IOException x)
-        {
-            if (totalRead == 0)
-            {
-                throw x;
-            }
-        }
-        return totalRead;
-    }
-
-    long write(FileDescriptor fd, ByteBuffer[] bufs, int offset, int length) throws IOException {
-        long totalWritten = 0;
-        try
-        {
-            for (int i = offset; i < offset + length; i++)
-            {
-                int size = bufs[i].remaining();
-                if (size > 0)
-                {
-                    int written = IOUtil.write(fd, bufs[i], -1, this, this);
-                    totalWritten += written;
-                    if (written < size)
-                    {
-                        break;
-                    }
-                }
-            }
-        }
-        catch (IOException x)
-        {
-            if (totalWritten == 0)
-            {
-                throw x;
-            }
-        }
-        return totalWritten;
-    }
-
-    int force(FileDescriptor fd, boolean metaData) throws IOException {
-        fd.sync();
-        return 0;
-    }
-
-    int truncate(FileDescriptor fd, long size) throws IOException {
-        if (append) {
-            // HACK in append mode we're not allowed to truncate, so we try to reopen the file and truncate that
-            try (FileOutputStream fos = new FileOutputStream(((FileStream)fd.getStream()).get_Name())) {
-                fos.getFD().setLength(size);
-            }
-        } else {
-            fd.setLength(size);
-        }
-        return 0;
-    }
-
-    long size(FileDescriptor fd) throws IOException {
-        return fd.length();
-    }
-
-    @StructLayoutAttribute.Annotation(LayoutKind.__Enum.Sequential)
-    private static final class OVERLAPPED extends cli.System.Object
-    {
-        IntPtr Internal;
-        IntPtr InternalHigh;
-        int OffsetLow;
-        int OffsetHigh;
-        IntPtr hEvent;
-    }
-
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    int lock(FileDescriptor fd, boolean blocking, long pos, long size,
-             boolean shared) throws IOException
-    {
-        FileStream fs = (FileStream)fd.getStream();
-        if (WINDOWS)
-        {
-            int LOCKFILE_FAIL_IMMEDIATELY = 1;
-            int LOCKFILE_EXCLUSIVE_LOCK = 2;
-            int ERROR_LOCK_VIOLATION = 33;
-            int flags = 0;
-            OVERLAPPED o = new OVERLAPPED();
-            o.OffsetLow = (int)pos;
-            o.OffsetHigh = (int)(pos >> 32);
-            if (!blocking)
-            {
-                flags |= LOCKFILE_FAIL_IMMEDIATELY;
-            }
-            if (!shared)
-            {
-                flags |= LOCKFILE_EXCLUSIVE_LOCK;
-            }
-            int result = LockFileEx(fs.get_SafeFileHandle(), flags, 0, (int)size, (int)(size >> 32), o);
-            if (result == 0)
-            {
-                int error = Marshal.GetLastWin32Error();
-                if (!blocking && error == ERROR_LOCK_VIOLATION)
-                {
-                    return NO_LOCK;
-                }
-                throw new IOException("Lock failed");
-            }
-            return LOCKED;
-        }
-        else
-        {
-            try
-            {
-                if (false) throw new cli.System.ArgumentOutOfRangeException();
-                for (;;)
-                {
-                    try
-                    {
-                        if (false) throw new cli.System.IO.IOException();
-                        if (false) throw new cli.System.ObjectDisposedException("");
-                        fs.Lock(pos, size);
-                        return shared ? RET_EX_LOCK : LOCKED;
-                    }
-                    catch (cli.System.IO.IOException x)
-                    {
-                        if (!blocking)
-                        {
-                            return NO_LOCK;
-                        }
-                        cli.System.Threading.Thread.Sleep(100);
-                    }
-                    catch (cli.System.ObjectDisposedException x)
-                    {
-                        throw new IOException(x.getMessage());
-                    }
-                }
-            }
-            catch (cli.System.ArgumentOutOfRangeException x)
-            {
-                throw new IOException(x.getMessage());
-            }
-        }
-    }
-
-    @cli.System.Security.SecuritySafeCriticalAttribute.Annotation
-    void release(FileDescriptor fd, long pos, long size) throws IOException {
-        FileStream fs = (FileStream)fd.getStream();
-        if (WINDOWS)
-        {
-            int ERROR_NOT_LOCKED = 158;
-            OVERLAPPED o = new OVERLAPPED();
-            o.OffsetLow = (int)pos;
-            o.OffsetHigh = (int)(pos >> 32);
-            int result = UnlockFileEx(fs.get_SafeFileHandle(), 0, (int)size, (int)(size >> 32), o);
-            if (result == 0 && Marshal.GetLastWin32Error() != ERROR_NOT_LOCKED)
-            {
-                throw new IOException("Release failed");
-            }
-        }
-        else
-        {
-            try
-            {
-                if (false) throw new cli.System.ArgumentOutOfRangeException();
-                if (false) throw new cli.System.IO.IOException();
-                if (false) throw new cli.System.ObjectDisposedException("");
-                fs.Unlock(pos, size);
-            }
-            catch (cli.System.IO.IOException x)
-            {
-                if (!NotLockedHack.isErrorNotLocked(x))
-                {
-                    throw new IOException(x.getMessage());
-                }
-            }
-            catch (cli.System.ArgumentOutOfRangeException
-                | cli.System.ObjectDisposedException x)
-            {
-                throw new IOException(x.getMessage());
-            }
-        }
-    }
-
-    static class NotLockedHack {
-        private static String msg;
-        static {
-            try {
-                File tmp = File.createTempFile("lock", null);
-                try (FileStream fs = new FileStream(tmp.getPath(), cli.System.IO.FileMode.wrap(cli.System.IO.FileMode.Create))) {
-                    try {
-                        if (false) throw new cli.System.IO.IOException();
-                        fs.Unlock(0, 1);
-                    } catch (cli.System.IO.IOException x) {
-                        msg = x.get_Message();
-                    }
-                }
-                tmp.delete();
-            } catch (Throwable _) {
-            }
-        }
-        static boolean isErrorNotLocked(cli.System.IO.IOException x) {
-            return x.get_Message().equals(msg);
-        }
-    }
-
-
-    void close(FileDescriptor fd) throws IOException {
-        fd.close();
-    }
-
-    FileDescriptor duplicateForMapping(FileDescriptor fd) throws IOException {
-        // we return a dummy FileDescriptor, because we don't need it for mapping operations
-        // and we don't want the original to be closed
-        return new FileDescriptor();
-    }
-
-    @DllImportAttribute.Annotation(value="kernel32", SetLastError=true)
-    private static native int LockFileEx(SafeFileHandle hFile, int dwFlags, int dwReserved, int nNumberOfBytesToLockLow, int nNumberOfBytesToLockHigh, OVERLAPPED lpOverlapped);
-
-    @DllImportAttribute.Annotation(value="kernel32", SetLastError=true)
-    private static native int UnlockFileEx(SafeFileHandle hFile, int dwReserved, int nNumberOfBytesToUnlockLow, int nNumberOfBytesToUnlockHigh, OVERLAPPED lpOverlapped);
-}
diff --git a/openjdk/sun/nio/ch/FileKey.java b/openjdk/sun/nio/ch/FileKey.java
deleted file mode 100644
index 4feec5d3..00000000
--- a/openjdk/sun/nio/ch/FileKey.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-  Copyright (C) 2007 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-package sun.nio.ch;
-
-import java.io.File;
-import java.io.FileDescriptor;
-import java.io.IOException;
-
-public class FileKey
-{
-    private String path;
-
-    public static FileKey create(FileDescriptor fd)
-    {
-        FileKey fk = new FileKey();
-        fk.path = ((cli.System.IO.FileStream)fd.getStream()).get_Name();
-        try
-        {
-            fk.path = new File(fk.path).getCanonicalPath();
-        }
-        catch (IOException x)
-        {
-        }
-        return fk;
-    }
-
-    public int hashCode()
-    {
-        return path.hashCode();
-    }
-
-    public boolean equals(Object obj)
-    {
-        return obj == this || (obj instanceof FileKey && ((FileKey)obj).path.equals(path));
-    }
-}
diff --git a/openjdk/sun/nio/ch/IOUtil.java b/openjdk/sun/nio/ch/IOUtil.java
deleted file mode 100644
index 38325371..00000000
--- a/openjdk/sun/nio/ch/IOUtil.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.nio.ch;
-
-import java.io.FileDescriptor;
-import java.io.IOException;
-import java.net.*;
-import java.nio.ByteBuffer;
-import java.nio.channels.*;
-import java.nio.channels.spi.*;
-
-
-/**
- * File-descriptor based I/O utilities that are shared by NIO classes.
- */
-
-class IOUtil {
-
-    private IOUtil() { }                // No instantiation
-
-    static boolean randomBytes(byte[] someBytes)
-    {
-        try
-        {
-            if (false) throw new cli.System.Security.Cryptography.CryptographicException();
-            cli.System.Security.Cryptography.RNGCryptoServiceProvider csp = new cli.System.Security.Cryptography.RNGCryptoServiceProvider();
-            csp.GetBytes(someBytes);
-            return true;
-        }
-        catch (cli.System.Security.Cryptography.CryptographicException _)
-        {
-            return false;
-        }
-    }
-
-    static void configureBlocking(FileDescriptor fd, boolean blocking) throws IOException
-    {
-        fd.setSocketBlocking(blocking);
-    }
-
-    // this is a dummy method to allow us to use unmodified socket channel impls
-    static int fdVal(FileDescriptor fd)
-    {
-        return 0xbadc0de;
-    }
-
-    static int read(FileDescriptor fd, ByteBuffer dst, long position,
-                    NativeDispatcher nd, Object lock)
-        throws IOException
-    {
-        if (dst.isReadOnly())
-            throw new IllegalArgumentException("Read-only buffer");
-
-        if (position != -1)
-        {
-            synchronized (lock)
-            {
-                long prevpos = fd.getFilePointer();
-                try
-                {
-                    fd.seek(position);
-                    return read(fd, dst, -1, nd, null);
-                }
-                finally
-                {
-                    fd.seek(prevpos);
-                }
-            }
-        }
-
-        if (dst.hasArray())
-        {
-            byte[] buf = dst.array();
-            int len = nd.read(fd, buf, dst.arrayOffset() + dst.position(), dst.remaining());
-            if (len > 0)
-            {
-                dst.position(dst.position() + len);
-            }
-            return len;
-        }
-        else
-        {
-            byte[] buf = new byte[dst.remaining()];
-            int len = nd.read(fd, buf, 0, buf.length);
-            if (len > 0)
-            {
-                dst.put(buf, 0, len);
-            }
-            return len;
-        }
-    }
-
-    static long read(FileDescriptor fd, ByteBuffer[] bufs, int offset, int length, NativeDispatcher nd)
-        throws IOException
-    {
-        return nd.read(fd, bufs, offset, length);
-    }
-
-    static int write(FileDescriptor fd, ByteBuffer src, long position,
-                     NativeDispatcher nd, Object lock)
-        throws IOException
-    {
-        if (position != -1)
-        {
-            synchronized (lock)
-            {
-                long prevpos = fd.getFilePointer();
-                try
-                {
-                    fd.seek(position);
-                    return write(fd, src, -1, nd, null);
-                }
-                finally
-                {
-                    fd.seek(prevpos);
-                }
-            }
-        }
-
-        if (src.hasArray())
-        {
-            byte[] buf = src.array();
-            int len = nd.write(fd, buf, src.arrayOffset() + src.position(), src.remaining());
-            if (len > 0)
-            {
-                src.position(src.position() + len);
-            }
-            return len;
-        }
-        else
-        {
-            int pos = src.position();
-            byte[] buf = new byte[src.remaining()];
-            src.get(buf);
-            src.position(pos);
-            int len = nd.write(fd, buf, 0, buf.length);
-            if (len > 0)
-            {
-                src.position(pos + len);
-            }
-            return len;
-        }
-    }
-
-    static long write(FileDescriptor fd, ByteBuffer[] bufs, NativeDispatcher nd)
-        throws IOException
-    {
-        return nd.write(fd, bufs, 0, bufs.length);
-    }
-
-    static long write(FileDescriptor fd, ByteBuffer[] bufs, int offset, int length, NativeDispatcher nd)
-        throws IOException
-    {
-        return nd.write(fd, bufs, offset, length);
-    }
-}
diff --git a/openjdk/sun/nio/ch/Iocp.java b/openjdk/sun/nio/ch/Iocp.java
deleted file mode 100644
index b74b0a8f..00000000
--- a/openjdk/sun/nio/ch/Iocp.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.nio.ch;
-
-import java.nio.channels.*;
-import java.nio.channels.spi.AsynchronousChannelProvider;
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.FileDescriptor;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import ikvm.internal.NotYetImplementedError;
-
-/**
- * Windows implementation of AsynchronousChannelGroup encapsulating an I/O
- * completion port.
- */
-
-class Iocp extends AsynchronousChannelGroupImpl {
-    private static final boolean supportsThreadAgnosticIo;
-
-    // true if port has been closed
-    private boolean closed;
-
-    // the set of "stale" OVERLAPPED structures. These OVERLAPPED structures
-    // relate to I/O operations where the completion notification was not
-    // received in a timely manner after the channel is closed.
-    private final Set<Long> staleIoSet = new HashSet<Long>();
-
-    Iocp(AsynchronousChannelProvider provider, ThreadPool pool)
-        throws IOException
-    {
-        super(provider, pool);
-    }
-
-    Iocp start() {
-        return this;
-    }
-
-    /*
-     * Channels implements this interface support overlapped I/O and can be
-     * associated with a completion port.
-     */
-    static interface OverlappedChannel extends Closeable {
-        /**
-         * Returns a reference to the pending I/O result.
-         */
-        <V,A> PendingFuture<V,A> getByOverlapped(long overlapped);
-    }
-
-    /**
-     * Indicates if this operating system supports thread agnostic I/O.
-     */
-    static boolean supportsThreadAgnosticIo() {
-        return supportsThreadAgnosticIo;
-    }
-
-    // release all resources
-    void implClose() {
-        synchronized (this) {
-            if (closed)
-                return;
-            closed = true;
-        }
-    }
-
-    @Override
-    boolean isEmpty() {
-        return true;
-    }
-
-    @Override
-    final Object attachForeignChannel(final Channel channel, FileDescriptor fdObj)
-        throws IOException
-    {
-        throw new NotYetImplementedError();
-    }
-
-    @Override
-    final void detachForeignChannel(Object key) {
-        throw new NotYetImplementedError();
-    }
-
-    @Override
-    void closeAllChannels() {
-    }
-
-    @Override
-    void executeOnHandlerTask(Runnable task) {
-        throw new NotYetImplementedError();
-    }
-
-    @Override
-    void shutdownHandlerTasks() {
-    }
-
-    /**
-     * The handler for consuming the result of an asynchronous I/O operation.
-     */
-    static interface ResultHandler {
-        /**
-         * Invoked if the I/O operation completes successfully.
-         */
-        public void completed(int bytesTransferred, boolean canInvokeDirect);
-
-        /**
-         * Invoked if the I/O operation fails.
-         */
-        public void failed(int error, IOException ioe);
-    }
-
-    static {
-        supportsThreadAgnosticIo = true;
-    }
-}
diff --git a/openjdk/sun/nio/ch/NativeDispatcher.java b/openjdk/sun/nio/ch/NativeDispatcher.java
deleted file mode 100644
index 7f523265..00000000
--- a/openjdk/sun/nio/ch/NativeDispatcher.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.nio.ch;
-
-import java.io.*;
-import java.nio.ByteBuffer;
-
-/**
- * Allows different platforms to call different native methods
- * for read and write operations.
- */
-
-abstract class NativeDispatcher
-{
-    abstract int read(FileDescriptor fd, byte[] buf, int offset, int length) throws IOException;
-
-    abstract int write(FileDescriptor fd, byte[] buf, int offset, int length) throws IOException;
-
-    abstract long read(FileDescriptor fd, ByteBuffer[] bufs, int offset, int length) throws IOException;
-
-    abstract long write(FileDescriptor fd, ByteBuffer[] bufs, int offset, int length) throws IOException;
-
-    abstract void close(FileDescriptor fd) throws IOException;
-
-    // Prepare the given fd for closing by duping it to a known internal fd
-    // that's already closed.  This is necessary on some operating systems
-    // (Solaris and Linux) to prevent fd recycling.
-    //
-    void preClose(FileDescriptor fd) throws IOException {
-        // Do nothing by default; this is only needed on Unix
-    }
-
-}
diff --git a/openjdk/sun/nio/ch/Net.java b/openjdk/sun/nio/ch/Net.java
deleted file mode 100644
index d9ab0f0f..00000000
--- a/openjdk/sun/nio/ch/Net.java
+++ /dev/null
@@ -1,609 +0,0 @@
-/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.nio.ch;
-
-import java.io.*;
-import java.net.*;
-import java.nio.channels.*;
-import java.util.*;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
-
-
-class Net {                                             // package-private
-
-    private Net() { }
-
-    // unspecified protocol family
-    static final ProtocolFamily UNSPEC = new ProtocolFamily() {
-        public String name() {
-            return "UNSPEC";
-        }
-    };
-
-    // Value of jdk.net.revealLocalAddress
-    private static boolean revealLocalAddress;
-
-    // True if jdk.net.revealLocalAddress had been read
-    private static volatile boolean propRevealLocalAddress;
-
-    // set to true if exclusive binding is on for Windows
-    private static final boolean exclusiveBind;
-
-    static {
-        int availLevel = isExclusiveBindAvailable();
-        if (availLevel >= 0) {
-            String exclBindProp =
-                java.security.AccessController.doPrivileged(
-                      new PrivilegedAction<String>() {
-                          @Override
-                        public String run() {
-                            return System.getProperty(
-                                    "sun.net.useExclusiveBind");
-                        }
-                    });
-            if (exclBindProp != null) {
-                exclusiveBind = exclBindProp.length() == 0 ?
-                        true : Boolean.parseBoolean(exclBindProp);
-            } else if (availLevel == 1) {
-                exclusiveBind = true;
-            } else {
-                exclusiveBind = false;
-            }
-        } else {
-            exclusiveBind = false;
-        }
-    }
-
-    // -- Miscellaneous utilities --
-
-    private static volatile boolean checkedIPv6 = false;
-    private static volatile boolean isIPv6Available;
-
-    /**
-     * Tells whether dual-IPv4/IPv6 sockets should be used.
-     */
-    static boolean isIPv6Available() {
-        if (!checkedIPv6) {
-            isIPv6Available = isIPv6Available0();
-            checkedIPv6 = true;
-        }
-        return isIPv6Available;
-    }
-
-    /**
-     * Returns true if exclusive binding is on
-     */
-    static boolean useExclusiveBind() {
-        return exclusiveBind;
-    }
-
-    /**
-     * Tells whether IPv6 sockets can join IPv4 multicast groups
-     */
-    static boolean canIPv6SocketJoinIPv4Group() {
-        return canIPv6SocketJoinIPv4Group0();
-    }
-
-    /**
-     * Tells whether {@link #join6} can be used to join an IPv4
-     * multicast group (IPv4 group as IPv4-mapped IPv6 address)
-     */
-    static boolean canJoin6WithIPv4Group() {
-        return canJoin6WithIPv4Group0();
-    }
-
-    static InetSocketAddress checkAddress(SocketAddress sa) {
-        if (sa == null)
-            throw new NullPointerException();
-        if (!(sa instanceof InetSocketAddress))
-            throw new UnsupportedAddressTypeException(); // ## needs arg
-        InetSocketAddress isa = (InetSocketAddress)sa;
-        if (isa.isUnresolved())
-            throw new UnresolvedAddressException(); // ## needs arg
-        InetAddress addr = isa.getAddress();
-        if (!(addr instanceof Inet4Address || addr instanceof Inet6Address))
-            throw new IllegalArgumentException("Invalid address type");
-        return isa;
-    }
-
-    static InetSocketAddress asInetSocketAddress(SocketAddress sa) {
-        if (!(sa instanceof InetSocketAddress))
-            throw new UnsupportedAddressTypeException();
-        return (InetSocketAddress)sa;
-    }
-
-    static void translateToSocketException(Exception x)
-        throws SocketException
-    {
-        if (x instanceof SocketException)
-            throw (SocketException)x;
-        Exception nx = x;
-        if (x instanceof ClosedChannelException)
-            nx = new SocketException("Socket is closed");
-        else if (x instanceof NotYetConnectedException)
-            nx = new SocketException("Socket is not connected");
-        else if (x instanceof AlreadyBoundException)
-            nx = new SocketException("Already bound");
-        else if (x instanceof NotYetBoundException)
-            nx = new SocketException("Socket is not bound yet");
-        else if (x instanceof UnsupportedAddressTypeException)
-            nx = new SocketException("Unsupported address type");
-        else if (x instanceof UnresolvedAddressException) {
-            nx = new SocketException("Unresolved address");
-        }
-        if (nx != x)
-            nx.initCause(x);
-
-        if (nx instanceof SocketException)
-            throw (SocketException)nx;
-        else if (nx instanceof RuntimeException)
-            throw (RuntimeException)nx;
-        else
-            throw new Error("Untranslated exception", nx);
-    }
-
-    static void translateException(Exception x,
-                                   boolean unknownHostForUnresolved)
-        throws IOException
-    {
-        if (x instanceof IOException)
-            throw (IOException)x;
-        // Throw UnknownHostException from here since it cannot
-        // be thrown as a SocketException
-        if (unknownHostForUnresolved &&
-            (x instanceof UnresolvedAddressException))
-        {
-             throw new UnknownHostException();
-        }
-        translateToSocketException(x);
-    }
-
-    static void translateException(Exception x)
-        throws IOException
-    {
-        translateException(x, false);
-    }
-
-    /**
-     * Returns the local address after performing a SecurityManager#checkConnect.
-     */
-    static InetSocketAddress getRevealedLocalAddress(InetSocketAddress addr) {
-        SecurityManager sm = System.getSecurityManager();
-        if (addr == null || sm == null)
-            return addr;
-
-        if (!getRevealLocalAddress()) {
-            // Return loopback address only if security check fails
-            try{
-                sm.checkConnect(addr.getAddress().getHostAddress(), -1);
-                //Security check passed
-            } catch (SecurityException e) {
-                //Return loopback address
-                addr = getLoopbackAddress(addr.getPort());
-            }
-        }
-        return addr;
-    }
-
-    static String getRevealedLocalAddressAsString(InetSocketAddress addr) {
-        if (!getRevealLocalAddress() && System.getSecurityManager() != null)
-            addr = getLoopbackAddress(addr.getPort());
-        return addr.toString();
-    }
-
-    private static boolean getRevealLocalAddress() {
-        if (!propRevealLocalAddress) {
-            try {
-                revealLocalAddress = Boolean.parseBoolean(
-                      AccessController.doPrivileged(
-                          new PrivilegedExceptionAction<String>() {
-                              public String run() {
-                                  return System.getProperty(
-                                      "jdk.net.revealLocalAddress");
-                              }
-                          }));
-
-            } catch (Exception e) {
-                // revealLocalAddress is false
-            }
-            propRevealLocalAddress = true;
-        }
-        return revealLocalAddress;
-    }
-
-    private static InetSocketAddress getLoopbackAddress(int port) {
-        return new InetSocketAddress(InetAddress.getLoopbackAddress(),
-                                     port);
-    }
-
-    /**
-     * Returns any IPv4 address of the given network interface, or
-     * null if the interface does not have any IPv4 addresses.
-     */
-    static Inet4Address anyInet4Address(final NetworkInterface interf) {
-        return AccessController.doPrivileged(new PrivilegedAction<Inet4Address>() {
-            public Inet4Address run() {
-                Enumeration<InetAddress> addrs = interf.getInetAddresses();
-                while (addrs.hasMoreElements()) {
-                    InetAddress addr = addrs.nextElement();
-                    if (addr instanceof Inet4Address) {
-                        return (Inet4Address)addr;
-                    }
-                }
-                return null;
-            }
-        });
-    }
-
-    /**
-     * Returns an IPv4 address as an int.
-     */
-    static int inet4AsInt(InetAddress ia) {
-        if (ia instanceof Inet4Address) {
-            byte[] addr = ia.getAddress();
-            int address  = addr[3] & 0xFF;
-            address |= ((addr[2] << 8) & 0xFF00);
-            address |= ((addr[1] << 16) & 0xFF0000);
-            address |= ((addr[0] << 24) & 0xFF000000);
-            return address;
-        }
-        throw new AssertionError("Should not reach here");
-    }
-
-    /**
-     * Returns an InetAddress from the given IPv4 address
-     * represented as an int.
-     */
-    static InetAddress inet4FromInt(int address) {
-        byte[] addr = new byte[4];
-        addr[0] = (byte) ((address >>> 24) & 0xFF);
-        addr[1] = (byte) ((address >>> 16) & 0xFF);
-        addr[2] = (byte) ((address >>> 8) & 0xFF);
-        addr[3] = (byte) (address & 0xFF);
-        try {
-            return InetAddress.getByAddress(addr);
-        } catch (UnknownHostException uhe) {
-            throw new AssertionError("Should not reach here");
-        }
-    }
-
-    /**
-     * Returns an IPv6 address as a byte array
-     */
-    static byte[] inet6AsByteArray(InetAddress ia) {
-        if (ia instanceof Inet6Address) {
-            return ia.getAddress();
-        }
-
-        // need to construct IPv4-mapped address
-        if (ia instanceof Inet4Address) {
-            byte[] ip4address = ia.getAddress();
-            byte[] address = new byte[16];
-            address[10] = (byte)0xff;
-            address[11] = (byte)0xff;
-            address[12] = ip4address[0];
-            address[13] = ip4address[1];
-            address[14] = ip4address[2];
-            address[15] = ip4address[3];
-            return address;
-        }
-
-        throw new AssertionError("Should not reach here");
-    }
-
-    // -- Socket options
-
-    static void setSocketOption(FileDescriptor fd, ProtocolFamily family,
-                                SocketOption<?> name, Object value)
-        throws IOException
-    {
-        if (value == null)
-            throw new IllegalArgumentException("Invalid option value");
-
-        // only simple values supported by this method
-        Class<?> type = name.type();
-        if (type != Integer.class && type != Boolean.class)
-            throw new AssertionError("Should not reach here");
-
-        // special handling
-        if (name == StandardSocketOptions.SO_RCVBUF ||
-            name == StandardSocketOptions.SO_SNDBUF)
-        {
-            int i = ((Integer)value).intValue();
-            if (i < 0)
-                throw new IllegalArgumentException("Invalid send/receive buffer size");
-        }
-        if (name == StandardSocketOptions.SO_LINGER) {
-            int i = ((Integer)value).intValue();
-            if (i < 0)
-                value = Integer.valueOf(-1);
-            if (i > 65535)
-                value = Integer.valueOf(65535);
-        }
-        if (name == StandardSocketOptions.IP_TOS) {
-            int i = ((Integer)value).intValue();
-            if (i < 0 || i > 255)
-                throw new IllegalArgumentException("Invalid IP_TOS value");
-        }
-        if (name == StandardSocketOptions.IP_MULTICAST_TTL) {
-            int i = ((Integer)value).intValue();
-            if (i < 0 || i > 255)
-                throw new IllegalArgumentException("Invalid TTL/hop value");
-        }
-
-        // map option name to platform level/name
-        OptionKey key = SocketOptionRegistry.findOption(name, family);
-        if (key == null)
-            throw new AssertionError("Option not found");
-
-        int arg;
-        if (type == Integer.class) {
-            arg = ((Integer)value).intValue();
-        } else {
-            boolean b = ((Boolean)value).booleanValue();
-            arg = (b) ? 1 : 0;
-        }
-
-        boolean mayNeedConversion = (family == UNSPEC);
-        setIntOption0(fd, mayNeedConversion, key.level(), key.name(), arg);
-    }
-
-    static Object getSocketOption(FileDescriptor fd, ProtocolFamily family,
-                                  SocketOption<?> name)
-        throws IOException
-    {
-        Class<?> type = name.type();
-
-        // only simple values supported by this method
-        if (type != Integer.class && type != Boolean.class)
-            throw new AssertionError("Should not reach here");
-
-        // map option name to platform level/name
-        OptionKey key = SocketOptionRegistry.findOption(name, family);
-        if (key == null)
-            throw new AssertionError("Option not found");
-
-        boolean mayNeedConversion = (family == UNSPEC);
-        int value = getIntOption0(fd, mayNeedConversion, key.level(), key.name());
-
-        if (type == Integer.class) {
-            return Integer.valueOf(value);
-        } else {
-            return (value == 0) ? Boolean.FALSE : Boolean.TRUE;
-        }
-    }
-
-    // -- Socket operations --
-
-    private static native boolean isIPv6Available0();
-
-    /*
-     * Returns 1 for Windows versions that support exclusive binding by default, 0
-     * for those that do not, and -1 for Solaris/Linux/Mac OS
-     */
-    private static native int isExclusiveBindAvailable();
-
-    private static native boolean canIPv6SocketJoinIPv4Group0();
-
-    private static native boolean canJoin6WithIPv4Group0();
-
-    static FileDescriptor socket(boolean stream) throws IOException {
-        return socket(UNSPEC, stream);
-    }
-
-    static FileDescriptor socket(ProtocolFamily family, boolean stream)
-        throws IOException {
-        boolean preferIPv6 = isIPv6Available() &&
-            (family != StandardProtocolFamily.INET);
-        return socket0(preferIPv6, stream, false);
-    }
-
-    static FileDescriptor serverSocket(boolean stream) {
-        return socket0(isIPv6Available(), stream, true);
-    }
-
-    // Due to oddities SO_REUSEADDR on windows reuse is ignored
-    private static native FileDescriptor socket0(boolean preferIPv6, boolean stream, boolean reuse);
-
-    static void bind(FileDescriptor fd, InetAddress addr, int port)
-        throws IOException
-    {
-        bind(UNSPEC, fd, addr, port);
-    }
-
-    static void bind(ProtocolFamily family, FileDescriptor fd,
-                     InetAddress addr, int port) throws IOException
-    {
-        boolean preferIPv6 = isIPv6Available() &&
-            (family != StandardProtocolFamily.INET);
-        bind0(fd, preferIPv6, exclusiveBind, addr, port);
-    }
-
-    private static native void bind0(FileDescriptor fd, boolean preferIPv6,
-                                     boolean useExclBind, InetAddress addr,
-                                     int port)
-        throws IOException;
-
-    static native void listen(FileDescriptor fd, int backlog) throws IOException;
-
-    static int connect(FileDescriptor fd, InetAddress remote, int remotePort)
-        throws IOException
-    {
-        return connect(UNSPEC, fd, remote, remotePort);
-    }
-
-    static int connect(ProtocolFamily family, FileDescriptor fd, InetAddress remote, int remotePort)
-        throws IOException
-    {
-        boolean preferIPv6 = isIPv6Available() &&
-            (family != StandardProtocolFamily.INET);
-        return connect0(preferIPv6, fd, remote, remotePort);
-    }
-
-    private static native int connect0(boolean preferIPv6,
-                                       FileDescriptor fd,
-                                       InetAddress remote,
-                                       int remotePort)
-        throws IOException;
-
-
-    public final static int SHUT_RD = 0;
-    public final static int SHUT_WR = 1;
-    public final static int SHUT_RDWR = 2;
-
-    static native void shutdown(FileDescriptor fd, int how) throws IOException;
-
-    private static native int localPort(FileDescriptor fd)
-        throws IOException;
-
-    private static native InetAddress localInetAddress(FileDescriptor fd)
-        throws IOException;
-
-    static InetSocketAddress localAddress(FileDescriptor fd)
-        throws IOException
-    {
-        return new InetSocketAddress(localInetAddress(fd), localPort(fd));
-    }
-
-    private static native int remotePort(FileDescriptor fd)
-        throws IOException;
-
-    private static native InetAddress remoteInetAddress(FileDescriptor fd)
-        throws IOException;
-
-    static InetSocketAddress remoteAddress(FileDescriptor fd)
-        throws IOException
-    {
-        return new InetSocketAddress(remoteInetAddress(fd), remotePort(fd));
-    }
-
-    private static native int getIntOption0(FileDescriptor fd, boolean mayNeedConversion,
-                                            int level, int opt)
-        throws IOException;
-
-    private static native void setIntOption0(FileDescriptor fd, boolean mayNeedConversion,
-                                             int level, int opt, int arg)
-        throws IOException;
-
-    // -- Multicast support --
-
-
-    /**
-     * Join IPv4 multicast group
-     */
-    static int join4(FileDescriptor fd, int group, int interf, int source)
-        throws IOException
-    {
-        return joinOrDrop4(true, fd, group, interf, source);
-    }
-
-    /**
-     * Drop membership of IPv4 multicast group
-     */
-    static void drop4(FileDescriptor fd, int group, int interf, int source)
-        throws IOException
-    {
-        joinOrDrop4(false, fd, group, interf, source);
-    }
-
-    private static native int joinOrDrop4(boolean join, FileDescriptor fd, int group, int interf, int source)
-        throws IOException;
-
-    /**
-     * Block IPv4 source
-     */
-    static int block4(FileDescriptor fd, int group, int interf, int source)
-        throws IOException
-    {
-        return blockOrUnblock4(true, fd, group, interf, source);
-    }
-
-    /**
-     * Unblock IPv6 source
-     */
-    static void unblock4(FileDescriptor fd, int group, int interf, int source)
-        throws IOException
-    {
-        blockOrUnblock4(false, fd, group, interf, source);
-    }
-
-    private static native int blockOrUnblock4(boolean block, FileDescriptor fd, int group,
-                                              int interf, int source)
-        throws IOException;
-
-    /**
-     * Join IPv6 multicast group
-     */
-    static int join6(FileDescriptor fd, byte[] group, int index, byte[] source)
-        throws IOException
-    {
-        return joinOrDrop6(true, fd, group, index, source);
-    }
-
-    /**
-     * Drop membership of IPv6 multicast group
-     */
-    static void drop6(FileDescriptor fd, byte[] group, int index, byte[] source)
-        throws IOException
-    {
-        joinOrDrop6(false, fd, group, index, source);
-    }
-
-    private static native int joinOrDrop6(boolean join, FileDescriptor fd, byte[] group, int index, byte[] source)
-        throws IOException;
-
-    /**
-     * Block IPv6 source
-     */
-    static int block6(FileDescriptor fd, byte[] group, int index, byte[] source)
-        throws IOException
-    {
-        return blockOrUnblock6(true, fd, group, index, source);
-    }
-
-    /**
-     * Unblock IPv6 source
-     */
-    static void unblock6(FileDescriptor fd, byte[] group, int index, byte[] source)
-        throws IOException
-    {
-        blockOrUnblock6(false, fd, group, index, source);
-    }
-
-    static native int blockOrUnblock6(boolean block, FileDescriptor fd, byte[] group, int index, byte[] source)
-        throws IOException;
-
-    static native void setInterface4(FileDescriptor fd, int interf) throws IOException;
-
-    static native int getInterface4(FileDescriptor fd) throws IOException;
-
-    static native void setInterface6(FileDescriptor fd, int index) throws IOException;
-
-    static native int getInterface6(FileDescriptor fd) throws IOException;
-
-}
diff --git a/openjdk/sun/nio/ch/PollArrayWrapper.java b/openjdk/sun/nio/ch/PollArrayWrapper.java
deleted file mode 100644
index 72ed9adc..00000000
--- a/openjdk/sun/nio/ch/PollArrayWrapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.nio.ch;
-
-class PollArrayWrapper
-{
-    static final short POLLIN       = 0x0001;
-    static final short POLLCONN     = 0x0002;
-    static final short POLLOUT      = 0x0004;
-    static final short POLLERR      = 0x0008;
-    static final short POLLHUP      = 0x0010;
-    static final short POLLNVAL     = 0x0020;
-    static final short POLLREMOVE   = 0x0800;
-}
diff --git a/openjdk/sun/nio/ch/SelectionKeyImpl.java b/openjdk/sun/nio/ch/SelectionKeyImpl.java
deleted file mode 100644
index 5edc3005..00000000
--- a/openjdk/sun/nio/ch/SelectionKeyImpl.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-  Copyright (C) 2002, 2003, 2004, 2005, 2006 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-package sun.nio.ch;
-
-import java.nio.channels.CancelledKeyException;
-import java.nio.channels.SelectableChannel;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.nio.channels.spi.AbstractSelectionKey;
-
-final class SelectionKeyImpl extends AbstractSelectionKey
-{
-    final SelChImpl channel;
-    final SelectorImpl selector;
-    private final cli.System.Net.Sockets.Socket socket;
-    private int readyOps;
-    private volatile int interestOps;
-
-    SelectionKeyImpl(SelChImpl ch, SelectorImpl sel)
-    {
-        this.channel  = ch;
-        this.selector = sel;
-        socket = ch.getFD().getSocket();
-    }
-
-    public SelectableChannel channel()
-    {
-        return (SelectableChannel)channel;
-    }
-
-    public int readyOps()
-    {
-        if (!isValid())
-            throw new CancelledKeyException();
-    
-        return readyOps;
-    }
-
-    void readyOps(int ops)
-    {
-        readyOps = ops;
-    }
-
-    public synchronized int interestOps()
-    {
-        if (!isValid())
-            throw new CancelledKeyException();
-    
-        return interestOps;    
-    }
-
-    public synchronized SelectionKey interestOps(int ops)
-    {
-        if (!isValid())
-            throw new CancelledKeyException();
-
-        if ((ops & ~channel.validOps()) != 0)
-            throw new IllegalArgumentException();
-    
-        interestOps = ops;
-        return this;
-    }
-    
-    public Selector selector()
-    {
-        return selector;
-    }
-
-    cli.System.Net.Sockets.Socket getSocket()
-    {
-        return socket;
-    }
-
-    void nioReadyOps(int ops)
-    {
-        readyOps = ops;
-    }
-
-    int nioReadyOps()
-    {
-        return readyOps;
-    }
-
-    int nioInterestOps()
-    {
-        return interestOps;
-    }
-
-    SelectionKey nioInterestOps(int ops)
-    {
-        if ((ops & ~channel().validOps()) != 0)
-            throw new IllegalArgumentException();
-        channel.translateAndSetInterestOps(ops, this);
-        interestOps = ops;
-        return this;
-    }
-}
diff --git a/openjdk/sun/nio/ch/SocketDispatcher.java b/openjdk/sun/nio/ch/SocketDispatcher.java
deleted file mode 100644
index 7d408326..00000000
--- a/openjdk/sun/nio/ch/SocketDispatcher.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.nio.ch;
-
-import java.io.*;
-import java.net.SocketException;
-import java.net.SocketUtil;
-import java.nio.ByteBuffer;
-import cli.System.Net.Sockets.SocketFlags;
-
-/**
- * Allows different platforms to call different native methods
- * for read and write operations.
- */
-
-class SocketDispatcher extends NativeDispatcher
-{
-    int read(FileDescriptor fd, byte[] buf, int offset, int length) throws IOException {
-        if (length == 0)
-        {
-            return 0;
-        }
-        try
-        {
-            if (false) throw new cli.System.Net.Sockets.SocketException();
-            if (false) throw new cli.System.ObjectDisposedException("");
-            int read = fd.getSocket().Receive(buf, offset, length, SocketFlags.wrap(SocketFlags.None));
-            return read == 0 ? IOStatus.EOF : read;
-        }
-        catch (cli.System.Net.Sockets.SocketException x)
-        {
-            if (x.get_ErrorCode() == SocketUtil.WSAESHUTDOWN)
-            {
-                // the socket was shutdown, so we have to return EOF
-                return IOStatus.EOF;
-            }
-            else if (x.get_ErrorCode() == SocketUtil.WSAEWOULDBLOCK)
-            {
-                // nothing to read and would block
-                return IOStatus.UNAVAILABLE;
-            }
-            throw SocketUtil.convertSocketExceptionToIOException(x);
-        }
-        catch (cli.System.ObjectDisposedException x1)
-        {
-            throw new SocketException("Socket is closed");
-        }
-    }
-
-    int write(FileDescriptor fd, byte[] buf, int offset, int length) throws IOException {
-        try
-        {
-            if (false) throw new cli.System.Net.Sockets.SocketException();
-            if (false) throw new cli.System.ObjectDisposedException("");
-            return fd.getSocket().Send(buf, offset, length, SocketFlags.wrap(SocketFlags.None));
-        }
-        catch (cli.System.Net.Sockets.SocketException x)
-        {
-            if (x.get_ErrorCode() == SocketUtil.WSAEWOULDBLOCK)
-            {
-                return IOStatus.UNAVAILABLE;
-            }
-            throw SocketUtil.convertSocketExceptionToIOException(x);
-        }
-        catch (cli.System.ObjectDisposedException x1)
-        {
-            throw new SocketException("Socket is closed");
-        }
-    }
-
-    native long read(FileDescriptor fd, ByteBuffer[] bufs, int offset, int length) throws IOException;
-
-    native long write(FileDescriptor fd, ByteBuffer[] bufs, int offset, int length) throws IOException;
-
-    void close(FileDescriptor fd) throws IOException {
-    }
-
-    void preClose(FileDescriptor fd) throws IOException {
-        closeImpl(fd);
-    }
-
-    static void closeImpl(FileDescriptor fd) throws IOException {
-        try
-        {
-            if (false) throw new cli.System.Net.Sockets.SocketException();
-            if (false) throw new cli.System.ObjectDisposedException("");
-            fd.getSocket().Close();
-        }
-        catch (cli.System.Net.Sockets.SocketException x)
-        {
-            throw java.net.SocketUtil.convertSocketExceptionToIOException(x);
-        }
-        catch (cli.System.ObjectDisposedException x1)
-        {
-            throw new java.net.SocketException("Socket is closed");
-        }
-    }
-}
diff --git a/openjdk/sun/nio/ch/SocketOptionRegistry.java b/openjdk/sun/nio/ch/SocketOptionRegistry.java
deleted file mode 100644
index 83887fbc..00000000
--- a/openjdk/sun/nio/ch/SocketOptionRegistry.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2008, 2009,  Oracle and/or its affiliates. All rights reserved.
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.nio.ch;                                                            
-import java.net.SocketOption;                                                  
-import java.net.StandardSocketOptions;                                         
-import java.net.ProtocolFamily;                                                
-import java.net.StandardProtocolFamily;                                        
-import java.util.Map;                                                          
-import java.util.HashMap;                                                      
-import cli.System.Net.Sockets.SocketOptionLevel;
-import cli.System.Net.Sockets.SocketOptionName;
-
-class SocketOptionRegistry {                                                   
-    private SocketOptionRegistry() { }                                         
-    private static class RegistryKey {                                         
-        private final SocketOption<?> name;                                    
-        private final ProtocolFamily family;                                   
-        RegistryKey(SocketOption<?> name, ProtocolFamily family) {             
-            this.name = name;                                                  
-            this.family = family;                                              
-        }                                                                      
-        public int hashCode() {                                                
-            return name.hashCode() + family.hashCode();                        
-        }                                                                      
-        public boolean equals(Object ob) {                                     
-            if (ob == null) return false;                                      
-            if (!(ob instanceof RegistryKey)) return false;                    
-            RegistryKey other = (RegistryKey)ob;                               
-            if (this.name != other.name) return false;                         
-            if (this.family != other.family) return false;                     
-            return true;                                                       
-        }                                                                      
-    }                                                                          
-    private static class LazyInitialization {                                  
-        static final Map<RegistryKey,OptionKey> options = options();           
-        private static Map<RegistryKey,OptionKey> options() {                  
-            Map<RegistryKey,OptionKey> map =                                   
-                new HashMap<RegistryKey,OptionKey>();                          
-            map.put(new RegistryKey(StandardSocketOptions.SO_BROADCAST, Net.UNSPEC), new OptionKey(SocketOptionLevel.Socket, SocketOptionName.Broadcast));
-            map.put(new RegistryKey(StandardSocketOptions.SO_KEEPALIVE, Net.UNSPEC), new OptionKey(SocketOptionLevel.Socket, SocketOptionName.KeepAlive));
-            map.put(new RegistryKey(StandardSocketOptions.SO_LINGER, Net.UNSPEC), new OptionKey(SocketOptionLevel.Socket, SocketOptionName.Linger));
-            map.put(new RegistryKey(StandardSocketOptions.SO_SNDBUF, Net.UNSPEC), new OptionKey(SocketOptionLevel.Socket, SocketOptionName.SendBuffer));
-            map.put(new RegistryKey(StandardSocketOptions.SO_RCVBUF, Net.UNSPEC), new OptionKey(SocketOptionLevel.Socket, SocketOptionName.ReceiveBuffer));
-            map.put(new RegistryKey(StandardSocketOptions.SO_REUSEADDR, Net.UNSPEC), new OptionKey(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress));
-            map.put(new RegistryKey(StandardSocketOptions.TCP_NODELAY, Net.UNSPEC), new OptionKey(SocketOptionLevel.Tcp, SocketOptionName.NoDelay));
-            map.put(new RegistryKey(StandardSocketOptions.IP_TOS, StandardProtocolFamily.INET), new OptionKey(SocketOptionLevel.IP, SocketOptionName.TypeOfService));
-            map.put(new RegistryKey(StandardSocketOptions.IP_MULTICAST_IF, StandardProtocolFamily.INET), new OptionKey(SocketOptionLevel.IP, SocketOptionName.MulticastInterface));
-            map.put(new RegistryKey(StandardSocketOptions.IP_MULTICAST_TTL, StandardProtocolFamily.INET), new OptionKey(SocketOptionLevel.IP, SocketOptionName.IpTimeToLive));
-            map.put(new RegistryKey(StandardSocketOptions.IP_MULTICAST_LOOP, StandardProtocolFamily.INET), new OptionKey(SocketOptionLevel.IP, SocketOptionName.MulticastLoopback));
-            map.put(new RegistryKey(StandardSocketOptions.IP_MULTICAST_IF, StandardProtocolFamily.INET6), new OptionKey(SocketOptionLevel.IPv6, SocketOptionName.MulticastInterface));
-            map.put(new RegistryKey(StandardSocketOptions.IP_MULTICAST_TTL, StandardProtocolFamily.INET6), new OptionKey(SocketOptionLevel.IPv6, SocketOptionName.IpTimeToLive));
-            map.put(new RegistryKey(StandardSocketOptions.IP_MULTICAST_LOOP, StandardProtocolFamily.INET6), new OptionKey(SocketOptionLevel.IPv6, SocketOptionName.MulticastLoopback));
-            map.put(new RegistryKey(ExtendedSocketOption.SO_OOBINLINE, Net.UNSPEC), new OptionKey(SocketOptionLevel.Socket, SocketOptionName.OutOfBandInline));
-            return map;                                                        
-        }                                                                      
-    }                                                                          
-    public static OptionKey findOption(SocketOption<?> name, ProtocolFamily family) { 
-        RegistryKey key = new RegistryKey(name, family);                       
-        return LazyInitialization.options.get(key);                            
-    }                                                                          
-}                                                                              
diff --git a/openjdk/sun/nio/ch/Util.java b/openjdk/sun/nio/ch/Util.java
deleted file mode 100644
index 475c1b9b..00000000
--- a/openjdk/sun/nio/ch/Util.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.nio.ch;
-
-import java.lang.ref.SoftReference;
-import java.lang.reflect.*;
-import java.io.IOException;
-import java.io.FileDescriptor;
-import java.nio.ByteBuffer;
-import java.nio.MappedByteBuffer;
-import java.nio.channels.*;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.*;
-import sun.misc.Unsafe;
-import sun.misc.Cleaner;
-import sun.security.action.GetPropertyAction;
-
-
-class Util {
-
-    private static class SelectorWrapper {
-        private Selector sel;
-        private SelectorWrapper (Selector sel) {
-            this.sel = sel;
-            Cleaner.create(this, new Closer(sel));
-        }
-        private static class Closer implements Runnable {
-            private Selector sel;
-            private Closer (Selector sel) {
-                this.sel = sel;
-            }
-            public void run () {
-                try {
-                    sel.close();
-                } catch (Throwable th) {
-                    throw new Error(th);
-                }
-            }
-        }
-        public Selector get() { return sel;}
-    }
-
-    // Per-thread cached selector
-    private static ThreadLocal<SoftReference<SelectorWrapper>> localSelector
-        = new ThreadLocal<SoftReference<SelectorWrapper>>();
-    // Hold a reference to the selWrapper object to prevent it from
-    // being cleaned when the temporary selector wrapped is on lease.
-    private static ThreadLocal<SelectorWrapper> localSelectorWrapper
-        = new ThreadLocal<SelectorWrapper>();
-
-    // When finished, invoker must ensure that selector is empty
-    // by cancelling any related keys and explicitly releasing
-    // the selector by invoking releaseTemporarySelector()
-    static Selector getTemporarySelector(SelectableChannel sc)
-        throws IOException
-    {
-        SoftReference<SelectorWrapper> ref = localSelector.get();
-        SelectorWrapper selWrapper = null;
-        Selector sel = null;
-        if (ref == null
-            || ((selWrapper = ref.get()) == null)
-            || ((sel = selWrapper.get()) == null)
-            || (sel.provider() != sc.provider())) {
-            sel = sc.provider().openSelector();
-            selWrapper = new SelectorWrapper(sel);
-            localSelector.set(new SoftReference<SelectorWrapper>(selWrapper));
-        }
-        localSelectorWrapper.set(selWrapper);
-        return sel;
-    }
-
-    static void releaseTemporarySelector(Selector sel)
-        throws IOException
-    {
-        // Selector should be empty
-        sel.selectNow();                // Flush cancelled keys
-        assert sel.keys().isEmpty() : "Temporary selector not empty";
-        localSelectorWrapper.set(null);
-    }
-
-
-    // -- Random stuff --
-
-    static ByteBuffer[] subsequence(ByteBuffer[] bs, int offset, int length) {
-        if ((offset == 0) && (length == bs.length))
-            return bs;
-        int n = length;
-        ByteBuffer[] bs2 = new ByteBuffer[n];
-        for (int i = 0; i < n; i++)
-            bs2[i] = bs[offset + i];
-        return bs2;
-    }
-
-    static <E> Set<E> ungrowableSet(final Set<E> s) {
-        return new Set<E>() {
-
-                public int size()                 { return s.size(); }
-                public boolean isEmpty()          { return s.isEmpty(); }
-                public boolean contains(Object o) { return s.contains(o); }
-                public Object[] toArray()         { return s.toArray(); }
-                public <T> T[] toArray(T[] a)     { return s.toArray(a); }
-                public String toString()          { return s.toString(); }
-                public Iterator<E> iterator()     { return s.iterator(); }
-                public boolean equals(Object o)   { return s.equals(o); }
-                public int hashCode()             { return s.hashCode(); }
-                public void clear()               { s.clear(); }
-                public boolean remove(Object o)   { return s.remove(o); }
-
-                public boolean containsAll(Collection<?> coll) {
-                    return s.containsAll(coll);
-                }
-                public boolean removeAll(Collection<?> coll) {
-                    return s.removeAll(coll);
-                }
-                public boolean retainAll(Collection<?> coll) {
-                    return s.retainAll(coll);
-                }
-
-                public boolean add(E o){
-                    throw new UnsupportedOperationException();
-                }
-                public boolean addAll(Collection<? extends E> coll) {
-                    throw new UnsupportedOperationException();
-                }
-
-        };
-    }
-
-
-    private static volatile Constructor directByteBufferConstructor = null;
-
-    private static void initDBBConstructor() {
-        AccessController.doPrivileged(new PrivilegedAction<Void>() {
-                public Void run() {
-                    try {
-                        Class<?> cl = Class.forName("java.nio.DirectByteBuffer");
-                        Constructor ctor = cl.getDeclaredConstructor(
-                            new Class[] { int.class,
-                                          long.class,
-                                          FileDescriptor.class,
-                                          Runnable.class });
-                        ctor.setAccessible(true);
-                        directByteBufferConstructor = ctor;
-                    } catch (ClassNotFoundException x) {
-                        throw new InternalError();
-                    } catch (NoSuchMethodException x) {
-                        throw new InternalError();
-                    } catch (IllegalArgumentException x) {
-                        throw new InternalError();
-                    } catch (ClassCastException x) {
-                        throw new InternalError();
-                    }
-                    return null;
-                }});
-    }
-
-    static MappedByteBuffer newMappedByteBuffer(int size, long addr,
-                                                FileDescriptor fd,
-                                                Runnable unmapper)
-    {
-        MappedByteBuffer dbb;
-        if (directByteBufferConstructor == null)
-            initDBBConstructor();
-        try {
-            dbb = (MappedByteBuffer)directByteBufferConstructor.newInstance(
-              new Object[] { new Integer(size),
-                             new Long(addr),
-                             fd,
-                             unmapper });
-        } catch (InstantiationException e) {
-            throw new InternalError();
-        } catch (IllegalAccessException e) {
-            throw new InternalError();
-        } catch (InvocationTargetException e) {
-            throw new InternalError();
-        }
-        return dbb;
-    }
-
-    private static volatile Constructor directByteBufferRConstructor = null;
-
-    private static void initDBBRConstructor() {
-        AccessController.doPrivileged(new PrivilegedAction<Void>() {
-                public Void run() {
-                    try {
-                        Class<?> cl = Class.forName("java.nio.DirectByteBufferR");
-                        Constructor ctor = cl.getDeclaredConstructor(
-                            new Class[] { int.class,
-                                          long.class,
-                                          FileDescriptor.class,
-                                          Runnable.class });
-                        ctor.setAccessible(true);
-                        directByteBufferRConstructor = ctor;
-                    } catch (ClassNotFoundException x) {
-                        throw new InternalError();
-                    } catch (NoSuchMethodException x) {
-                        throw new InternalError();
-                    } catch (IllegalArgumentException x) {
-                        throw new InternalError();
-                    } catch (ClassCastException x) {
-                        throw new InternalError();
-                    }
-                    return null;
-                }});
-    }
-
-    static MappedByteBuffer newMappedByteBufferR(int size, long addr,
-                                                 FileDescriptor fd,
-                                                 Runnable unmapper)
-    {
-        MappedByteBuffer dbb;
-        if (directByteBufferRConstructor == null)
-            initDBBRConstructor();
-        try {
-            dbb = (MappedByteBuffer)directByteBufferRConstructor.newInstance(
-              new Object[] { new Integer(size),
-                             new Long(addr),
-                             fd,
-                             unmapper });
-        } catch (InstantiationException e) {
-            throw new InternalError();
-        } catch (IllegalAccessException e) {
-            throw new InternalError();
-        } catch (InvocationTargetException e) {
-            throw new InternalError();
-        }
-        return dbb;
-    }
-
-
-    // -- Bug compatibility --
-
-    private static volatile String bugLevel = null;
-
-    static boolean atBugLevel(String bl) {              // package-private
-        if (bugLevel == null) {
-            if (!sun.misc.VM.isBooted())
-                return false;
-            String value = AccessController.doPrivileged(
-                new GetPropertyAction("sun.nio.ch.bugLevel"));
-            bugLevel = (value != null) ? value : "";
-        }
-        return bugLevel.equals(bl);
-    }
-
-
-
-    // -- Initialization --
-
-
-    static void load() {
-    }
-
-}
diff --git a/openjdk/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java b/openjdk/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java
deleted file mode 100644
index 4b96dfac..00000000
--- a/openjdk/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java
+++ /dev/null
@@ -1,689 +0,0 @@
-/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.nio.ch;
-
-import java.nio.channels.*;
-import java.util.concurrent.*;
-import java.nio.ByteBuffer;
-import java.nio.BufferOverflowException;
-import java.io.IOException;
-import java.io.FileDescriptor;
-import cli.System.AsyncCallback;
-import cli.System.IAsyncResult;
-import cli.System.IO.FileStream;
-import cli.System.IO.SeekOrigin;
-
-/**
- * Windows implementation of AsynchronousFileChannel using overlapped I/O.
- */
-
-public class WindowsAsynchronousFileChannelImpl
-    extends AsynchronousFileChannelImpl
-    implements Groupable
-{
-    // error when EOF is detected asynchronously.
-    private static final int ERROR_HANDLE_EOF = 38;
-
-    // Lazy initialization of default I/O completion port
-    private static class DefaultIocpHolder {
-        static final Iocp defaultIocp = defaultIocp();
-        private static Iocp defaultIocp() {
-            try {
-                return new Iocp(null, ThreadPool.createDefault()).start();
-            } catch (IOException ioe) {
-                InternalError e = new InternalError();
-                e.initCause(ioe);
-                throw e;
-            }
-        }
-    }
-
-    // Used for force/truncate/size methods
-    private static final FileDispatcher nd = new FileDispatcherImpl();
-
-    // I/O completion port (group)
-    private final Iocp iocp;
-
-    private final boolean isDefaultIocp;
-
-
-    private WindowsAsynchronousFileChannelImpl(FileDescriptor fdObj,
-                                               boolean reading,
-                                               boolean writing,
-                                               Iocp iocp,
-                                               boolean isDefaultIocp)
-        throws IOException
-    {
-        super(fdObj, reading, writing, iocp.executor());
-        this.iocp = iocp;
-        this.isDefaultIocp = isDefaultIocp;
-    }
-
-    public static AsynchronousFileChannel open(FileDescriptor fdo,
-                                               boolean reading,
-                                               boolean writing,
-                                               ThreadPool pool)
-        throws IOException
-    {
-        Iocp iocp;
-        boolean isDefaultIocp;
-        if (pool == null) {
-            iocp = DefaultIocpHolder.defaultIocp;
-            isDefaultIocp = true;
-        } else {
-            iocp = new Iocp(null, pool).start();
-            isDefaultIocp = false;
-        }
-        try {
-            return new
-                WindowsAsynchronousFileChannelImpl(fdo, reading, writing, iocp, isDefaultIocp);
-        } catch (IOException x) {
-            // error binding to port so need to close it (if created for this channel)
-            if (!isDefaultIocp)
-                iocp.implClose();
-            throw x;
-        }
-    }
-
-    @Override
-    public void close() throws IOException {
-        closeLock.writeLock().lock();
-        try {
-            if (closed)
-                return;     // already closed
-            closed = true;
-        } finally {
-            closeLock.writeLock().unlock();
-        }
-
-        // invalidate all locks held for this channel
-        invalidateAllLocks();
-
-        // close the file
-        fdObj.close();
-
-        // for the non-default group close the port
-        if (!isDefaultIocp)
-            iocp.detachFromThreadPool();
-    }
-
-    @Override
-    public AsynchronousChannelGroupImpl group() {
-        return iocp;
-    }
-
-    /**
-     * Translates Throwable to IOException
-     */
-    private static IOException toIOException(Throwable x) {
-        if (x instanceof cli.System.ArgumentException) {
-            return new IOException(x.getMessage());
-        }
-        if (x instanceof cli.System.IO.IOException) {
-            return new IOException(x.getMessage());
-        }
-        if (x instanceof IOException) {
-            if (x instanceof ClosedChannelException)
-                x = new AsynchronousCloseException();
-            return (IOException)x;
-        }
-        return new IOException(x);
-    }
-
-    @Override
-    public long size() throws IOException {
-        try {
-            begin();
-            return nd.size(fdObj);
-        } finally {
-            end();
-        }
-    }
-
-    @Override
-    public AsynchronousFileChannel truncate(long size) throws IOException {
-        if (size < 0)
-            throw new IllegalArgumentException("Negative size");
-        if (!writing)
-            throw new NonWritableChannelException();
-        try {
-            begin();
-            if (size > nd.size(fdObj))
-                return this;
-            nd.truncate(fdObj, size);
-        } finally {
-            end();
-        }
-        return this;
-    }
-
-    @Override
-    public void force(boolean metaData) throws IOException {
-        try {
-            begin();
-            nd.force(fdObj, metaData);
-        } finally {
-            end();
-        }
-    }
-
-    // -- file locking --
-
-    /**
-     * Task that initiates locking operation and handles completion result.
-     */
-    private class LockTask<A> implements Runnable, Iocp.ResultHandler {
-        private final long position;
-        private final FileLockImpl fli;
-        private final PendingFuture<FileLock,A> result;
-
-        LockTask(long position,
-                 FileLockImpl fli,
-                 PendingFuture<FileLock,A> result)
-        {
-            this.position = position;
-            this.fli = fli;
-            this.result = result;
-        }
-
-        @Override
-        public void run() {
-            FileStream fs = (FileStream)fdObj.getStream();
-            for (;;) {
-                try {
-                    begin();
-
-                    try {
-                        if (false) throw new cli.System.IO.IOException();
-                        fs.Lock(position, fli.size());
-                        result.setResult(fli);
-                        break;
-                    } catch (cli.System.IO.IOException _) {
-                        // we failed to acquire the lock, try again next iteration
-                    }
-                } catch (Throwable x) {
-                    // lock failed or channel closed
-                    removeFromFileLockTable(fli);
-                    result.setFailure(toIOException(x));
-                } finally {
-                    end();
-                }
-                cli.System.Threading.Thread.Sleep(100);
-            }
-
-            // invoke completion handler
-            Invoker.invoke(result);
-        }
-
-        @Override
-        public void completed(int bytesTransferred, boolean canInvokeDirect) {
-            // release waiters and invoke completion handler
-            result.setResult(fli);
-            if (canInvokeDirect) {
-                Invoker.invokeUnchecked(result);
-            } else {
-                Invoker.invoke(result);
-            }
-        }
-
-        @Override
-        public void failed(int error, IOException x) {
-            // lock not acquired so remove from lock table
-            removeFromFileLockTable(fli);
-
-            // release waiters
-            if (isOpen()) {
-                result.setFailure(x);
-            } else {
-                result.setFailure(new AsynchronousCloseException());
-            }
-            Invoker.invoke(result);
-        }
-    }
-
-    @Override
-    <A> Future<FileLock> implLock(final long position,
-                                  final long size,
-                                  final boolean shared,
-                                  A attachment,
-                                  final CompletionHandler<FileLock,? super A> handler)
-    {
-        if (shared && !reading)
-            throw new NonReadableChannelException();
-        if (!shared && !writing)
-            throw new NonWritableChannelException();
-
-        // add to lock table
-        FileLockImpl fli = addToFileLockTable(position, size, shared);
-        if (fli == null) {
-            Throwable exc = new ClosedChannelException();
-            if (handler == null)
-                return CompletedFuture.withFailure(exc);
-            Invoker.invoke(this, handler, attachment, null, exc);
-            return null;
-        }
-
-        // create Future and task that will be invoked to acquire lock
-        PendingFuture<FileLock,A> result =
-            new PendingFuture<FileLock,A>(this, handler, attachment);
-        LockTask lockTask = new LockTask<A>(position, fli, result);
-        result.setContext(lockTask);
-
-        // initiate I/O
-        if (false) {
-            lockTask.run();
-        } else {
-            boolean executed = false;
-            try {
-                Invoker.invokeOnThreadInThreadPool(this, lockTask);
-                executed = true;
-            } finally {
-                if (!executed) {
-                    // rollback
-                    removeFromFileLockTable(fli);
-                }
-            }
-        }
-        return result;
-    }
-
-    static final int NO_LOCK = -1;       // Failed to lock
-    static final int LOCKED = 0;         // Obtained requested lock
-
-    @Override
-    public FileLock tryLock(long position, long size, boolean shared)
-        throws IOException
-    {
-        if (shared && !reading)
-            throw new NonReadableChannelException();
-        if (!shared && !writing)
-            throw new NonWritableChannelException();
-
-        // add to lock table
-        final FileLockImpl fli = addToFileLockTable(position, size, shared);
-        if (fli == null)
-            throw new ClosedChannelException();
-
-        boolean gotLock = false;
-        try {
-            begin();
-            // try to acquire the lock
-            int res;
-            try {
-                if (false) throw new cli.System.IO.IOException();
-                FileStream fs = (FileStream)fdObj.getStream();
-                fs.Lock(position, size);
-                res = LOCKED;
-            } catch (cli.System.IO.IOException _) {
-                res = NO_LOCK;
-            }
-            if (res == NO_LOCK)
-                return null;
-            gotLock = true;
-            return fli;
-        } finally {
-            if (!gotLock)
-                removeFromFileLockTable(fli);
-            end();
-        }
-    }
-
-    @Override
-    protected void implRelease(FileLockImpl fli) throws IOException {
-        try {
-            if (false) throw new cli.System.IO.IOException();
-            FileStream fs = (FileStream)fdObj.getStream();
-            fs.Unlock(fli.position(), fli.size());
-        } catch (cli.System.IO.IOException x) {
-            if (!FileDispatcherImpl.NotLockedHack.isErrorNotLocked(x)) {
-                throw new IOException(x.getMessage());
-            }
-        }
-    }
-
-    /**
-     * Task that initiates read operation and handles completion result.
-     */
-    private class ReadTask<A> implements Runnable, Iocp.ResultHandler, AsyncCallback.Method {
-        private final ByteBuffer dst;
-        private final int pos, rem;     // buffer position/remaining
-        private final long position;    // file position
-        private final PendingFuture<Integer,A> result;
-
-        // set to dst if direct; otherwise set to substituted direct buffer
-        private volatile ByteBuffer buf;
-
-        ReadTask(ByteBuffer dst,
-                 int pos,
-                 int rem,
-                 long position,
-                 PendingFuture<Integer,A> result)
-        {
-            this.dst = dst;
-            this.pos = pos;
-            this.rem = rem;
-            this.position = position;
-            this.result = result;
-        }
-
-        void updatePosition(int bytesTransferred) {
-            // if the I/O succeeded then adjust buffer position
-            if (bytesTransferred > 0) {
-                if (buf == dst) {
-                    try {
-                        dst.position(pos + bytesTransferred);
-                    } catch (IllegalArgumentException x) {
-                        // someone has changed the position; ignore
-                    }
-                } else {
-                    // had to substitute direct buffer
-                    buf.position(bytesTransferred).flip();
-                    try {
-                        dst.put(buf);
-                    } catch (BufferOverflowException x) {
-                        // someone has changed the position; ignore
-                    }
-                }
-            }
-        }
-
-        @Override
-        public void run() {
-            // Substitute an array backed buffer if not
-            if (dst.hasArray()) {
-                buf = dst;
-            } else {
-                buf = ByteBuffer.allocate(rem);
-            }
-
-            try {
-                begin();
-
-                // initiate read
-                FileStream fs = (FileStream)fdObj.getStream();
-                fs.Seek(position, SeekOrigin.wrap(SeekOrigin.Begin));
-                fs.BeginRead(buf.array(), buf.arrayOffset() + pos, rem, new AsyncCallback(this), null);
-                return;
-
-            } catch (Throwable x) {
-                // failed to initiate read
-                result.setFailure(toIOException(x));
-            } finally {
-                end();
-            }
-
-            // invoke completion handler
-            Invoker.invoke(result);
-        }
-
-        public void Invoke(IAsyncResult ar) {
-            try {
-                FileStream fs = (FileStream)fdObj.getStream();
-                completed(fs.EndRead(ar), false);
-            } catch (Throwable x) {
-                failed(0, toIOException(x));
-            }
-        }
-
-        /**
-         * Executed when the I/O has completed
-         */
-        @Override
-        public void completed(int bytesTransferred, boolean canInvokeDirect) {
-            updatePosition(bytesTransferred);
-
-            // release waiters and invoke completion handler
-            result.setResult(bytesTransferred);
-            if (canInvokeDirect) {
-                Invoker.invokeUnchecked(result);
-            } else {
-                Invoker.invoke(result);
-            }
-        }
-
-        @Override
-        public void failed(int error, IOException x) {
-            // if EOF detected asynchronously then it is reported as error
-            if (error == ERROR_HANDLE_EOF) {
-                completed(-1, false);
-            } else {
-                // release waiters
-                if (isOpen()) {
-                    result.setFailure(x);
-                } else {
-                    result.setFailure(new AsynchronousCloseException());
-                }
-                Invoker.invoke(result);
-            }
-        }
-    }
-
-    @Override
-    <A> Future<Integer> implRead(ByteBuffer dst,
-                                 long position,
-                                 A attachment,
-                                 CompletionHandler<Integer,? super A> handler)
-    {
-        if (!reading)
-            throw new NonReadableChannelException();
-        if (position < 0)
-            throw new IllegalArgumentException("Negative position");
-        if (dst.isReadOnly())
-            throw new IllegalArgumentException("Read-only buffer");
-
-        // check if channel is closed
-        if (!isOpen()) {
-            Throwable exc = new ClosedChannelException();
-            if (handler == null)
-                return CompletedFuture.withFailure(exc);
-            Invoker.invoke(this, handler, attachment, null, exc);
-            return null;
-        }
-
-        int pos = dst.position();
-        int lim = dst.limit();
-        assert (pos <= lim);
-        int rem = (pos <= lim ? lim - pos : 0);
-
-        // no space remaining
-        if (rem == 0) {
-            if (handler == null)
-                return CompletedFuture.withResult(0);
-            Invoker.invoke(this, handler, attachment, 0, null);
-            return null;
-        }
-
-        // create Future and task that initiates read
-        PendingFuture<Integer,A> result =
-            new PendingFuture<Integer,A>(this, handler, attachment);
-        ReadTask readTask = new ReadTask<A>(dst, pos, rem, position, result);
-        result.setContext(readTask);
-
-        // initiate I/O
-        if (Iocp.supportsThreadAgnosticIo()) {
-            readTask.run();
-        } else {
-            Invoker.invokeOnThreadInThreadPool(this, readTask);
-        }
-        return result;
-    }
-
-    /**
-     * Task that initiates write operation and handles completion result.
-     */
-    private class WriteTask<A> implements Runnable, Iocp.ResultHandler, AsyncCallback.Method {
-        private final ByteBuffer src;
-        private final int pos, rem;     // buffer position/remaining
-        private final long position;    // file position
-        private final PendingFuture<Integer,A> result;
-
-        // set to src if direct; otherwise set to substituted direct buffer
-        private volatile ByteBuffer buf;
-
-        WriteTask(ByteBuffer src,
-                  int pos,
-                  int rem,
-                  long position,
-                  PendingFuture<Integer,A> result)
-        {
-            this.src = src;
-            this.pos = pos;
-            this.rem = rem;
-            this.position = position;
-            this.result = result;
-        }
-
-        void updatePosition(int bytesTransferred) {
-            // if the I/O succeeded then adjust buffer position
-            if (bytesTransferred > 0) {
-                try {
-                    src.position(pos + bytesTransferred);
-                } catch (IllegalArgumentException x) {
-                    // someone has changed the position
-                }
-            }
-        }
-
-        @Override
-        public void run() {
-            // Substitute an array backed buffer if not
-            if (src.hasArray()) {
-                buf = src;
-            } else {
-                buf = ByteBuffer.allocate(rem);
-                buf.put(src);
-                buf.flip();
-                // temporarily restore position as we don't know how many bytes
-                // will be written
-                src.position(pos);
-            }
-
-            try {
-                begin();
-
-                // initiate the write
-                FileStream fs = (FileStream)fdObj.getStream();
-                fs.Seek(position, SeekOrigin.wrap(SeekOrigin.Begin));
-                fs.BeginWrite(buf.array(), buf.arrayOffset() + pos, rem, new AsyncCallback(this), null);
-                return;
-
-            } catch (Throwable x) {
-                // failed to initiate read:
-                result.setFailure(toIOException(x));
-
-            } finally {
-                end();
-            }
-
-            // invoke completion handler
-            Invoker.invoke(result);
-        }
-
-        public void Invoke(IAsyncResult ar) {
-            try {
-                FileStream fs = (FileStream)fdObj.getStream();
-                fs.EndWrite(ar);
-                completed(rem, false);
-            } catch (Throwable x) {
-                failed(0, toIOException(x));
-            }
-        }
-
-        /**
-         * Executed when the I/O has completed
-         */
-        @Override
-        public void completed(int bytesTransferred, boolean canInvokeDirect) {
-            updatePosition(bytesTransferred);
-
-            // release waiters and invoke completion handler
-            result.setResult(bytesTransferred);
-            if (canInvokeDirect) {
-                Invoker.invokeUnchecked(result);
-            } else {
-                Invoker.invoke(result);
-            }
-        }
-
-        @Override
-        public void failed(int error, IOException x) {
-            // release waiters and invoker completion handler
-            if (isOpen()) {
-                result.setFailure(x);
-            } else {
-                result.setFailure(new AsynchronousCloseException());
-            }
-            Invoker.invoke(result);
-        }
-    }
-
-    <A> Future<Integer> implWrite(ByteBuffer src,
-                                  long position,
-                                  A attachment,
-                                  CompletionHandler<Integer,? super A> handler)
-    {
-        if (!writing)
-            throw new NonWritableChannelException();
-        if (position < 0)
-            throw new IllegalArgumentException("Negative position");
-
-        // check if channel is closed
-        if (!isOpen()) {
-           Throwable exc = new ClosedChannelException();
-            if (handler == null)
-                return CompletedFuture.withFailure(exc);
-            Invoker.invoke(this, handler, attachment, null, exc);
-            return null;
-        }
-
-        int pos = src.position();
-        int lim = src.limit();
-        assert (pos <= lim);
-        int rem = (pos <= lim ? lim - pos : 0);
-
-        // nothing to write
-        if (rem == 0) {
-            if (handler == null)
-                return CompletedFuture.withResult(0);
-            Invoker.invoke(this, handler, attachment, 0, null);
-            return null;
-        }
-
-        // create Future and task to initiate write
-        PendingFuture<Integer,A> result =
-            new PendingFuture<Integer,A>(this, handler, attachment);
-        WriteTask writeTask = new WriteTask<A>(src, pos, rem, position, result);
-        result.setContext(writeTask);
-
-        // initiate I/O
-        if (Iocp.supportsThreadAgnosticIo()) {
-            writeTask.run();
-        } else {
-            Invoker.invokeOnThreadInThreadPool(this, writeTask);
-        }
-        return result;
-    }
-}
diff --git a/openjdk/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java b/openjdk/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java
deleted file mode 100644
index b95f4279..00000000
--- a/openjdk/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.nio.ch;
-
-import java.nio.channels.*;
-import java.net.InetSocketAddress;
-import java.util.concurrent.Future;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.io.FileDescriptor;
-import java.io.IOException;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-/**
- * Windows implementation of AsynchronousServerSocketChannel using overlapped I/O.
- */
-
-class WindowsAsynchronousServerSocketChannelImpl
-    extends AsynchronousServerSocketChannelImpl
-{
-    private final Iocp iocp;
-
-    // flag to indicate that an accept operation is outstanding
-    private AtomicBoolean accepting = new AtomicBoolean();
-
-
-    WindowsAsynchronousServerSocketChannelImpl(Iocp iocp) throws IOException {
-        super(iocp);
-
-        this.iocp = iocp;
-    }
-
-    @Override
-    void implClose() throws IOException {
-        // close socket (which may cause outstanding accept to be aborted).
-        SocketDispatcher.closeImpl(fd);
-    }
-
-    @Override
-    public AsynchronousChannelGroupImpl group() {
-        return iocp;
-    }
-
-    /**
-     * Task to initiate accept operation and to handle result.
-     */
-    private class AcceptTask implements Runnable, Iocp.ResultHandler {
-        private final WindowsAsynchronousSocketChannelImpl channel;
-        private final AccessControlContext acc;
-        private final PendingFuture<AsynchronousSocketChannel,Object> result;
-
-        AcceptTask(WindowsAsynchronousSocketChannelImpl channel,
-                   AccessControlContext acc,
-                   PendingFuture<AsynchronousSocketChannel,Object> result)
-        {
-            this.channel = channel;
-            this.acc = acc;
-            this.result = result;
-        }
-
-        void enableAccept() {
-            accepting.set(false);
-        }
-
-        void closeChildChannel() {
-            try {
-                channel.close();
-            } catch (IOException ignore) { }
-        }
-
-        // caller must have acquired read lock for the listener and child channel.
-        void finishAccept() throws IOException {
-            /**
-             * Set local/remote addresses. This is currently very inefficient
-             * in that it requires 2 calls to getsockname and 2 calls to getpeername.
-             * (should change this to use GetAcceptExSockaddrs)
-             */
-            updateAcceptContext(fd, channel.fd);
-
-            InetSocketAddress local = Net.localAddress(channel.fd);
-            final InetSocketAddress remote = Net.remoteAddress(channel.fd);
-            channel.setConnected(local, remote);
-
-            // permission check (in context of initiating thread)
-            if (acc != null) {
-                AccessController.doPrivileged(new PrivilegedAction<Void>() {
-                    public Void run() {
-                        SecurityManager sm = System.getSecurityManager();
-                        sm.checkAccept(remote.getAddress().getHostAddress(),
-                                       remote.getPort());
-                        return null;
-                    }
-                }, acc);
-            }
-        }
-
-        /**
-         * Initiates the accept operation.
-         */
-        @Override
-        public void run() {
-
-            try {
-                // begin usage of listener socket
-                begin();
-                try {
-                    // begin usage of child socket (as it is registered with
-                    // completion port and so may be closed in the event that
-                    // the group is forcefully closed).
-                    channel.begin();
-
-                    synchronized (result) {
-
-                        int n = accept0(fd, channel.fd, this);
-                        if (n == IOStatus.UNAVAILABLE) {
-                            return;
-                        }
-
-                        // connection accepted immediately
-                        finishAccept();
-
-                        // allow another accept before the result is set
-                        enableAccept();
-                        result.setResult(channel);
-                    }
-                } finally {
-                    // end usage on child socket
-                    channel.end();
-                }
-            } catch (Throwable x) {
-                // failed to initiate accept so release resources
-                closeChildChannel();
-                if (x instanceof ClosedChannelException)
-                    x = new AsynchronousCloseException();
-                if (!(x instanceof IOException) && !(x instanceof SecurityException))
-                    x = new IOException(x);
-                enableAccept();
-                result.setFailure(x);
-            } finally {
-                // end of usage of listener socket
-                end();
-            }
-
-            // accept completed immediately but may not have executed on
-            // initiating thread in which case the operation may have been
-            // cancelled.
-            if (result.isCancelled()) {
-                closeChildChannel();
-            }
-
-            // invoke completion handler
-            Invoker.invokeIndirectly(result);
-        }
-
-        /**
-         * Executed when the I/O has completed
-         */
-        @Override
-        public void completed(int bytesTransferred, boolean canInvokeDirect) {
-            try {
-                // connection accept after group has shutdown
-                if (iocp.isShutdown()) {
-                    throw new IOException(new ShutdownChannelGroupException());
-                }
-
-                // finish the accept
-                try {
-                    begin();
-                    try {
-                        channel.begin();
-                        finishAccept();
-                    } finally {
-                        channel.end();
-                    }
-                } finally {
-                    end();
-                }
-
-                // allow another accept before the result is set
-                enableAccept();
-                result.setResult(channel);
-            } catch (Throwable x) {
-                enableAccept();
-                closeChildChannel();
-                if (x instanceof ClosedChannelException)
-                    x = new AsynchronousCloseException();
-                if (!(x instanceof IOException) && !(x instanceof SecurityException))
-                    x = new IOException(x);
-                result.setFailure(x);
-            }
-
-            // if an async cancel has already cancelled the operation then
-            // close the new channel so as to free resources
-            if (result.isCancelled()) {
-                closeChildChannel();
-            }
-
-            // invoke handler (but not directly)
-            Invoker.invokeIndirectly(result);
-        }
-
-        @Override
-        public void failed(int error, IOException x) {
-            enableAccept();
-            closeChildChannel();
-
-            // release waiters
-            if (isOpen()) {
-                result.setFailure(x);
-            } else {
-                result.setFailure(new AsynchronousCloseException());
-            }
-            Invoker.invokeIndirectly(result);
-        }
-    }
-
-    @Override
-    Future<AsynchronousSocketChannel> implAccept(Object attachment,
-        final CompletionHandler<AsynchronousSocketChannel,Object> handler)
-    {
-        if (!isOpen()) {
-            Throwable exc = new ClosedChannelException();
-            if (handler == null)
-                return CompletedFuture.withFailure(exc);
-            Invoker.invokeIndirectly(this, handler, attachment, null, exc);
-            return null;
-        }
-        if (isAcceptKilled())
-            throw new RuntimeException("Accept not allowed due to cancellation");
-
-        // ensure channel is bound to local address
-        if (localAddress == null)
-            throw new NotYetBoundException();
-
-        // create the socket that will be accepted. The creation of the socket
-        // is enclosed by a begin/end for the listener socket to ensure that
-        // we check that the listener is open and also to prevent the I/O
-        // port from being closed as the new socket is registered.
-        WindowsAsynchronousSocketChannelImpl ch = null;
-        IOException ioe = null;
-        try {
-            begin();
-            ch = new WindowsAsynchronousSocketChannelImpl(iocp, false);
-        } catch (IOException x) {
-            ioe = x;
-        } finally {
-            end();
-        }
-        if (ioe != null) {
-            if (handler == null)
-                return CompletedFuture.withFailure(ioe);
-            Invoker.invokeIndirectly(this, handler, attachment, null, ioe);
-            return null;
-        }
-
-        // need calling context when there is security manager as
-        // permission check may be done in a different thread without
-        // any application call frames on the stack
-        AccessControlContext acc = (System.getSecurityManager() == null) ?
-            null : AccessController.getContext();
-
-        PendingFuture<AsynchronousSocketChannel,Object> result =
-            new PendingFuture<AsynchronousSocketChannel,Object>(this, handler, attachment);
-        AcceptTask task = new AcceptTask(ch, acc, result);
-        result.setContext(task);
-
-        // check and set flag to prevent concurrent accepting
-        if (!accepting.compareAndSet(false, true))
-            throw new AcceptPendingException();
-
-        // initiate I/O
-        if (Iocp.supportsThreadAgnosticIo()) {
-            task.run();
-        } else {
-            Invoker.invokeOnThreadInThreadPool(this, task);
-        }
-        return result;
-    }
-
-    // -- Native methods --
-
-    private static native void initIDs();
-
-    private static native int accept0(FileDescriptor listenSocket, FileDescriptor acceptSocket,
-        Iocp.ResultHandler handler) throws IOException;
-
-    private static native void updateAcceptContext(FileDescriptor listenSocket,
-        FileDescriptor acceptSocket) throws IOException;
-
-    private static native void closesocket0(long socket) throws IOException;
-
-    static {
-        Util.load();
-        initIDs();
-    }
-}
diff --git a/openjdk/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java b/openjdk/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java
deleted file mode 100644
index e82c1d9b..00000000
--- a/openjdk/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java
+++ /dev/null
@@ -1,817 +0,0 @@
-/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.nio.ch;
-
-import java.nio.channels.*;
-import java.nio.ByteBuffer;
-import java.nio.BufferOverflowException;
-import java.net.*;
-import java.util.concurrent.*;
-import java.io.FileDescriptor;
-import java.io.IOException;
-
-/**
- * Windows implementation of AsynchronousSocketChannel using overlapped I/O.
- */
-
-class WindowsAsynchronousSocketChannelImpl
-    extends AsynchronousSocketChannelImpl
-{
-    // maximum vector size for scatter/gather I/O
-    private static final int MAX_WSABUF     = 16;
-
-    // I/O completion port that the socket is associated with
-    private final Iocp iocp;
-
-
-    WindowsAsynchronousSocketChannelImpl(Iocp iocp, boolean failIfGroupShutdown)
-        throws IOException
-    {
-        super(iocp);
-
-        this.iocp = iocp;
-    }
-
-    WindowsAsynchronousSocketChannelImpl(Iocp iocp) throws IOException {
-        this(iocp, true);
-    }
-
-    @Override
-    public AsynchronousChannelGroupImpl group() {
-        return iocp;
-    }
-
-    // invoked by WindowsAsynchronousServerSocketChannelImpl when new connection
-    // accept
-    void setConnected(SocketAddress localAddress, SocketAddress remoteAddress) {
-        synchronized (stateLock) {
-            state = ST_CONNECTED;
-            this.localAddress = localAddress;
-            this.remoteAddress = remoteAddress;
-        }
-    }
-
-    @Override
-    void implClose() throws IOException {
-        // close socket (may cause outstanding async I/O operations to fail).
-        SocketDispatcher.closeImpl(fd);
-    }
-
-    @Override
-    public void onCancel(PendingFuture<?,?> task) {
-        if (task.getContext() instanceof ConnectTask)
-            killConnect();
-        if (task.getContext() instanceof ReadTask)
-            killReading();
-        if (task.getContext() instanceof WriteTask)
-            killWriting();
-    }
-
-    /**
-     * Implements the task to initiate a connection and the handler to
-     * consume the result when the connection is established (or fails).
-     */
-    private class ConnectTask<A> implements Runnable, Iocp.ResultHandler {
-        private final InetSocketAddress remote;
-        private final PendingFuture<Void,A> result;
-
-        ConnectTask(InetSocketAddress remote, PendingFuture<Void,A> result) {
-            this.remote = remote;
-            this.result = result;
-        }
-
-        private void closeChannel() {
-            try {
-                close();
-            } catch (IOException ignore) { }
-        }
-
-        private IOException toIOException(Throwable x) {
-            if (x instanceof IOException) {
-                if (x instanceof ClosedChannelException)
-                    x = new AsynchronousCloseException();
-                return (IOException)x;
-            }
-            return new IOException(x);
-        }
-
-        /**
-         * Invoke after a connection is successfully established.
-         */
-        private void afterConnect() throws IOException {
-            updateConnectContext(fd);
-            synchronized (stateLock) {
-                state = ST_CONNECTED;
-                remoteAddress = remote;
-            }
-        }
-
-        /**
-         * Task to initiate a connection.
-         */
-        @Override
-        public void run() {
-            Throwable exc = null;
-            try {
-                begin();
-
-                // synchronize on result to allow this thread handle the case
-                // where the connection is established immediately.
-                synchronized (result) {
-                    // initiate the connection
-                    int n = connect0(fd, Net.isIPv6Available(), remote.getAddress(),
-                                     remote.getPort(), this);
-                    if (n == IOStatus.UNAVAILABLE) {
-                        // connection is pending
-                        return;
-                    }
-
-                    // connection established immediately
-                    afterConnect();
-                    result.setResult(null);
-                }
-            } catch (Throwable x) {
-                exc = x;
-            } finally {
-                end();
-            }
-
-            if (exc != null) {
-                closeChannel();
-                result.setFailure(toIOException(exc));
-            }
-            Invoker.invoke(result);
-        }
-
-        /**
-         * Invoked by handler thread when connection established.
-         */
-        @Override
-        public void completed(int bytesTransferred, boolean canInvokeDirect) {
-            Throwable exc = null;
-            try {
-                begin();
-                afterConnect();
-                result.setResult(null);
-            } catch (Throwable x) {
-                // channel is closed or unable to finish connect
-                exc = x;
-            } finally {
-                end();
-            }
-
-            // can't close channel while in begin/end block
-            if (exc != null) {
-                closeChannel();
-                result.setFailure(toIOException(exc));
-            }
-
-            if (canInvokeDirect) {
-                Invoker.invokeUnchecked(result);
-            } else {
-                Invoker.invoke(result);
-            }
-        }
-
-        /**
-         * Invoked by handler thread when failed to establish connection.
-         */
-        @Override
-        public void failed(int error, IOException x) {
-            if (isOpen()) {
-                closeChannel();
-                result.setFailure(x);
-            } else {
-                result.setFailure(new AsynchronousCloseException());
-            }
-            Invoker.invoke(result);
-        }
-    }
-
-    @Override
-    <A> Future<Void> implConnect(SocketAddress remote,
-                                 A attachment,
-                                 CompletionHandler<Void,? super A> handler)
-    {
-        if (!isOpen()) {
-            Throwable exc = new ClosedChannelException();
-            if (handler == null)
-                return CompletedFuture.withFailure(exc);
-            Invoker.invoke(this, handler, attachment, null, exc);
-            return null;
-        }
-
-        InetSocketAddress isa = Net.checkAddress(remote);
-
-        // permission check
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null)
-            sm.checkConnect(isa.getAddress().getHostAddress(), isa.getPort());
-
-        // check and update state
-        // ConnectEx requires the socket to be bound to a local address
-        IOException bindException = null;
-        synchronized (stateLock) {
-            if (state == ST_CONNECTED)
-                throw new AlreadyConnectedException();
-            if (state == ST_PENDING)
-                throw new ConnectionPendingException();
-            if (localAddress == null) {
-                try {
-                    bind(new InetSocketAddress(0));
-                } catch (IOException x) {
-                    bindException = x;
-                }
-            }
-            if (bindException == null)
-                state = ST_PENDING;
-        }
-
-        // handle bind failure
-        if (bindException != null) {
-            try {
-                close();
-            } catch (IOException ignore) { }
-            if (handler == null)
-                return CompletedFuture.withFailure(bindException);
-            Invoker.invoke(this, handler, attachment, null, bindException);
-            return null;
-        }
-
-        // setup task
-        PendingFuture<Void,A> result =
-            new PendingFuture<Void,A>(this, handler, attachment);
-        ConnectTask task = new ConnectTask<A>(isa, result);
-        result.setContext(task);
-
-        // initiate I/O
-        if (Iocp.supportsThreadAgnosticIo()) {
-            task.run();
-        } else {
-            Invoker.invokeOnThreadInThreadPool(this, task);
-        }
-        return result;
-    }
-
-    /**
-     * Implements the task to initiate a read and the handler to consume the
-     * result when the read completes.
-     */
-    private class ReadTask<V,A> implements Runnable, Iocp.ResultHandler {
-        private final ByteBuffer[] bufs;
-        private final int numBufs;
-        private final boolean scatteringRead;
-        private final PendingFuture<V,A> result;
-
-        // set by run method
-        private ByteBuffer[] shadow;
-
-        ReadTask(ByteBuffer[] bufs,
-                 boolean scatteringRead,
-                 PendingFuture<V,A> result)
-        {
-            this.bufs = bufs;
-            this.numBufs = (bufs.length > MAX_WSABUF) ? MAX_WSABUF : bufs.length;
-            this.scatteringRead = scatteringRead;
-            this.result = result;
-        }
-
-        /**
-         * Invoked prior to read to prepare the WSABUF array. Where necessary,
-         * it substitutes direct buffers with managed buffers.
-         */
-        void prepareBuffers() {
-            shadow = new ByteBuffer[numBufs];
-            for (int i=0; i<numBufs; i++) {
-                ByteBuffer dst = bufs[i];
-                int pos = dst.position();
-                int lim = dst.limit();
-                assert (pos <= lim);
-                int rem = (pos <= lim ? lim - pos : 0);
-                if (!dst.hasArray()) {
-                    // substitute with direct buffer
-                    ByteBuffer bb = ByteBuffer.allocate(rem);
-                    shadow[i] = bb;
-                } else {
-                    shadow[i] = dst;
-                }
-            }
-        }
-
-        /**
-         * Invoked after a read has completed to update the buffer positions
-         * and release any substituted buffers.
-         */
-        void updateBuffers(int bytesRead) {
-            for (int i=0; i<numBufs; i++) {
-                ByteBuffer nextBuffer = shadow[i];
-                int pos = nextBuffer.position();
-                int len = nextBuffer.remaining();
-                if (bytesRead >= len) {
-                    bytesRead -= len;
-                    int newPosition = pos + len;
-                    try {
-                        nextBuffer.position(newPosition);
-                    } catch (IllegalArgumentException x) {
-                        // position changed by another
-                    }
-                } else { // Buffers not completely filled
-                    if (bytesRead > 0) {
-                        assert(pos + bytesRead < (long)Integer.MAX_VALUE);
-                        int newPosition = pos + bytesRead;
-                        try {
-                            nextBuffer.position(newPosition);
-                        } catch (IllegalArgumentException x) {
-                            // position changed by another
-                        }
-                    }
-                    break;
-                }
-            }
-
-            // Put results from shadow into the slow buffers
-            for (int i=0; i<numBufs; i++) {
-                if (!bufs[i].hasArray()) {
-                    shadow[i].flip();
-                    try {
-                        bufs[i].put(shadow[i]);
-                    } catch (BufferOverflowException x) {
-                        // position changed by another
-                    }
-                }
-            }
-        }
-
-        void releaseBuffers() {
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        public void run() {
-            boolean prepared = false;
-            boolean pending = false;
-
-            try {
-                begin();
-
-                // substitute direct buffers
-                prepareBuffers();
-                prepared = true;
-
-                // initiate read
-                int n = read0(fd, shadow, this);
-                if (n == IOStatus.UNAVAILABLE) {
-                    // I/O is pending
-                    pending = true;
-                    return;
-                }
-                if (n == IOStatus.EOF) {
-                    // input shutdown
-                    enableReading();
-                    if (scatteringRead) {
-                        result.setResult((V)Long.valueOf(-1L));
-                    } else {
-                        result.setResult((V)Integer.valueOf(-1));
-                    }
-                }
-                // read completed immediately
-                if (n == 0) {
-                    n = -1; // EOF
-                } else {
-                    updateBuffers(n);
-                }
-                releaseBuffers();
-                enableReading();
-                if (scatteringRead) {
-                    result.setResult((V)Long.valueOf(n));
-                } else {
-                    result.setResult((V)Integer.valueOf(n));
-                }
-            } catch (Throwable x) {
-                // failed to initiate read
-                // reset read flag before releasing waiters
-                enableReading();
-                if (x instanceof ClosedChannelException)
-                    x = new AsynchronousCloseException();
-                if (!(x instanceof IOException))
-                    x = new IOException(x);
-                result.setFailure(x);
-            } finally {
-                // release resources if I/O not pending
-                if (!pending) {
-                    if (prepared)
-                        releaseBuffers();
-                }
-                end();
-            }
-
-            // invoke completion handler
-            Invoker.invoke(result);
-        }
-
-        /**
-         * Executed when the I/O has completed
-         */
-        @Override
-        @SuppressWarnings("unchecked")
-        public void completed(int bytesTransferred, boolean canInvokeDirect) {
-            if (bytesTransferred == 0) {
-                bytesTransferred = -1;  // EOF
-            } else {
-                updateBuffers(bytesTransferred);
-            }
-
-            // return direct buffer to cache if substituted
-            releaseBuffers();
-
-            // release waiters if not already released by timeout
-            synchronized (result) {
-                if (result.isDone())
-                    return;
-                enableReading();
-                if (scatteringRead) {
-                    result.setResult((V)Long.valueOf(bytesTransferred));
-                } else {
-                    result.setResult((V)Integer.valueOf(bytesTransferred));
-                }
-            }
-            if (canInvokeDirect) {
-                Invoker.invokeUnchecked(result);
-            } else {
-                Invoker.invoke(result);
-            }
-        }
-
-        @Override
-        public void failed(int error, IOException x) {
-            // return direct buffer to cache if substituted
-            releaseBuffers();
-
-            // release waiters if not already released by timeout
-            if (!isOpen())
-                x = new AsynchronousCloseException();
-
-            synchronized (result) {
-                if (result.isDone())
-                    return;
-                enableReading();
-                result.setFailure(x);
-            }
-            Invoker.invoke(result);
-        }
-
-        /**
-         * Invoked if timeout expires before it is cancelled
-         */
-        void timeout() {
-            // synchronize on result as the I/O could complete/fail
-            synchronized (result) {
-                if (result.isDone())
-                    return;
-
-                // kill further reading before releasing waiters
-                enableReading(true);
-                result.setFailure(new InterruptedByTimeoutException());
-            }
-
-            // invoke handler without any locks
-            Invoker.invoke(result);
-        }
-    }
-
-    @Override
-    <V extends Number,A> Future<V> implRead(boolean isScatteringRead,
-                                            ByteBuffer dst,
-                                            ByteBuffer[] dsts,
-                                            long timeout,
-                                            TimeUnit unit,
-                                            A attachment,
-                                            CompletionHandler<V,? super A> handler)
-    {
-        // setup task
-        PendingFuture<V,A> result =
-            new PendingFuture<V,A>(this, handler, attachment);
-        ByteBuffer[] bufs;
-        if (isScatteringRead) {
-            bufs = dsts;
-        } else {
-            bufs = new ByteBuffer[1];
-            bufs[0] = dst;
-        }
-        final ReadTask readTask = new ReadTask<V,A>(bufs, isScatteringRead, result);
-        result.setContext(readTask);
-
-        // schedule timeout
-        if (timeout > 0L) {
-            Future<?> timeoutTask = iocp.schedule(new Runnable() {
-                public void run() {
-                    readTask.timeout();
-                }
-            }, timeout, unit);
-            result.setTimeoutTask(timeoutTask);
-        }
-
-        // initiate I/O
-        if (Iocp.supportsThreadAgnosticIo()) {
-            readTask.run();
-        } else {
-            Invoker.invokeOnThreadInThreadPool(this, readTask);
-        }
-        return result;
-    }
-
-    /**
-     * Implements the task to initiate a write and the handler to consume the
-     * result when the write completes.
-     */
-    private class WriteTask<V,A> implements Runnable, Iocp.ResultHandler {
-        private final ByteBuffer[] bufs;
-        private final int numBufs;
-        private final boolean gatheringWrite;
-        private final PendingFuture<V,A> result;
-
-        // set by run method
-        private ByteBuffer[] shadow;
-
-        WriteTask(ByteBuffer[] bufs,
-                  boolean gatheringWrite,
-                  PendingFuture<V,A> result)
-        {
-            this.bufs = bufs;
-            this.numBufs = (bufs.length > MAX_WSABUF) ? MAX_WSABUF : bufs.length;
-            this.gatheringWrite = gatheringWrite;
-            this.result = result;
-        }
-
-        /**
-         * Invoked prior to write to prepare the WSABUF array. Where necessary,
-         * it substitutes direct buffers with managed buffers.
-         */
-        void prepareBuffers() {
-            shadow = new ByteBuffer[numBufs];
-            for (int i=0; i<numBufs; i++) {
-                ByteBuffer src = bufs[i];
-                int pos = src.position();
-                int lim = src.limit();
-                assert (pos <= lim);
-                int rem = (pos <= lim ? lim - pos : 0);
-                if (!src.hasArray()) {
-                    // substitute with direct buffer
-                    ByteBuffer bb = ByteBuffer.allocate(rem);
-                    bb.put(src);
-                    bb.flip();
-                    src.position(pos);  // leave heap buffer untouched for now
-                    shadow[i] = bb;
-                } else {
-                    shadow[i] = src;
-                }
-            }
-        }
-
-        /**
-         * Invoked after a write has completed to update the buffer positions
-         * and release any substituted buffers.
-         */
-        void updateBuffers(int bytesWritten) {
-            // Notify the buffers how many bytes were taken
-            for (int i=0; i<numBufs; i++) {
-                ByteBuffer nextBuffer = bufs[i];
-                int pos = nextBuffer.position();
-                int lim = nextBuffer.limit();
-                int len = (pos <= lim ? lim - pos : lim);
-                if (bytesWritten >= len) {
-                    bytesWritten -= len;
-                    int newPosition = pos + len;
-                    try {
-                        nextBuffer.position(newPosition);
-                    } catch (IllegalArgumentException x) {
-                        // position changed by someone else
-                    }
-                } else { // Buffers not completely filled
-                    if (bytesWritten > 0) {
-                        assert(pos + bytesWritten < (long)Integer.MAX_VALUE);
-                        int newPosition = pos + bytesWritten;
-                        try {
-                            nextBuffer.position(newPosition);
-                        } catch (IllegalArgumentException x) {
-                            // position changed by someone else
-                        }
-                    }
-                    break;
-                }
-            }
-        }
-
-        void releaseBuffers() {
-        }
-
-        @Override
-        //@SuppressWarnings("unchecked")
-        public void run() {
-            boolean prepared = false;
-            boolean pending = false;
-            boolean shutdown = false;
-
-            try {
-                begin();
-
-                // substitute direct buffers
-                prepareBuffers();
-                prepared = true;
-
-                int n = write0(fd, shadow, this);
-                if (n == IOStatus.UNAVAILABLE) {
-                    // I/O is pending
-                    pending = true;
-                    return;
-                }
-                if (n == IOStatus.EOF) {
-                    // special case for shutdown output
-                    shutdown = true;
-                    throw new ClosedChannelException();
-                }
-                // write completed immediately
-                updateBuffers(n);
-                releaseBuffers();
-                enableWriting();
-                if (gatheringWrite) {
-                    result.setResult((V)Long.valueOf(n));
-                } else {
-                    result.setResult((V)Integer.valueOf(n));
-                }
-            } catch (Throwable x) {
-                // write failed. Enable writing before releasing waiters.
-                enableWriting();
-                if (!shutdown && (x instanceof ClosedChannelException))
-                    x = new AsynchronousCloseException();
-                if (!(x instanceof IOException))
-                    x = new IOException(x);
-                result.setFailure(x);
-            } finally {
-                // release resources if I/O not pending
-                if (!pending) {
-                    if (prepared)
-                        releaseBuffers();
-                }
-                end();
-            }
-
-            // invoke completion handler
-            Invoker.invoke(result);
-        }
-
-        /**
-         * Executed when the I/O has completed
-         */
-        @Override
-        @SuppressWarnings("unchecked")
-        public void completed(int bytesTransferred, boolean canInvokeDirect) {
-            updateBuffers(bytesTransferred);
-
-            // return direct buffer to cache if substituted
-            releaseBuffers();
-
-            // release waiters if not already released by timeout
-            synchronized (result) {
-                if (result.isDone())
-                    return;
-                enableWriting();
-                if (gatheringWrite) {
-                    result.setResult((V)Long.valueOf(bytesTransferred));
-                } else {
-                    result.setResult((V)Integer.valueOf(bytesTransferred));
-                }
-            }
-            if (canInvokeDirect) {
-                Invoker.invokeUnchecked(result);
-            } else {
-                Invoker.invoke(result);
-            }
-        }
-
-        @Override
-        public void failed(int error, IOException x) {
-            // return direct buffer to cache if substituted
-            releaseBuffers();
-
-            // release waiters if not already released by timeout
-            if (!isOpen())
-                x = new AsynchronousCloseException();
-
-            synchronized (result) {
-                if (result.isDone())
-                    return;
-                enableWriting();
-                result.setFailure(x);
-            }
-            Invoker.invoke(result);
-        }
-
-        /**
-         * Invoked if timeout expires before it is cancelled
-         */
-        void timeout() {
-            // synchronize on result as the I/O could complete/fail
-            synchronized (result) {
-                if (result.isDone())
-                    return;
-
-                // kill further writing before releasing waiters
-                enableWriting(true);
-                result.setFailure(new InterruptedByTimeoutException());
-            }
-
-            // invoke handler without any locks
-            Invoker.invoke(result);
-        }
-    }
-
-    @Override
-    <V extends Number,A> Future<V> implWrite(boolean gatheringWrite,
-                                             ByteBuffer src,
-                                             ByteBuffer[] srcs,
-                                             long timeout,
-                                             TimeUnit unit,
-                                             A attachment,
-                                             CompletionHandler<V,? super A> handler)
-    {
-        // setup task
-        PendingFuture<V,A> result =
-            new PendingFuture<V,A>(this, handler, attachment);
-        ByteBuffer[] bufs;
-        if (gatheringWrite) {
-            bufs = srcs;
-        } else {
-            bufs = new ByteBuffer[1];
-            bufs[0] = src;
-        }
-        final WriteTask writeTask = new WriteTask<V,A>(bufs, gatheringWrite, result);
-        result.setContext(writeTask);
-
-        // schedule timeout
-        if (timeout > 0L) {
-            Future<?> timeoutTask = iocp.schedule(new Runnable() {
-                public void run() {
-                    writeTask.timeout();
-                }
-            }, timeout, unit);
-            result.setTimeoutTask(timeoutTask);
-        }
-
-        // initiate I/O (can only be done from thread in thread pool)
-        // initiate I/O
-        if (Iocp.supportsThreadAgnosticIo()) {
-            writeTask.run();
-        } else {
-            Invoker.invokeOnThreadInThreadPool(this, writeTask);
-        }
-        return result;
-    }
-
-    // -- Native methods --
-
-    private static native void initIDs();
-
-    private static native int connect0(FileDescriptor fd, boolean preferIPv6,
-        InetAddress remote, int remotePort, Iocp.ResultHandler handler) throws IOException;
-
-    private static native void updateConnectContext(FileDescriptor fd) throws IOException;
-
-    private static native int read0(FileDescriptor fd, ByteBuffer[] bufs, Iocp.ResultHandler handler)
-        throws IOException;
-
-    private static native int write0(FileDescriptor fd, ByteBuffer[] bufs, Iocp.ResultHandler handler)
-        throws IOException;
-
-    private static native void shutdown0(long socket, int how) throws IOException;
-
-    private static native void closesocket0(long socket) throws IOException;
-
-    static {
-        Util.load();
-        initIDs();
-    }
-}
diff --git a/openjdk/sun/nio/cs/StandardCharsets.java b/openjdk/sun/nio/cs/StandardCharsets.java
deleted file mode 100644
index af09bd63..00000000
--- a/openjdk/sun/nio/cs/StandardCharsets.java
+++ /dev/null
@@ -1,706 +0,0 @@
-/*
- * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved.
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-// -- This file was mechanically generated: Do not edit! -- //
-
-package sun.nio.cs;
-
-import java.nio.charset.*;
-
-
-public class StandardCharsets
-    extends FastCharsetProvider
-{
-
-    static final String[] aliases_US_ASCII = new String[] {
-        "iso-ir-6",
-        "ANSI_X3.4-1986",
-        "ISO_646.irv:1991",
-        "ASCII",
-        "ISO646-US",
-        "us",
-        "IBM367",
-        "cp367",
-        "csASCII",
-        "default",
-        "646",
-        "iso_646.irv:1983",
-        "ANSI_X3.4-1968",
-        "ascii7",
-    };
-
-    static final String[] aliases_UTF_8 = new String[] {
-        "UTF8",
-        "unicode-1-1-utf-8",
-    };
-
-    static final String[] aliases_UTF_16 = new String[] {
-        "UTF_16",
-        "utf16",
-        "unicode",
-        "UnicodeBig",
-    };
-
-    static final String[] aliases_UTF_16BE = new String[] {
-        "UTF_16BE",
-        "ISO-10646-UCS-2",
-        "X-UTF-16BE",
-        "UnicodeBigUnmarked",
-    };
-
-    static final String[] aliases_UTF_16LE = new String[] {
-        "UTF_16LE",
-        "X-UTF-16LE",
-        "UnicodeLittleUnmarked",
-    };
-
-    static final String[] aliases_UTF_16LE_BOM = new String[] {
-        "UnicodeLittle",
-    };
-
-    static final String[] aliases_UTF_32 = new String[] {
-        "UTF_32",
-        "UTF32",
-    };
-
-    static final String[] aliases_UTF_32LE = new String[] {
-        "UTF_32LE",
-        "X-UTF-32LE",
-    };
-
-    static final String[] aliases_UTF_32BE = new String[] {
-        "UTF_32BE",
-        "X-UTF-32BE",
-    };
-
-    static final String[] aliases_UTF_32LE_BOM = new String[] {
-        "UTF_32LE_BOM",
-        "UTF-32LE-BOM",
-    };
-
-    static final String[] aliases_UTF_32BE_BOM = new String[] {
-        "UTF_32BE_BOM",
-        "UTF-32BE-BOM",
-    };
-
-    static final String[] aliases_ISO_8859_1 = new String[] {
-        "iso-ir-100",
-        "ISO_8859-1",
-        "latin1",
-        "l1",
-        "IBM819",
-        "cp819",
-        "csISOLatin1",
-        "819",
-        "IBM-819",
-        "ISO8859_1",
-        "ISO_8859-1:1987",
-        "ISO_8859_1",
-        "8859_1",
-        "ISO8859-1",
-    };
-
-    static final String[] aliases_ISO_8859_2 = new String[] {
-        "iso8859_2",
-        "8859_2",
-        "iso-ir-101",
-        "ISO_8859-2",
-        "ISO_8859-2:1987",
-        "ISO8859-2",
-        "latin2",
-        "l2",
-        "ibm912",
-        "ibm-912",
-        "cp912",
-        "912",
-        "csISOLatin2",
-    };
-
-    static final String[] aliases_ISO_8859_4 = new String[] {
-        "iso8859_4",
-        "iso8859-4",
-        "8859_4",
-        "iso-ir-110",
-        "ISO_8859-4",
-        "ISO_8859-4:1988",
-        "latin4",
-        "l4",
-        "ibm914",
-        "ibm-914",
-        "cp914",
-        "914",
-        "csISOLatin4",
-    };
-
-    static final String[] aliases_ISO_8859_5 = new String[] {
-        "iso8859_5",
-        "8859_5",
-        "iso-ir-144",
-        "ISO_8859-5",
-        "ISO_8859-5:1988",
-        "ISO8859-5",
-        "cyrillic",
-        "ibm915",
-        "ibm-915",
-        "cp915",
-        "915",
-        "csISOLatinCyrillic",
-    };
-
-    static final String[] aliases_ISO_8859_7 = new String[] {
-        "iso8859_7",
-        "8859_7",
-        "iso-ir-126",
-        "ISO_8859-7",
-        "ISO_8859-7:1987",
-        "ELOT_928",
-        "ECMA-118",
-        "greek",
-        "greek8",
-        "csISOLatinGreek",
-        "sun_eu_greek",
-        "ibm813",
-        "ibm-813",
-        "813",
-        "cp813",
-        "iso8859-7",
-    };
-
-    static final String[] aliases_ISO_8859_9 = new String[] {
-        "iso8859_9",
-        "8859_9",
-        "iso-ir-148",
-        "ISO_8859-9",
-        "ISO_8859-9:1989",
-        "ISO8859-9",
-        "latin5",
-        "l5",
-        "ibm920",
-        "ibm-920",
-        "920",
-        "cp920",
-        "csISOLatin5",
-    };
-
-    static final String[] aliases_ISO_8859_13 = new String[] {
-        "iso8859_13",
-        "8859_13",
-        "iso_8859-13",
-        "ISO8859-13",
-    };
-
-    static final String[] aliases_ISO_8859_15 = new String[] {
-        "ISO_8859-15",
-        "8859_15",
-        "ISO-8859-15",
-        "ISO8859_15",
-        "ISO8859-15",
-        "IBM923",
-        "IBM-923",
-        "cp923",
-        "923",
-        "LATIN0",
-        "LATIN9",
-        "L9",
-        "csISOlatin0",
-        "csISOlatin9",
-        "ISO8859_15_FDIS",
-    };
-
-    static final String[] aliases_KOI8_R = new String[] {
-        "koi8_r",
-        "koi8",
-        "cskoi8r",
-    };
-
-    static final String[] aliases_KOI8_U = new String[] {
-        "koi8_u",
-    };
-
-    static final String[] aliases_MS1250 = new String[] {
-        "cp1250",
-        "cp5346",
-    };
-
-    static final String[] aliases_MS1251 = new String[] {
-        "cp1251",
-        "cp5347",
-        "ansi-1251",
-    };
-
-    static final String[] aliases_MS1252 = new String[] {
-        "cp1252",
-        "cp5348",
-    };
-
-    static final String[] aliases_MS1253 = new String[] {
-        "cp1253",
-        "cp5349",
-    };
-
-    static final String[] aliases_MS1254 = new String[] {
-        "cp1254",
-        "cp5350",
-    };
-
-    static final String[] aliases_MS1257 = new String[] {
-        "cp1257",
-        "cp5353",
-    };
-
-    static final String[] aliases_IBM437 = new String[] {
-        "cp437",
-        "ibm437",
-        "ibm-437",
-        "437",
-        "cspc8codepage437",
-        "windows-437",
-    };
-
-    static final String[] aliases_IBM737 = new String[] {
-        "cp737",
-        "ibm737",
-        "ibm-737",
-        "737",
-    };
-
-    static final String[] aliases_IBM775 = new String[] {
-        "cp775",
-        "ibm775",
-        "ibm-775",
-        "775",
-    };
-
-    static final String[] aliases_IBM850 = new String[] {
-        "cp850",
-        "ibm-850",
-        "ibm850",
-        "850",
-        "cspc850multilingual",
-    };
-
-    static final String[] aliases_IBM852 = new String[] {
-        "cp852",
-        "ibm852",
-        "ibm-852",
-        "852",
-        "csPCp852",
-    };
-
-    static final String[] aliases_IBM855 = new String[] {
-        "cp855",
-        "ibm-855",
-        "ibm855",
-        "855",
-        "cspcp855",
-    };
-
-    static final String[] aliases_IBM857 = new String[] {
-        "cp857",
-        "ibm857",
-        "ibm-857",
-        "857",
-        "csIBM857",
-    };
-
-    static final String[] aliases_IBM858 = new String[] {
-        "cp858",
-        "ccsid00858",
-        "cp00858",
-        "858",
-        "PC-Multilingual-850+euro",
-    };
-
-    static final String[] aliases_IBM862 = new String[] {
-        "cp862",
-        "ibm862",
-        "ibm-862",
-        "862",
-        "csIBM862",
-        "cspc862latinhebrew",
-    };
-
-    static final String[] aliases_IBM866 = new String[] {
-        "cp866",
-        "ibm866",
-        "ibm-866",
-        "866",
-        "csIBM866",
-    };
-
-    static final String[] aliases_IBM874 = new String[] {
-        "cp874",
-        "ibm874",
-        "ibm-874",
-        "874",
-    };
-
-    private static final class Aliases
-        extends sun.util.PreHashedMap<String>
-    {
-
-        private static final int ROWS = 1024;
-        private static final int SIZE = 209;
-        private static final int SHIFT = 0;
-        private static final int MASK = 0x3ff;
-
-        private Aliases() {
-            super(ROWS, SIZE, SHIFT, MASK);
-        }
-
-        protected void init(Object[] ht) {
-            ht[1] = new Object[] { "csisolatin0", "iso-8859-15" };
-            ht[2] = new Object[] { "csisolatin1", "iso-8859-1" };
-            ht[3] = new Object[] { "csisolatin2", "iso-8859-2" };
-            ht[5] = new Object[] { "csisolatin4", "iso-8859-4" };
-            ht[6] = new Object[] { "csisolatin5", "iso-8859-9" };
-            ht[10] = new Object[] { "csisolatin9", "iso-8859-15" };
-            ht[19] = new Object[] { "unicodelittle", "x-utf-16le-bom" };
-            ht[24] = new Object[] { "iso646-us", "us-ascii" };
-            ht[25] = new Object[] { "iso_8859-7:1987", "iso-8859-7" };
-            ht[26] = new Object[] { "912", "iso-8859-2" };
-            ht[28] = new Object[] { "914", "iso-8859-4" };
-            ht[29] = new Object[] { "915", "iso-8859-5" };
-            ht[55] = new Object[] { "920", "iso-8859-9" };
-            ht[58] = new Object[] { "923", "iso-8859-15" };
-            ht[86] = new Object[] { "csisolatincyrillic", "iso-8859-5",
-                         new Object[] { "8859_1", "iso-8859-1" } };
-            ht[87] = new Object[] { "8859_2", "iso-8859-2" };
-            ht[89] = new Object[] { "8859_4", "iso-8859-4" };
-            ht[90] = new Object[] { "813", "iso-8859-7",
-                         new Object[] { "8859_5", "iso-8859-5" } };
-            ht[92] = new Object[] { "8859_7", "iso-8859-7" };
-            ht[94] = new Object[] { "8859_9", "iso-8859-9" };
-            ht[95] = new Object[] { "iso_8859-1:1987", "iso-8859-1" };
-            ht[96] = new Object[] { "819", "iso-8859-1" };
-            ht[106] = new Object[] { "unicode-1-1-utf-8", "utf-8" };
-            ht[121] = new Object[] { "x-utf-16le", "utf-16le" };
-            ht[125] = new Object[] { "ecma-118", "iso-8859-7" };
-            ht[134] = new Object[] { "koi8_r", "koi8-r" };
-            ht[137] = new Object[] { "koi8_u", "koi8-u" };
-            ht[141] = new Object[] { "cp912", "iso-8859-2" };
-            ht[143] = new Object[] { "cp914", "iso-8859-4" };
-            ht[144] = new Object[] { "cp915", "iso-8859-5" };
-            ht[170] = new Object[] { "cp920", "iso-8859-9" };
-            ht[173] = new Object[] { "cp923", "iso-8859-15" };
-            ht[177] = new Object[] { "utf_32le_bom", "x-utf-32le-bom" };
-            ht[192] = new Object[] { "utf_16be", "utf-16be" };
-            ht[199] = new Object[] { "cspc8codepage437", "ibm437",
-                         new Object[] { "ansi-1251", "windows-1251" } };
-            ht[205] = new Object[] { "cp813", "iso-8859-7" };
-            ht[211] = new Object[] { "850", "ibm850",
-                         new Object[] { "cp819", "iso-8859-1" } };
-            ht[213] = new Object[] { "852", "ibm852" };
-            ht[216] = new Object[] { "855", "ibm855" };
-            ht[218] = new Object[] { "857", "ibm857",
-                         new Object[] { "iso-ir-6", "us-ascii" } };
-            ht[219] = new Object[] { "858", "ibm00858",
-                         new Object[] { "737", "x-ibm737" } };
-            ht[225] = new Object[] { "csascii", "us-ascii" };
-            ht[244] = new Object[] { "862", "ibm862" };
-            ht[248] = new Object[] { "866", "ibm866" };
-            ht[253] = new Object[] { "x-utf-32be", "utf-32be" };
-            ht[254] = new Object[] { "iso_8859-2:1987", "iso-8859-2" };
-            ht[259] = new Object[] { "unicodebig", "utf-16" };
-            ht[269] = new Object[] { "iso8859_15_fdis", "iso-8859-15" };
-            ht[277] = new Object[] { "874", "x-ibm874" };
-            ht[280] = new Object[] { "unicodelittleunmarked", "utf-16le" };
-            ht[283] = new Object[] { "iso8859_1", "iso-8859-1" };
-            ht[284] = new Object[] { "iso8859_2", "iso-8859-2" };
-            ht[286] = new Object[] { "iso8859_4", "iso-8859-4" };
-            ht[287] = new Object[] { "iso8859_5", "iso-8859-5" };
-            ht[289] = new Object[] { "iso8859_7", "iso-8859-7" };
-            ht[291] = new Object[] { "iso8859_9", "iso-8859-9" };
-            ht[294] = new Object[] { "ibm912", "iso-8859-2" };
-            ht[296] = new Object[] { "ibm914", "iso-8859-4" };
-            ht[297] = new Object[] { "ibm915", "iso-8859-5" };
-            ht[305] = new Object[] { "iso_8859-13", "iso-8859-13" };
-            ht[307] = new Object[] { "iso_8859-15", "iso-8859-15" };
-            ht[312] = new Object[] { "greek8", "iso-8859-7",
-                         new Object[] { "646", "us-ascii" } };
-            ht[321] = new Object[] { "ibm-912", "iso-8859-2" };
-            ht[323] = new Object[] { "ibm920", "iso-8859-9",
-                         new Object[] { "ibm-914", "iso-8859-4" } };
-            ht[324] = new Object[] { "ibm-915", "iso-8859-5" };
-            ht[325] = new Object[] { "l1", "iso-8859-1" };
-            ht[326] = new Object[] { "cp850", "ibm850",
-                         new Object[] { "ibm923", "iso-8859-15",
-                             new Object[] { "l2", "iso-8859-2" } } };
-            ht[327] = new Object[] { "cyrillic", "iso-8859-5" };
-            ht[328] = new Object[] { "cp852", "ibm852",
-                         new Object[] { "l4", "iso-8859-4" } };
-            ht[329] = new Object[] { "l5", "iso-8859-9" };
-            ht[331] = new Object[] { "cp855", "ibm855" };
-            ht[333] = new Object[] { "cp857", "ibm857",
-                         new Object[] { "l9", "iso-8859-15" } };
-            ht[334] = new Object[] { "cp858", "ibm00858",
-                         new Object[] { "cp737", "x-ibm737" } };
-            ht[336] = new Object[] { "iso_8859_1", "iso-8859-1" };
-            ht[339] = new Object[] { "koi8", "koi8-r" };
-            ht[341] = new Object[] { "775", "ibm775" };
-            ht[345] = new Object[] { "iso_8859-9:1989", "iso-8859-9" };
-            ht[350] = new Object[] { "ibm-920", "iso-8859-9" };
-            ht[353] = new Object[] { "ibm-923", "iso-8859-15" };
-            ht[358] = new Object[] { "ibm813", "iso-8859-7" };
-            ht[359] = new Object[] { "cp862", "ibm862" };
-            ht[363] = new Object[] { "cp866", "ibm866" };
-            ht[364] = new Object[] { "ibm819", "iso-8859-1" };
-            ht[378] = new Object[] { "ansi_x3.4-1968", "us-ascii" };
-            ht[385] = new Object[] { "ibm-813", "iso-8859-7" };
-            ht[391] = new Object[] { "ibm-819", "iso-8859-1" };
-            ht[392] = new Object[] { "cp874", "x-ibm874" };
-            ht[405] = new Object[] { "iso-ir-100", "iso-8859-1" };
-            ht[406] = new Object[] { "iso-ir-101", "iso-8859-2" };
-            ht[408] = new Object[] { "437", "ibm437" };
-            ht[421] = new Object[] { "iso-8859-15", "iso-8859-15" };
-            ht[428] = new Object[] { "latin0", "iso-8859-15" };
-            ht[429] = new Object[] { "latin1", "iso-8859-1" };
-            ht[430] = new Object[] { "latin2", "iso-8859-2" };
-            ht[432] = new Object[] { "latin4", "iso-8859-4" };
-            ht[433] = new Object[] { "latin5", "iso-8859-9" };
-            ht[436] = new Object[] { "iso-ir-110", "iso-8859-4" };
-            ht[437] = new Object[] { "latin9", "iso-8859-15" };
-            ht[438] = new Object[] { "ansi_x3.4-1986", "us-ascii" };
-            ht[443] = new Object[] { "utf-32be-bom", "x-utf-32be-bom" };
-            ht[456] = new Object[] { "cp775", "ibm775" };
-            ht[473] = new Object[] { "iso-ir-126", "iso-8859-7" };
-            ht[479] = new Object[] { "ibm850", "ibm850" };
-            ht[481] = new Object[] { "ibm852", "ibm852" };
-            ht[484] = new Object[] { "ibm855", "ibm855" };
-            ht[486] = new Object[] { "ibm857", "ibm857" };
-            ht[487] = new Object[] { "ibm737", "x-ibm737" };
-            ht[502] = new Object[] { "utf_16le", "utf-16le" };
-            ht[506] = new Object[] { "ibm-850", "ibm850" };
-            ht[508] = new Object[] { "ibm-852", "ibm852" };
-            ht[511] = new Object[] { "ibm-855", "ibm855" };
-            ht[512] = new Object[] { "ibm862", "ibm862" };
-            ht[513] = new Object[] { "ibm-857", "ibm857" };
-            ht[514] = new Object[] { "ibm-737", "x-ibm737" };
-            ht[516] = new Object[] { "ibm866", "ibm866" };
-            ht[520] = new Object[] { "unicodebigunmarked", "utf-16be" };
-            ht[523] = new Object[] { "cp437", "ibm437" };
-            ht[524] = new Object[] { "utf16", "utf-16" };
-            ht[533] = new Object[] { "iso-ir-144", "iso-8859-5" };
-            ht[537] = new Object[] { "iso-ir-148", "iso-8859-9" };
-            ht[539] = new Object[] { "ibm-862", "ibm862" };
-            ht[543] = new Object[] { "ibm-866", "ibm866" };
-            ht[545] = new Object[] { "ibm874", "x-ibm874" };
-            ht[563] = new Object[] { "x-utf-32le", "utf-32le" };
-            ht[572] = new Object[] { "ibm-874", "x-ibm874" };
-            ht[573] = new Object[] { "iso_8859-4:1988", "iso-8859-4" };
-            ht[577] = new Object[] { "default", "us-ascii" };
-            ht[582] = new Object[] { "utf32", "utf-32" };
-            ht[583] = new Object[] { "pc-multilingual-850+euro", "ibm00858" };
-            ht[588] = new Object[] { "elot_928", "iso-8859-7" };
-            ht[593] = new Object[] { "csisolatingreek", "iso-8859-7" };
-            ht[598] = new Object[] { "csibm857", "ibm857" };
-            ht[609] = new Object[] { "ibm775", "ibm775" };
-            ht[617] = new Object[] { "cp1250", "windows-1250" };
-            ht[618] = new Object[] { "cp1251", "windows-1251" };
-            ht[619] = new Object[] { "cp1252", "windows-1252" };
-            ht[620] = new Object[] { "cp1253", "windows-1253" };
-            ht[621] = new Object[] { "cp1254", "windows-1254" };
-            ht[624] = new Object[] { "csibm862", "ibm862",
-                         new Object[] { "cp1257", "windows-1257" } };
-            ht[628] = new Object[] { "csibm866", "ibm866" };
-            ht[632] = new Object[] { "iso8859_13", "iso-8859-13" };
-            ht[634] = new Object[] { "iso8859_15", "iso-8859-15",
-                         new Object[] { "utf_32be", "utf-32be" } };
-            ht[635] = new Object[] { "utf_32be_bom", "x-utf-32be-bom" };
-            ht[636] = new Object[] { "ibm-775", "ibm775" };
-            ht[654] = new Object[] { "cp00858", "ibm00858" };
-            ht[669] = new Object[] { "8859_13", "iso-8859-13" };
-            ht[670] = new Object[] { "us", "us-ascii" };
-            ht[671] = new Object[] { "8859_15", "iso-8859-15" };
-            ht[676] = new Object[] { "ibm437", "ibm437" };
-            ht[679] = new Object[] { "cp367", "us-ascii" };
-            ht[686] = new Object[] { "iso-10646-ucs-2", "utf-16be" };
-            ht[703] = new Object[] { "ibm-437", "ibm437" };
-            ht[710] = new Object[] { "iso8859-13", "iso-8859-13" };
-            ht[712] = new Object[] { "iso8859-15", "iso-8859-15" };
-            ht[732] = new Object[] { "iso_8859-5:1988", "iso-8859-5" };
-            ht[733] = new Object[] { "unicode", "utf-16" };
-            ht[768] = new Object[] { "greek", "iso-8859-7" };
-            ht[774] = new Object[] { "ascii7", "us-ascii" };
-            ht[781] = new Object[] { "iso8859-1", "iso-8859-1" };
-            ht[782] = new Object[] { "iso8859-2", "iso-8859-2" };
-            ht[783] = new Object[] { "cskoi8r", "koi8-r" };
-            ht[784] = new Object[] { "iso8859-4", "iso-8859-4" };
-            ht[785] = new Object[] { "iso8859-5", "iso-8859-5" };
-            ht[787] = new Object[] { "iso8859-7", "iso-8859-7" };
-            ht[789] = new Object[] { "iso8859-9", "iso-8859-9" };
-            ht[813] = new Object[] { "ccsid00858", "ibm00858" };
-            ht[818] = new Object[] { "cspc862latinhebrew", "ibm862" };
-            ht[832] = new Object[] { "ibm367", "us-ascii" };
-            ht[834] = new Object[] { "iso_8859-1", "iso-8859-1" };
-            ht[835] = new Object[] { "iso_8859-2", "iso-8859-2",
-                         new Object[] { "x-utf-16be", "utf-16be" } };
-            ht[836] = new Object[] { "sun_eu_greek", "iso-8859-7" };
-            ht[837] = new Object[] { "iso_8859-4", "iso-8859-4" };
-            ht[838] = new Object[] { "iso_8859-5", "iso-8859-5" };
-            ht[840] = new Object[] { "cspcp852", "ibm852",
-                         new Object[] { "iso_8859-7", "iso-8859-7" } };
-            ht[842] = new Object[] { "iso_8859-9", "iso-8859-9" };
-            ht[843] = new Object[] { "cspcp855", "ibm855" };
-            ht[846] = new Object[] { "windows-437", "ibm437" };
-            ht[849] = new Object[] { "ascii", "us-ascii" };
-            ht[881] = new Object[] { "utf8", "utf-8" };
-            ht[896] = new Object[] { "iso_646.irv:1983", "us-ascii" };
-            ht[909] = new Object[] { "cp5346", "windows-1250" };
-            ht[910] = new Object[] { "cp5347", "windows-1251" };
-            ht[911] = new Object[] { "cp5348", "windows-1252" };
-            ht[912] = new Object[] { "cp5349", "windows-1253" };
-            ht[925] = new Object[] { "iso_646.irv:1991", "us-ascii" };
-            ht[934] = new Object[] { "cp5350", "windows-1254" };
-            ht[937] = new Object[] { "cp5353", "windows-1257" };
-            ht[944] = new Object[] { "utf_32le", "utf-32le" };
-            ht[957] = new Object[] { "utf_16", "utf-16" };
-            ht[993] = new Object[] { "cspc850multilingual", "ibm850" };
-            ht[1009] = new Object[] { "utf-32le-bom", "x-utf-32le-bom" };
-            ht[1015] = new Object[] { "utf_32", "utf-32" };
-        }
-
-    }
-
-    private static final class Classes
-        extends sun.util.PreHashedMap<String>
-    {
-
-        private static final int ROWS = 32;
-        private static final int SIZE = 38;
-        private static final int SHIFT = 1;
-        private static final int MASK = 0x1f;
-
-        private Classes() {
-            super(ROWS, SIZE, SHIFT, MASK);
-        }
-
-        protected void init(Object[] ht) {
-            ht[0] = new Object[] { "ibm862", "IBM862" };
-            ht[2] = new Object[] { "ibm866", "IBM866",
-                         new Object[] { "utf-32", "UTF_32",
-                             new Object[] { "utf-16le", "UTF_16LE" } } };
-            ht[3] = new Object[] { "windows-1251", "MS1251",
-                         new Object[] { "windows-1250", "MS1250" } };
-            ht[4] = new Object[] { "windows-1253", "MS1253",
-                         new Object[] { "windows-1252", "MS1252",
-                             new Object[] { "utf-32be", "UTF_32BE" } } };
-            ht[5] = new Object[] { "windows-1254", "MS1254",
-                         new Object[] { "utf-16", "UTF_16" } };
-            ht[6] = new Object[] { "windows-1257", "MS1257" };
-            ht[7] = new Object[] { "utf-16be", "UTF_16BE" };
-            ht[8] = new Object[] { "iso-8859-2", "ISO_8859_2",
-                         new Object[] { "iso-8859-1", "ISO_8859_1" } };
-            ht[9] = new Object[] { "iso-8859-4", "ISO_8859_4",
-                         new Object[] { "utf-8", "UTF_8" } };
-            ht[10] = new Object[] { "iso-8859-5", "ISO_8859_5" };
-            ht[11] = new Object[] { "x-ibm874", "IBM874",
-                         new Object[] { "iso-8859-7", "ISO_8859_7" } };
-            ht[12] = new Object[] { "iso-8859-9", "ISO_8859_9" };
-            ht[14] = new Object[] { "x-ibm737", "IBM737" };
-            ht[15] = new Object[] { "ibm850", "IBM850" };
-            ht[16] = new Object[] { "ibm852", "IBM852",
-                         new Object[] { "ibm775", "IBM775" } };
-            ht[17] = new Object[] { "iso-8859-13", "ISO_8859_13",
-                         new Object[] { "us-ascii", "US_ASCII" } };
-            ht[18] = new Object[] { "ibm855", "IBM855",
-                         new Object[] { "ibm437", "IBM437",
-                             new Object[] { "iso-8859-15", "ISO_8859_15" } } };
-            ht[19] = new Object[] { "ibm00858", "IBM858",
-                         new Object[] { "ibm857", "IBM857",
-                             new Object[] { "x-utf-32le-bom", "UTF_32LE_BOM" } } };
-            ht[22] = new Object[] { "x-utf-16le-bom", "UTF_16LE_BOM" };
-            ht[24] = new Object[] { "x-utf-32be-bom", "UTF_32BE_BOM" };
-            ht[28] = new Object[] { "koi8-r", "KOI8_R" };
-            ht[29] = new Object[] { "koi8-u", "KOI8_U" };
-            ht[31] = new Object[] { "utf-32le", "UTF_32LE" };
-        }
-
-    }
-
-    private static final class Cache
-        extends sun.util.PreHashedMap<Charset>
-    {
-
-        private static final int ROWS = 32;
-        private static final int SIZE = 38;
-        private static final int SHIFT = 1;
-        private static final int MASK = 0x1f;
-
-        private Cache() {
-            super(ROWS, SIZE, SHIFT, MASK);
-        }
-
-        protected void init(Object[] ht) {
-            // [IKVM] we pre-populate some cache entries to avoid reflection when instantiating the common charsets
-            ht[0] = new Object[] { "ibm862", null };
-            ht[2] = new Object[] { "ibm866", null,
-                         new Object[] { "utf-32", null,
-                             new Object[] { "utf-16le", null } } };
-            ht[3] = new Object[] { "windows-1251", null,
-                         new Object[] { "windows-1250", null } };
-            ht[4] = new Object[] { "windows-1253", null,
-                         new Object[] { "windows-1252", new MS1252(),
-                             new Object[] { "utf-32be", null } } };
-            ht[5] = new Object[] { "windows-1254", null,
-                         new Object[] { "utf-16", null } };
-            ht[6] = new Object[] { "windows-1257", null };
-            ht[7] = new Object[] { "utf-16be", null };
-            ht[8] = new Object[] { "iso-8859-2", null,
-                         new Object[] { "iso-8859-1", null } };
-            ht[9] = new Object[] { "iso-8859-4", null,
-                         new Object[] { "utf-8", new UTF_8() } };
-            ht[10] = new Object[] { "iso-8859-5", null };
-            ht[11] = new Object[] { "x-ibm874", null,
-                         new Object[] { "iso-8859-7", null } };
-            ht[12] = new Object[] { "iso-8859-9", null };
-            ht[14] = new Object[] { "x-ibm737", null };
-            ht[15] = new Object[] { "ibm850", null };
-            ht[16] = new Object[] { "ibm852", null,
-                         new Object[] { "ibm775", null } };
-            ht[17] = new Object[] { "iso-8859-13", null,
-                         new Object[] { "us-ascii", null } };
-            ht[18] = new Object[] { "ibm855", null,
-                         new Object[] { "ibm437", null,
-                             new Object[] { "iso-8859-15", null } } };
-            ht[19] = new Object[] { "ibm00858", null,
-                         new Object[] { "ibm857", null,
-                             new Object[] { "x-utf-32le-bom", null } } };
-            ht[22] = new Object[] { "x-utf-16le-bom", null };
-            ht[24] = new Object[] { "x-utf-32be-bom", null };
-            ht[28] = new Object[] { "koi8-r", null };
-            ht[29] = new Object[] { "koi8-u", null };
-            ht[31] = new Object[] { "utf-32le", null };
-        }
-
-    }
-
-    public StandardCharsets() {
-        super("sun.nio.cs", new Aliases(), new Classes(), new Cache());
-    }
-
-}
diff --git a/openjdk/sun/nio/fs/DefaultFileSystemProvider.java b/openjdk/sun/nio/fs/DefaultFileSystemProvider.java
deleted file mode 100644
index 6ef8d07d..00000000
--- a/openjdk/sun/nio/fs/DefaultFileSystemProvider.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-  Copyright (C) 2011 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-
-package sun.nio.fs;
-
-import java.nio.file.spi.FileSystemProvider;
-
-public class DefaultFileSystemProvider
-{
-    public static FileSystemProvider create()
-    {
-        return new NetFileSystemProvider();
-    }
-}
diff --git a/openjdk/sun/nio/fs/DefaultFileTypeDetector.java b/openjdk/sun/nio/fs/DefaultFileTypeDetector.java
deleted file mode 100644
index 5da08123..00000000
--- a/openjdk/sun/nio/fs/DefaultFileTypeDetector.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-  Copyright (C) 2011 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-
-package sun.nio.fs;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.spi.FileTypeDetector;
-
-public class DefaultFileTypeDetector
-{
-    public static FileTypeDetector create()
-    {
-        return new AbstractFileTypeDetector() {
-            public String implProbeContentType(Path obj) throws IOException {
-                return null;
-            }
-        };
-    }
-}
diff --git a/openjdk/sun/nio/fs/NetFileSystem.java b/openjdk/sun/nio/fs/NetFileSystem.java
deleted file mode 100644
index 9c07f605..00000000
--- a/openjdk/sun/nio/fs/NetFileSystem.java
+++ /dev/null
@@ -1,498 +0,0 @@
-/*
-  Copyright (C) 2011 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-
-*/
-
-package sun.nio.fs;
-
-import cli.System.IO.DriveInfo;
-import cli.System.IO.ErrorEventArgs;
-import cli.System.IO.ErrorEventHandler;
-import cli.System.IO.FileSystemEventArgs;
-import cli.System.IO.FileSystemEventHandler;
-import cli.System.IO.FileSystemWatcher;
-import cli.System.IO.WatcherChangeTypes;
-import java.io.IOException;
-import java.nio.file.*;
-import java.nio.file.attribute.*;
-import java.nio.file.spi.FileSystemProvider;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.regex.Pattern;
-import static ikvm.internal.Util.WINDOWS;
-
-final class NetFileSystem extends FileSystem
-{
-    private static final Set<String> attributes = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList("basic")));
-    private final NetFileSystemProvider provider;
-    private final String separator = Character.toString(cli.System.IO.Path.DirectorySeparatorChar);
-
-    NetFileSystem(NetFileSystemProvider provider)
-    {
-        this.provider = provider;
-    }
-
-    public FileSystemProvider provider()
-    {
-        return provider;
-    }
-
-    public void close() throws IOException
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    public boolean isOpen()
-    {
-        return true;
-    }
-
-    public boolean isReadOnly()
-    {
-        return false;
-    }
-
-    public String getSeparator()
-    {
-        return separator;
-    }
-
-    public Iterable<Path> getRootDirectories()
-    {
-        SecurityManager sm = System.getSecurityManager();
-        ArrayList<Path> list = new ArrayList<>();
-        for (DriveInfo info : DriveInfo.GetDrives())
-        {
-            try
-            {
-                if (sm != null)
-                {
-                    sm.checkRead(info.get_Name());
-                }
-            }
-            catch (SecurityException _)
-            {
-                continue;
-            }
-            list.add(getPath(info.get_Name()));
-        }
-        return list;
-    }
-
-    public Iterable<FileStore> getFileStores()
-    {
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null)
-        {
-            try
-            {
-                sm.checkPermission(new RuntimePermission("getFileStoreAttributes"));
-            }
-            catch (SecurityException _)
-            {
-                return Collections.emptyList();
-            }
-        }
-        ArrayList<FileStore> list = new ArrayList<>();
-        for (DriveInfo info : DriveInfo.GetDrives())
-        {
-            try
-            {
-                if (sm != null)
-                {
-                    sm.checkRead(info.get_Name());
-                }
-            }
-            catch (SecurityException _)
-            {
-                continue;
-            }
-            try
-            {
-                list.add(provider.getFileStore(info));
-            }
-            catch (IOException _)
-            {
-            }
-        }
-        return list;
-    }
-
-    public Set<String> supportedFileAttributeViews()
-    {
-        return attributes;
-    }
-
-    public Path getPath(String first, String... more)
-    {
-        if (more.length == 0)
-        {
-            return new NetPath(this, first);
-        }
-        else
-        {
-            StringBuilder sb = new StringBuilder(first);
-            String sep = sb.length() == 0 ? "" : separator;
-            for (String s : more)
-            {
-                if (s.length() != 0)
-                {
-                    sb.append(sep);
-                    sb.append(s);
-                    sep = separator;
-                }
-            }
-            return new NetPath(this, sb.toString());
-        }
-    }
-
-    public PathMatcher getPathMatcher(String syntaxAndPattern)
-    {
-        String regex;
-        if (syntaxAndPattern.startsWith("glob:"))
-        {
-            String pattern = syntaxAndPattern.substring(5);
-            if (WINDOWS)
-            {
-                regex = Globs.toWindowsRegexPattern(pattern);
-            }
-            else
-            {
-                regex = Globs.toUnixRegexPattern(pattern);
-            }
-        }
-        else if (syntaxAndPattern.startsWith("regex:"))
-        {
-            regex = syntaxAndPattern.substring(6);
-        }
-        else if (syntaxAndPattern.indexOf(':') <= 0)
-        {
-            throw new IllegalArgumentException();
-        }
-        else
-        {
-            throw new UnsupportedOperationException();
-        }
-        final Pattern pattern = Pattern.compile(regex, WINDOWS ? Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE : 0);
-        return new PathMatcher() {
-            @Override
-            public boolean matches(Path path) {
-                return pattern.matcher(path.toString()).matches();
-            }
-        };
-    }
-
-    public UserPrincipalLookupService getUserPrincipalLookupService()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    static final class NetWatchService implements WatchService
-    {
-        static final WatchEvent<?> overflowEvent = new WatchEvent<Object>() {
-            public Object context() {
-                return null;
-            }
-            public int count() {
-                return 1;
-            }
-            public WatchEvent.Kind<Object> kind() {
-                return StandardWatchEventKinds.OVERFLOW;
-            }
-        };
-        private static final WatchKey CLOSED = new WatchKey() {
-            public boolean isValid() { return false; }
-            public List<WatchEvent<?>> pollEvents() { return null; }
-            public boolean reset() { return false; }
-            public void cancel() { }
-            public Watchable watchable() { return null; }
-        };
-        private boolean closed;
-        private final ArrayList<NetWatchKey> keys = new ArrayList<>();
-        private final LinkedBlockingQueue<WatchKey> queue = new LinkedBlockingQueue<>();
-
-        public synchronized void close()
-        {
-            if (!closed)
-            {
-                closed = true;
-                for (NetWatchKey key : keys)
-                {
-                    key.close();
-                }
-                enqueue(CLOSED);
-            }
-        }
-
-        private WatchKey checkClosed(WatchKey key)
-        {
-            if (key == CLOSED)
-            {
-                enqueue(CLOSED);
-                throw new ClosedWatchServiceException();
-            }
-            return key;
-        }
-
-        public WatchKey poll()
-        {
-            return checkClosed(queue.poll());
-        }
-
-        public WatchKey poll(long timeout, TimeUnit unit) throws InterruptedException
-        {
-            return checkClosed(queue.poll(timeout, unit));
-        }
-
-        public WatchKey take() throws InterruptedException
-        {
-            return checkClosed(queue.take());
-        }
-
-        void enqueue(WatchKey key)
-        {
-            for (;;)
-            {
-                try
-                {
-                    queue.put(key);
-                    return;
-                }
-                catch (InterruptedException _)
-                {
-                }
-            }
-        }
-
-        private final class NetWatchKey implements WatchKey
-        {
-            private final NetPath path;
-            private FileSystemWatcher fsw;
-            private ArrayList<WatchEvent<?>> list = new ArrayList<>();
-            private HashSet<String> modified = new HashSet<>();
-            private boolean signaled;
-            
-            NetWatchKey(NetPath path)
-            {
-                this.path = path;
-            }
-            
-            synchronized void init(final boolean create, final boolean delete, final boolean modify, final boolean overflow, final boolean subtree)
-            {
-                if (fsw != null)
-                {
-                    // we could reuse the FileSystemWatcher, but for now we just recreate it
-                    // (and we run the risk of missing some events while we're doing that)
-                    fsw.Dispose();
-                    fsw = null;
-                }
-                fsw = new FileSystemWatcher(path.path);
-                if (create)
-                {
-                    fsw.add_Created(new FileSystemEventHandler(new FileSystemEventHandler.Method() {
-                        public void Invoke(Object sender, FileSystemEventArgs e) {
-                            addEvent(createEvent(e), null);
-                        }
-                    }));
-                }
-                if (delete)
-                {
-                    fsw.add_Deleted(new FileSystemEventHandler(new FileSystemEventHandler.Method() {
-                        public void Invoke(Object sender, FileSystemEventArgs e) {
-                            addEvent(createEvent(e), null);
-                        }
-                    }));
-                }
-                if (modify)
-                {
-                    fsw.add_Changed(new FileSystemEventHandler(new FileSystemEventHandler.Method() {
-                        public void Invoke(Object sender, FileSystemEventArgs e) {
-                            synchronized (NetWatchKey.this) {
-                                if (modified.contains(e.get_Name())) {
-                                    // we already have an ENTRY_MODIFY event pending
-                                    return;
-                                }
-                            }
-                            addEvent(createEvent(e), e.get_Name());
-                        }
-                    }));
-                }
-                fsw.add_Error(new ErrorEventHandler(new ErrorEventHandler.Method() {
-                    public void Invoke(Object sender, ErrorEventArgs e) {
-                        if (e.GetException() instanceof cli.System.ComponentModel.Win32Exception
-                            && ((cli.System.ComponentModel.Win32Exception)e.GetException()).get_ErrorCode() == -2147467259) {
-                            // the directory we were watching was deleted
-                            cancelledByError();
-                        } else if (overflow) {
-                            addEvent(overflowEvent, null);
-                        }
-                    }
-                }));
-                if (subtree)
-                {
-                    fsw.set_IncludeSubdirectories(true);
-                }
-                fsw.set_EnableRaisingEvents(true);
-            }
-
-            WatchEvent<?> createEvent(final FileSystemEventArgs e)
-            {
-                return new WatchEvent<Path>() {
-                    public Path context() {
-                        return new NetPath((NetFileSystem)path.getFileSystem(), e.get_Name());
-                    }
-                    public int count() {
-                        return 1;
-                    }
-                    public WatchEvent.Kind<Path> kind() {
-                        switch (e.get_ChangeType().Value) {
-                            case WatcherChangeTypes.Created:
-                                return StandardWatchEventKinds.ENTRY_CREATE;
-                            case WatcherChangeTypes.Deleted:
-                                return StandardWatchEventKinds.ENTRY_DELETE;
-                            default:
-                                return StandardWatchEventKinds.ENTRY_MODIFY;
-                        }
-                    }
-                };
-            }
-
-            void cancelledByError()
-            {
-                cancel();
-                synchronized (this)
-                {
-                    if (!signaled)
-                    {
-                        signaled = true;
-                        enqueue(this);
-                    }
-                }
-            }
-
-            synchronized void addEvent(WatchEvent<?> event, String modified)
-            {
-                list.add(event);
-                if (modified != null)
-                {
-                    this.modified.add(modified);
-                }
-                if (!signaled)
-                {
-                    signaled = true;
-                    enqueue(this);
-                }
-            }
-
-            public synchronized boolean isValid()
-            {
-                return fsw != null;
-            }
-
-            public synchronized List<WatchEvent<?>> pollEvents()
-            {
-                ArrayList<WatchEvent<?>> r = list;
-                list = new ArrayList<>();
-                modified.clear();
-                return r;
-            }
-
-            public synchronized boolean reset()
-            {
-                if (fsw == null)
-                {
-                    return false;
-                }
-                if (signaled)
-                {
-                    if (list.size() == 0)
-                    {
-                        signaled = false;
-                    }
-                    else
-                    {
-                        enqueue(this);
-                    }
-                }
-                return true;
-            }
-
-            void close()
-            {
-                if (fsw != null)
-                {
-                    fsw.Dispose();
-                    fsw = null;
-                }
-            }
-
-            public void cancel()
-            {
-                synchronized (NetWatchService.this)
-                {
-                    keys.remove(this);
-                    close();
-                }
-            }
-
-            public Watchable watchable()
-            {
-                return path;
-            }
-        }
-
-        synchronized WatchKey register(NetPath path, boolean create, boolean delete, boolean modify, boolean overflow, boolean subtree)
-        {
-            if (closed)
-            {
-                throw new ClosedWatchServiceException();
-            }
-            NetWatchKey existing = null;
-            for (NetWatchKey key : keys)
-            {
-                if (key.watchable().equals(path))
-                {
-                    existing = key;
-                    break;
-                }
-            }
-            if (existing == null)
-            {
-                existing = new NetWatchKey(path);
-                keys.add(existing);
-            }
-            existing.init(create, delete, modify, overflow, subtree);
-            return existing;
-        }
-    }
-
-    public WatchService newWatchService() throws IOException
-    {
-        return new NetWatchService();
-    }
-}
diff --git a/openjdk/sun/nio/fs/NetFileSystemProvider.java b/openjdk/sun/nio/fs/NetFileSystemProvider.java
deleted file mode 100644
index 1f112199..00000000
--- a/openjdk/sun/nio/fs/NetFileSystemProvider.java
+++ /dev/null
@@ -1,1424 +0,0 @@
-/*
-  Copyright (C) 2011 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-
-*/
-
-package sun.nio.fs;
-
-import ikvm.internal.NotYetImplementedError;
-import static ikvm.internal.Util.WINDOWS;
-import cli.System.IO.Directory;
-import cli.System.IO.DirectoryInfo;
-import cli.System.IO.DriveInfo;
-import cli.System.IO.File;
-import cli.System.IO.FileAttributes;
-import cli.System.IO.FileInfo;
-import cli.System.IO.FileMode;
-import cli.System.IO.FileShare;
-import cli.System.IO.FileStream;
-import cli.System.IO.FileOptions;
-import cli.System.Security.AccessControl.FileSystemRights;
-import com.sun.nio.file.ExtendedOpenOption;
-import java.io.FileDescriptor;
-import java.io.IOException;
-import java.net.URI;
-import java.nio.channels.*;
-import java.nio.file.*;
-import java.nio.file.attribute.*;
-import java.nio.file.spi.FileSystemProvider;
-import java.util.concurrent.ExecutorService;
-import java.util.Iterator;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import sun.nio.ch.WindowsAsynchronousFileChannelImpl;
-import sun.nio.ch.FileChannelImpl;
-import sun.nio.ch.ThreadPool;
-
-final class NetFileSystemProvider extends AbstractFileSystemProvider
-{
-    private final NetFileSystem fs = new NetFileSystem(this);
-    private final HashMap<String, FileStore> stores = new HashMap<String, FileStore>();
-
-    final synchronized FileStore getFileStore(DriveInfo drive) throws IOException
-    {
-        String name = drive.get_Name().toLowerCase();
-        FileStore fs = stores.get(name);
-        if (fs == null)
-        {
-            fs = new NetFileStore(drive);
-            stores.put(name, fs);
-        }
-        return fs;
-    }
-
-    public String getScheme()
-    {
-        return "file";
-    }
-
-    public FileSystem newFileSystem(URI uri, Map<String, ?> env) throws IOException
-    {
-        throw new FileSystemAlreadyExistsException();
-    }
-
-    public FileSystem getFileSystem(URI uri)
-    {
-        return fs;
-    }
-
-    public Path getPath(URI uri)
-    {
-        if (WINDOWS)
-        {
-            return WindowsUriSupport.fromUri(fs, uri);
-        }
-        else
-        {
-            return UnixUriUtils.fromUri(fs, uri);
-        }
-    }
-
-    public AsynchronousFileChannel newAsynchronousFileChannel(Path path, Set<? extends OpenOption> opts, ExecutorService executor, FileAttribute<?>... attrs) throws IOException
-    {
-        NetPath npath = NetPath.from(path);
-        for (FileAttribute<?> attr : attrs)
-        {
-            // null check
-            attr.getClass();
-            throw new NotYetImplementedError();
-        }
-        int mode = FileMode.Open;
-        int share = FileShare.ReadWrite | FileShare.Delete;
-        int options = FileOptions.Asynchronous;
-        boolean read = false;
-        boolean write = false;
-        boolean truncate = false;
-        for (OpenOption opt : opts)
-        {
-            if (opt instanceof StandardOpenOption)
-            {
-                switch ((StandardOpenOption)opt)
-                {
-                    case CREATE:
-                        mode = FileMode.Create;
-                        break;
-                    case CREATE_NEW:
-                        mode = FileMode.CreateNew;
-                        break;
-                    case DELETE_ON_CLOSE:
-                        options |= FileOptions.DeleteOnClose;
-                        break;
-                    case DSYNC:
-                        options |= FileOptions.WriteThrough;
-                        break;
-                    case READ:
-                        read = true;
-                        break;
-                    case SPARSE:
-                        break;
-                    case SYNC:
-                        options |= FileOptions.WriteThrough;
-                        break;
-                    case TRUNCATE_EXISTING:
-                        truncate = true;
-                        break;
-                    case WRITE:
-                        write = true;
-                        break;
-                    default:
-                        throw new UnsupportedOperationException();
-                }
-            }
-            else if (opt instanceof ExtendedOpenOption)
-            {
-                switch ((ExtendedOpenOption)opt)
-                {
-                    case NOSHARE_READ:
-                        share &= ~FileShare.Read;
-                        break;
-                    case NOSHARE_WRITE:
-                        share &= ~FileShare.Write;
-                        break;
-                    case NOSHARE_DELETE:
-                        share &= ~FileShare.Delete;
-                        break;
-                    default:
-                        throw new UnsupportedOperationException();
-                }
-            }
-            else
-            {
-                // null check
-                opt.getClass();
-                throw new UnsupportedOperationException();
-            }
-        }
-
-        if (!read && !write)
-        {
-            read = true;
-        }
-
-        if (truncate)
-        {
-            if (mode == FileMode.Open)
-            {
-                mode = FileMode.Truncate;
-            }
-        }
-
-        int rights = 0;
-        if (read)
-        {
-            rights |= FileSystemRights.Read;
-        }
-        if (write)
-        {
-            rights |= FileSystemRights.Write;
-        }
-
-        ThreadPool pool;
-        if (executor == null)
-        {
-            pool = null;
-        }
-        else
-        {
-            pool = ThreadPool.wrap(executor, 0);
-        }
-
-        return WindowsAsynchronousFileChannelImpl.open(open(npath.path, mode, rights, share, options), read, write, pool);
-    }
-
-    public SeekableByteChannel newByteChannel(Path path, Set<? extends OpenOption> opts, FileAttribute<?>... attrs) throws IOException
-    {
-        return newFileChannel(path, opts, attrs);
-    }
-
-    public FileChannel newFileChannel(Path path, Set<? extends OpenOption> opts, FileAttribute<?>... attrs) throws IOException
-    {
-        NetPath npath = NetPath.from(path);
-        for (FileAttribute<?> attr : attrs)
-        {
-            // null check
-            attr.getClass();
-            throw new NotYetImplementedError();
-        }
-        int mode = FileMode.Open;
-        int share = FileShare.ReadWrite | FileShare.Delete;
-        int options = FileOptions.None;
-        boolean read = false;
-        boolean write = false;
-        boolean append = false;
-        boolean truncate = false;
-        for (OpenOption opt : opts)
-        {
-            if (opt instanceof StandardOpenOption)
-            {
-                switch ((StandardOpenOption)opt)
-                {
-                    case APPEND:
-                        append = true;
-                        write = true;
-                        mode = FileMode.Append;
-                        break;
-                    case CREATE:
-                        mode = FileMode.Create;
-                        break;
-                    case CREATE_NEW:
-                        mode = FileMode.CreateNew;
-                        break;
-                    case DELETE_ON_CLOSE:
-                        options |= FileOptions.DeleteOnClose;
-                        break;
-                    case DSYNC:
-                        options |= FileOptions.WriteThrough;
-                        break;
-                    case READ:
-                        read = true;
-                        break;
-                    case SPARSE:
-                        break;
-                    case SYNC:
-                        options |= FileOptions.WriteThrough;
-                        break;
-                    case TRUNCATE_EXISTING:
-                        truncate = true;
-                        break;
-                    case WRITE:
-                        write = true;
-                        break;
-                    default:
-                        throw new UnsupportedOperationException();
-                }
-            }
-            else if (opt instanceof ExtendedOpenOption)
-            {
-                switch ((ExtendedOpenOption)opt)
-                {
-                    case NOSHARE_READ:
-                        share &= ~FileShare.Read;
-                        break;
-                    case NOSHARE_WRITE:
-                        share &= ~FileShare.Write;
-                        break;
-                    case NOSHARE_DELETE:
-                        share &= ~FileShare.Delete;
-                        break;
-                    default:
-                        throw new UnsupportedOperationException();
-                }
-            }
-            else
-            {
-                // null check
-                opt.getClass();
-                throw new UnsupportedOperationException();
-            }
-        }
-
-        if (!read && !write)
-        {
-            read = true;
-        }
-
-        if (read && append)
-        {
-            throw new IllegalArgumentException("READ + APPEND not allowed");
-        }
-        
-        if (truncate)
-        {
-            if (append)
-            {
-                throw new IllegalArgumentException("APPEND + TRUNCATE_EXISTING not allowed");
-            }
-            if (mode == FileMode.Open)
-            {
-                mode = FileMode.Truncate;
-            }
-        }
-        
-        int rights = 0;
-        if (append)
-        {
-            // for atomic append to work, we can't set FileSystemRights.Write
-            rights |= FileSystemRights.AppendData;
-        }
-        else
-        {
-            if (read)
-            {
-                rights |= FileSystemRights.Read;
-            }
-            if (write)
-            {
-                rights |= FileSystemRights.Write;
-            }
-        }
-
-        return FileChannelImpl.open(open(npath.path, mode, rights, share, options), read, write, append, null);
-    }
-
-    private static FileDescriptor open(String path, int mode, int rights, int share, int options) throws IOException
-    {
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null)
-        {
-            if ((rights & FileSystemRights.Read) != 0)
-            {
-                sm.checkRead(path);
-            }
-            if ((rights & (FileSystemRights.Write | FileSystemRights.AppendData)) != 0)
-            {
-                sm.checkWrite(path);
-            }
-            if ((options & FileOptions.DeleteOnClose) != 0)
-            {
-                sm.checkDelete(path);
-            }
-        }
-
-        try
-        {
-            if (false) throw new cli.System.ArgumentException();
-            if (false) throw new cli.System.IO.FileNotFoundException();
-            if (false) throw new cli.System.IO.DirectoryNotFoundException();
-            if (false) throw new cli.System.PlatformNotSupportedException();
-            if (false) throw new cli.System.IO.IOException();
-            if (false) throw new cli.System.Security.SecurityException();
-            if (false) throw new cli.System.UnauthorizedAccessException();
-            return FileDescriptor.fromStream(new FileStream(path, FileMode.wrap(mode), FileSystemRights.wrap(rights), FileShare.wrap(share), 8, FileOptions.wrap(options)));
-        }
-        catch (cli.System.ArgumentException x)
-        {
-            throw new FileSystemException(path, null, x.getMessage());
-        }
-        catch (cli.System.IO.FileNotFoundException _)
-        {
-            throw new NoSuchFileException(path);
-        }
-        catch (cli.System.IO.DirectoryNotFoundException _)
-        {
-            throw new NoSuchFileException(path);
-        }
-        catch (cli.System.PlatformNotSupportedException x)
-        {
-            throw new UnsupportedOperationException(x.getMessage());
-        }
-        catch (cli.System.IO.IOException x)
-        {
-            if (mode == FileMode.CreateNew && File.Exists(path))
-            {
-                throw new FileAlreadyExistsException(path);
-            }
-            throw new FileSystemException(path, null, x.getMessage());
-        }
-        catch (cli.System.Security.SecurityException _)
-        {
-            throw new AccessDeniedException(path);
-        }
-        catch (cli.System.UnauthorizedAccessException _)
-        {
-            throw new AccessDeniedException(path);
-        }
-    }
-
-    public DirectoryStream<Path> newDirectoryStream(Path dir, final DirectoryStream.Filter<? super Path> filter) throws IOException
-    {
-        final String ndir = NetPath.from(dir).path;
-        // null check
-        filter.getClass();
-
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null)
-        {
-            sm.checkRead(ndir);
-        }
-
-        try
-        {
-            if (false) throw new cli.System.ArgumentException();
-            if (false) throw new cli.System.IO.DirectoryNotFoundException();
-            if (false) throw new cli.System.IO.IOException();
-            if (false) throw new cli.System.Security.SecurityException();
-            if (false) throw new cli.System.UnauthorizedAccessException();
-            final String[] files = Directory.GetFileSystemEntries(ndir);
-            return new DirectoryStream<Path>() {
-                private boolean closed;
-                public Iterator<Path> iterator() {
-                    if (closed) {
-                        throw new IllegalStateException();
-                    }
-                    closed = true;
-                    return new Iterator<Path>() {
-                        private int pos;
-                        private Path filtered;
-                        public boolean hasNext() {
-                            if (filtered == null) {
-                                while (pos != files.length) {
-                                    Path p = new NetPath(fs, cli.System.IO.Path.Combine(ndir, files[pos++]));
-                                    try {
-                                        if (filter.accept(p)) {
-                                            filtered = p;
-                                            break;
-                                        }
-                                    } catch (IOException x) {
-                                        throw new DirectoryIteratorException(x);
-                                    }
-                                }
-                            }
-                            return filtered != null;
-                        }
-                        public Path next() {
-                            if (!hasNext()) {
-                                throw new NoSuchElementException();
-                            }
-                            Path p = filtered;
-                            filtered = null;
-                            return p;
-                        }
-                        public void remove() {
-                            throw new UnsupportedOperationException();
-                        }
-                    };
-                }
-                public void close() {
-                    closed = true;
-                }
-            };
-        }
-        catch (cli.System.ArgumentException
-             | cli.System.IO.IOException
-             | cli.System.Security.SecurityException
-             | cli.System.UnauthorizedAccessException x)
-        {
-            if (File.Exists(ndir))
-            {
-                throw new NotDirectoryException(ndir);
-            }
-            throw new IOException(x.getMessage());
-        }
-    }
-
-    public void createDirectory(Path dir, FileAttribute<?>... attrs) throws IOException
-    {
-        NetPath ndir = NetPath.from(dir);
-        for (FileAttribute<?> attr : attrs)
-        {
-            // null check
-            attr.getClass();
-            throw new NotYetImplementedError();
-        }
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null)
-        {
-            sm.checkWrite(ndir.path);
-        }
-        try
-        {
-            if (false) throw new cli.System.ArgumentException();
-            if (false) throw new cli.System.IO.IOException();
-            if (false) throw new cli.System.Security.SecurityException();
-            if (false) throw new cli.System.UnauthorizedAccessException();
-            Directory.CreateDirectory(ndir.path);
-        }
-        catch (cli.System.ArgumentException
-             | cli.System.IO.IOException
-             | cli.System.Security.SecurityException
-             | cli.System.UnauthorizedAccessException x)
-        {
-            if (File.Exists(ndir.path))
-            {
-                throw new FileAlreadyExistsException(ndir.path);
-            }
-            throw new IOException(x.getMessage());
-        }
-    }
-
-    public void copy(Path source, Path target, CopyOption... options) throws IOException
-    {
-        NetPath nsource = NetPath.from(source);
-        NetPath ntarget = NetPath.from(target);
-        boolean overwrite = false;
-        boolean copyAttribs = false;
-        for (CopyOption opt : options)
-        {
-            if (opt == StandardCopyOption.REPLACE_EXISTING)
-            {
-                overwrite = true;
-            }
-            else if (opt == StandardCopyOption.COPY_ATTRIBUTES)
-            {
-                copyAttribs = true;
-            }
-            else
-            {
-                // null check
-                opt.getClass();
-                throw new UnsupportedOperationException("Unsupported copy option");
-            }
-        }
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null)
-        {
-            sm.checkRead(nsource.path);
-            sm.checkWrite(ntarget.path);
-        }
-        try
-        {
-            if (false) throw new cli.System.ArgumentException();
-            if (false) throw new cli.System.IO.FileNotFoundException();
-            if (false) throw new cli.System.IO.DirectoryNotFoundException();
-            if (false) throw new cli.System.IO.IOException();
-            if (false) throw new cli.System.Security.SecurityException();
-            if (false) throw new cli.System.UnauthorizedAccessException();
-            if (File.Exists(ntarget.path))
-            {
-                if (!overwrite)
-                {
-                    throw new FileAlreadyExistsException(ntarget.path);
-                }
-                File.Delete(ntarget.path);
-            }
-            if (Directory.Exists(ntarget.path))
-            {
-                if (!overwrite)
-                {
-                    throw new FileAlreadyExistsException(ntarget.path);
-                }
-                try
-                {
-                    if (false) throw new cli.System.IO.IOException();
-                    Directory.Delete(ntarget.path);
-                }
-                catch (cli.System.IO.IOException _)
-                {
-                    // HACK we assume that the IOException is caused by the directory not being empty
-                    throw new DirectoryNotEmptyException(ntarget.path);
-                }
-            }
-            if (Directory.Exists(nsource.path))
-            {
-                Directory.CreateDirectory(ntarget.path);
-            }
-            else
-            {
-                File.Copy(nsource.path, ntarget.path, overwrite);
-            }
-            if (copyAttribs)
-            {
-                if (Directory.Exists(ntarget.path))
-                {
-                    File.SetAttributes(ntarget.path, File.GetAttributes(nsource.path));
-                    Directory.SetCreationTimeUtc(ntarget.path, File.GetCreationTimeUtc(nsource.path));
-                    Directory.SetLastAccessTimeUtc(ntarget.path, File.GetLastAccessTimeUtc(nsource.path));
-                    Directory.SetLastWriteTimeUtc(ntarget.path, File.GetLastWriteTimeUtc(nsource.path));
-                }
-                else
-                {
-                    File.SetAttributes(ntarget.path, File.GetAttributes(nsource.path));
-                    File.SetCreationTimeUtc(ntarget.path, File.GetCreationTimeUtc(nsource.path));
-                    File.SetLastAccessTimeUtc(ntarget.path, File.GetLastAccessTimeUtc(nsource.path));
-                    File.SetLastWriteTimeUtc(ntarget.path, File.GetLastWriteTimeUtc(nsource.path));
-                }
-            }
-        }
-        catch (cli.System.IO.FileNotFoundException x)
-        {
-            throw new NoSuchFileException(x.get_FileName());
-        }
-        catch (cli.System.IO.DirectoryNotFoundException x)
-        {
-            throw new NoSuchFileException(nsource.path, ntarget.path, x.getMessage());
-        }
-        catch (cli.System.IO.IOException | cli.System.ArgumentException x)
-        {
-            throw new FileSystemException(nsource.path, ntarget.path, x.getMessage());
-        }
-        catch (cli.System.Security.SecurityException | cli.System.UnauthorizedAccessException x)
-        {
-            throw new AccessDeniedException(nsource.path, ntarget.path, x.getMessage());
-        }
-    }
-
-    public void move(Path source, Path target, CopyOption... options) throws IOException
-    {
-        NetPath nsource = NetPath.from(source);
-        NetPath ntarget = NetPath.from(target);
-        boolean overwrite = false;
-        for (CopyOption opt : options)
-        {
-            if (opt == StandardCopyOption.REPLACE_EXISTING)
-            {
-                overwrite = true;
-            }
-            else if (opt == StandardCopyOption.ATOMIC_MOVE)
-            {
-                throw new AtomicMoveNotSupportedException(nsource.path, ntarget.path, "Unsupported copy option");
-            }
-            else
-            {
-                // null check
-                opt.getClass();
-                throw new UnsupportedOperationException("Unsupported copy option");
-            }
-        }
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null)
-        {
-            sm.checkRead(nsource.path);
-            sm.checkWrite(ntarget.path);
-        }
-        try
-        {
-            if (false) throw new cli.System.ArgumentException();
-            if (false) throw new cli.System.IO.FileNotFoundException();
-            if (false) throw new cli.System.IO.DirectoryNotFoundException();
-            if (false) throw new cli.System.IO.IOException();
-            if (false) throw new cli.System.Security.SecurityException();
-            if (false) throw new cli.System.UnauthorizedAccessException();
-            if (File.Exists(ntarget.path))
-            {
-                if (!overwrite)
-                {
-                    throw new FileAlreadyExistsException(ntarget.path);
-                }
-                File.Delete(ntarget.path);
-            }
-            if (Directory.Exists(ntarget.path))
-            {
-                if (!overwrite)
-                {
-                    throw new FileAlreadyExistsException(ntarget.path);
-                }
-                try
-                {
-                    if (false) throw new cli.System.IO.IOException();
-                    Directory.Delete(ntarget.path);
-                }
-                catch (cli.System.IO.IOException _)
-                {
-                    // HACK we assume that the IOException is caused by the directory not being empty
-                    throw new DirectoryNotEmptyException(ntarget.path);
-                }
-            }
-            if (Directory.Exists(nsource.path))
-            {
-                Directory.Move(nsource.path, ntarget.path);
-            }
-            else
-            {
-                File.Move(nsource.path, ntarget.path);
-            }
-        }
-        catch (cli.System.IO.FileNotFoundException x)
-        {
-            throw new NoSuchFileException(x.get_FileName());
-        }
-        catch (cli.System.IO.DirectoryNotFoundException x)
-        {
-            throw new NoSuchFileException(nsource.path, ntarget.path, x.getMessage());
-        }
-        catch (cli.System.IO.IOException | cli.System.ArgumentException x)
-        {
-            throw new FileSystemException(nsource.path, ntarget.path, x.getMessage());
-        }
-        catch (cli.System.Security.SecurityException | cli.System.UnauthorizedAccessException x)
-        {
-            throw new AccessDeniedException(nsource.path, ntarget.path, x.getMessage());
-        }
-    }
-
-    public boolean isSameFile(Path path, Path path2) throws IOException
-    {
-        if (path.equals(path2))
-        {
-            return true;
-        }
-        if (!(path instanceof NetPath && path2 instanceof NetPath))
-        {
-            // null check
-            path2.getClass();
-            return false;
-        }
-        return path.toRealPath().equals(path2.toRealPath());
-    }
-
-    public boolean isHidden(Path path) throws IOException
-    {
-        String npath = NetPath.from(path).path;
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null)
-        {
-            sm.checkRead(npath);
-        }
-        try
-        {
-            if (false) throw new cli.System.ArgumentException();
-            if (false) throw new cli.System.IO.FileNotFoundException();
-            if (false) throw new cli.System.IO.IOException();
-            return (File.GetAttributes(npath).Value & (cli.System.IO.FileAttributes.Hidden | cli.System.IO.FileAttributes.Directory)) == cli.System.IO.FileAttributes.Hidden;
-        }
-        catch (cli.System.IO.FileNotFoundException x)
-        {
-            throw new NoSuchFileException(npath);
-        }
-        catch (cli.System.IO.IOException | cli.System.ArgumentException x)
-        {
-            throw new IOException(x.getMessage());
-        }
-    }
-
-    private static class NetFileStore extends FileStore
-    {
-        private final DriveInfo info;
-        private final String name;
-        private final String type;
-
-        NetFileStore(DriveInfo info) throws IOException
-        {
-            this.info = info;
-            try
-            {
-                if (false) throw new cli.System.IO.IOException();
-                name = info.get_VolumeLabel();
-                type = info.get_DriveFormat();
-            }
-            catch (cli.System.IO.IOException x)
-            {
-                throw new IOException(x.getMessage());
-            }
-        }
-
-        public Object getAttribute(String attribute) throws IOException
-        {
-            switch (attribute)
-            {
-                case "totalSpace":
-                    return getTotalSpace();
-                case "unallocatedSpace":
-                    return getUnallocatedSpace();
-                case "usableSpace":
-                    return getUsableSpace();
-                default:
-                    throw new UnsupportedOperationException();
-            }
-        }
-
-        public <V extends FileStoreAttributeView> V getFileStoreAttributeView(Class<V> type)
-        {
-            return null;
-        }
-
-        public long getTotalSpace() throws IOException
-        {
-            try
-            {
-                if (false) throw new cli.System.IO.IOException();
-                return info.get_TotalSize();
-            }
-            catch (cli.System.IO.IOException x)
-            {
-                throw new IOException(x.getMessage());
-            }
-        }
-
-        public long getUnallocatedSpace() throws IOException
-        {
-            try
-            {
-                if (false) throw new cli.System.IO.IOException();
-                return info.get_TotalFreeSpace();
-            }
-            catch (cli.System.IO.IOException x)
-            {
-                throw new IOException(x.getMessage());
-            }
-        }
-
-        public long getUsableSpace() throws IOException
-        {
-            try
-            {
-                if (false) throw new cli.System.IO.IOException();
-                return info.get_AvailableFreeSpace();
-            }
-            catch (cli.System.IO.IOException x)
-            {
-                throw new IOException(x.getMessage());
-            }
-        }
-
-        public boolean isReadOnly()
-        {
-            return false;
-        }
-
-        public String name()
-        {
-            return name;
-        }
-
-        public boolean supportsFileAttributeView(Class<? extends FileAttributeView> type)
-        {
-            // null check
-            type.getClass();
-            return type == BasicFileAttributeView.class || type == DosFileAttributeView.class;
-        }
-
-        public boolean supportsFileAttributeView(String name)
-        {
-            return name.equals("basic") || name.equals("dos");
-        }
-
-        public String type()
-        {
-            return type;
-        }        
-
-        public String toString()
-        {
-            return name + " (" + info.get_Name().charAt(0) + ":)";
-        }
-    }
-
-    public FileStore getFileStore(Path path) throws IOException
-    {
-        NetPath npath = NetPath.from(path.toAbsolutePath());
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null)
-        {
-            sm.checkRead(npath.path);
-        }
-        return getFileStore(new DriveInfo(npath.path));
-    }
-
-    public void checkAccess(Path path, AccessMode... modes) throws IOException
-    {
-        String npath = NetPath.from(path).path;
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null)
-        {
-            if (modes.length == 0)
-            {
-                sm.checkRead(npath);
-            }
-            for (AccessMode m : modes)
-            {
-                switch (m)
-                {
-                    case READ:
-                        sm.checkRead(npath);
-                        break;
-                    case WRITE:
-                        sm.checkWrite(npath);
-                        break;
-                    case EXECUTE:
-                        sm.checkExec(npath);
-                        break;
-                    default:
-                        throw new UnsupportedOperationException();
-                }
-            }
-        }
-        try
-        {
-            if (false) throw new cli.System.ArgumentException();
-            if (false) throw new cli.System.IO.DirectoryNotFoundException();
-            if (false) throw new cli.System.IO.FileNotFoundException();
-            if (false) throw new cli.System.IO.IOException();
-            if (false) throw new cli.System.NotSupportedException();
-            if (false) throw new cli.System.Security.SecurityException();
-            if (false) throw new cli.System.UnauthorizedAccessException();
-            // note that File.GetAttributes() works for directories as well
-            int attr = File.GetAttributes(npath).Value;
-            for (AccessMode m : modes)
-            {
-                switch (m)
-                {
-                    case READ:
-                    case EXECUTE:
-                        break;
-                    case WRITE:
-                        if ((attr & (cli.System.IO.FileAttributes.ReadOnly | cli.System.IO.FileAttributes.Directory)) == cli.System.IO.FileAttributes.ReadOnly)
-                        {
-                            throw new AccessDeniedException(npath, null, "file has read-only attribute set");
-                        }
-                        if (getFileStore(path).isReadOnly())
-                        {
-                            throw new AccessDeniedException(npath, null, "volume is read-only");
-                        }
-                        break;
-                    default:
-                        throw new UnsupportedOperationException();
-                }
-            }
-        }
-        catch (cli.System.IO.FileNotFoundException | cli.System.IO.DirectoryNotFoundException _)
-        {
-            throw new NoSuchFileException(npath);
-        }
-        catch (cli.System.Security.SecurityException | cli.System.UnauthorizedAccessException x)
-        {
-            throw new AccessDeniedException(npath, null, x.getMessage());
-        }
-        catch (cli.System.ArgumentException | cli.System.IO.IOException | cli.System.NotSupportedException x)
-        {
-            throw new IOException(x.getMessage());
-        }
-    }
-
-    private static class BasicFileAttributesViewImpl extends AbstractBasicFileAttributeView
-    {
-        protected final String path;
-
-        BasicFileAttributesViewImpl(String path)
-        {
-            this.path = path;
-        }
-
-        public BasicFileAttributes readAttributes() throws IOException
-        {
-            return DosFileAttributesViewImpl.readAttributesImpl(path);
-        }
-
-        public void setTimes(FileTime lastModifiedTime, FileTime lastAccessTime, FileTime createTime) throws IOException
-        {
-            SecurityManager sm = System.getSecurityManager();
-            if (sm != null)
-            {
-                sm.checkWrite(path);
-            }
-            try
-            {
-                if (false) throw new cli.System.ArgumentException();
-                if (false) throw new cli.System.IO.IOException();
-                if (false) throw new cli.System.NotSupportedException();
-                if (false) throw new cli.System.Security.SecurityException();
-                if (false) throw new cli.System.UnauthorizedAccessException();
-                if (File.Exists(path))
-                {
-                    if (lastModifiedTime != null)
-                    {
-                        File.SetLastWriteTimeUtc(path, toDateTime(lastModifiedTime));
-                    }
-                    if (lastAccessTime != null)
-                    {
-                        File.SetLastAccessTimeUtc(path, toDateTime(lastAccessTime));
-                    }
-                    if (createTime != null)
-                    {
-                        File.SetCreationTimeUtc(path, toDateTime(createTime));
-                    }
-                }
-                else if (Directory.Exists(path))
-                {
-                    if (lastModifiedTime != null)
-                    {
-                        Directory.SetLastWriteTimeUtc(path, toDateTime(lastModifiedTime));
-                    }
-                    if (lastAccessTime != null)
-                    {
-                        Directory.SetLastAccessTimeUtc(path, toDateTime(lastAccessTime));
-                    }
-                    if (createTime != null)
-                    {
-                        Directory.SetCreationTimeUtc(path, toDateTime(createTime));
-                    }
-                }
-                else
-                {
-                    throw new NoSuchFileException(path);
-                }
-            }
-            catch (cli.System.ArgumentException
-                 | cli.System.IO.IOException
-                 | cli.System.NotSupportedException
-                 | cli.System.Security.SecurityException
-                 | cli.System.UnauthorizedAccessException x)
-            {
-                throw new IOException(x.getMessage());
-            }
-        }
-    }
-
-    private static class DosFileAttributesViewImpl extends BasicFileAttributesViewImpl implements DosFileAttributeView
-    {
-        private static final String READONLY_NAME = "readonly";
-        private static final String ARCHIVE_NAME = "archive";
-        private static final String SYSTEM_NAME = "system";
-        private static final String HIDDEN_NAME = "hidden";
-        private static final String ATTRIBUTES_NAME = "attributes";
-        private static final Set<String> dosAttributeNames = Util.newSet(basicAttributeNames, READONLY_NAME, ARCHIVE_NAME, SYSTEM_NAME,  HIDDEN_NAME, ATTRIBUTES_NAME);
-
-        DosFileAttributesViewImpl(String path)
-        {
-            super(path);
-        }
-
-        public String name()
-        {
-            return "dos";
-        }
-
-        public DosFileAttributes readAttributes() throws IOException
-        {
-            return readAttributesImpl(path);
-        }
-
-        private static class DosFileAttributesImpl implements DosFileAttributes
-        {
-            private final FileInfo info;
-
-            DosFileAttributesImpl(FileInfo info)
-            {
-                this.info = info;
-            }
-
-            int attributes()
-            {
-                return info.get_Attributes().Value;
-            }
-
-            public FileTime creationTime()
-            {
-                return toFileTime(info.get_CreationTimeUtc());
-            }
-
-            public Object fileKey()
-            {
-                return null;
-            }
-
-            public boolean isDirectory()
-            {
-                return (info.get_Attributes().Value & cli.System.IO.FileAttributes.Directory) != 0;
-            }
-
-            public boolean isOther()
-            {
-                return false;
-            }
-
-            public boolean isRegularFile()
-            {
-                return (info.get_Attributes().Value & cli.System.IO.FileAttributes.Directory) == 0;
-            }
-
-            public boolean isSymbolicLink()
-            {
-                return false;
-            }
-
-            public FileTime lastAccessTime()
-            {
-                return toFileTime(info.get_LastAccessTimeUtc());
-            }
-
-            public FileTime lastModifiedTime()
-            {
-                return toFileTime(info.get_LastWriteTimeUtc());
-            }
-
-            public long size()
-            {
-                return info.get_Exists() ? info.get_Length() : 0;
-            }
-
-            public boolean isArchive()
-            {
-                return (info.get_Attributes().Value & cli.System.IO.FileAttributes.Archive) != 0;
-            }
-
-            public boolean isHidden()
-            {
-                return (info.get_Attributes().Value & cli.System.IO.FileAttributes.Hidden) != 0;
-            }
-
-            public boolean isReadOnly()
-            {
-                return (info.get_Attributes().Value & cli.System.IO.FileAttributes.ReadOnly) != 0;
-            }
-
-            public boolean isSystem()
-            {
-                return (info.get_Attributes().Value & cli.System.IO.FileAttributes.System) != 0;
-            }
-        }
-
-        static DosFileAttributesImpl readAttributesImpl(String path) throws IOException
-        {
-            SecurityManager sm = System.getSecurityManager();
-            if (sm != null)
-            {
-                sm.checkRead(path);
-            }
-            try
-            {
-                if (false) throw new cli.System.ArgumentException();
-                if (false) throw new cli.System.IO.FileNotFoundException();
-                if (false) throw new cli.System.IO.IOException();
-                FileInfo info = new FileInfo(path);
-                // We have to rely on the (undocumented) fact that FileInfo.Attributes returns -1
-                // when the path does not exist. We need this to work for both files and directories
-                // and this is the only efficient way to do that.
-                if (info.get_Attributes().Value == -1)
-                {
-                    throw new NoSuchFileException(path);
-                }
-                return new DosFileAttributesImpl(info);
-            }
-            catch (cli.System.IO.FileNotFoundException _)
-            {
-                throw new NoSuchFileException(path);
-            }
-            catch (cli.System.IO.IOException | cli.System.ArgumentException x)
-            {
-                throw new IOException(x.getMessage());
-            }
-        }
-
-        public void setArchive(boolean value) throws IOException
-        {
-            setAttribute(cli.System.IO.FileAttributes.Archive, value);
-        }
-
-        public void setHidden(boolean value) throws IOException
-        {
-            setAttribute(cli.System.IO.FileAttributes.Hidden, value);
-        }
-
-        public void setReadOnly(boolean value) throws IOException
-        {
-            setAttribute(cli.System.IO.FileAttributes.ReadOnly, value);
-        }
-
-        public void setSystem(boolean value) throws IOException
-        {
-            setAttribute(cli.System.IO.FileAttributes.System, value);
-        }
-
-        private void setAttribute(int attr, boolean value) throws IOException
-        {
-            SecurityManager sm = System.getSecurityManager();
-            if (sm != null)
-            {
-                sm.checkWrite(path);
-            }
-            try
-            {
-                if (false) throw new cli.System.ArgumentException();
-                if (false) throw new cli.System.IO.IOException();
-                FileInfo info = new FileInfo(path);
-                if (value)
-                {
-                    info.set_Attributes(cli.System.IO.FileAttributes.wrap(info.get_Attributes().Value | attr));
-                }
-                else
-                {
-                    info.set_Attributes(cli.System.IO.FileAttributes.wrap(info.get_Attributes().Value & ~attr));
-                }
-            }
-            catch (cli.System.IO.FileNotFoundException _)
-            {
-                throw new NoSuchFileException(path);
-            }
-            catch (cli.System.ArgumentException
-                 | cli.System.IO.IOException x)
-            {
-                throw new IOException(x.getMessage());
-            }
-        }
-
-        public Map<String,Object> readAttributes(String[] attributes) throws IOException
-        {
-            AttributesBuilder builder = AttributesBuilder.create(dosAttributeNames, attributes);
-            DosFileAttributesImpl attrs = readAttributesImpl(path);
-            addRequestedBasicAttributes(attrs, builder);
-            if (builder.match(READONLY_NAME))
-            {
-                builder.add(READONLY_NAME, attrs.isReadOnly());
-            }
-            if (builder.match(ARCHIVE_NAME))
-            {
-                builder.add(ARCHIVE_NAME, attrs.isArchive());
-            }
-            if (builder.match(SYSTEM_NAME))
-            {
-                builder.add(SYSTEM_NAME, attrs.isSystem());
-            }
-            if (builder.match(HIDDEN_NAME))
-            {
-                builder.add(HIDDEN_NAME, attrs.isHidden());
-            }
-            if (builder.match(ATTRIBUTES_NAME))
-            {
-                builder.add(ATTRIBUTES_NAME, attrs.attributes());
-            }
-            return builder.unmodifiableMap();
-        }
-
-        public void setAttribute(String attribute, Object value) throws IOException
-        {
-            switch (attribute)
-            {
-                case READONLY_NAME:
-                    setReadOnly((Boolean)value);
-                    break;
-                case ARCHIVE_NAME:
-                    setArchive((Boolean)value);
-                    break;
-                case SYSTEM_NAME:
-                    setSystem((Boolean)value);
-                    break;
-                case HIDDEN_NAME:
-                    setHidden((Boolean)value);
-                    break;
-                default:
-                    super.setAttribute(attribute, value);
-                    break;
-            }
-        }
-    }
-
-    private static void validateLinkOption(LinkOption... options)
-    {
-        for (LinkOption option : options)
-        {
-            if (option == LinkOption.NOFOLLOW_LINKS)
-            {
-                // ignored
-            }
-            else
-            {
-                // null check
-                option.getClass();
-                throw new UnsupportedOperationException();
-            }
-        }
-    }
-
-    public <V extends FileAttributeView> V getFileAttributeView(Path path, Class<V> type, LinkOption... options)
-    {
-        String npath = NetPath.from(path).path;
-        validateLinkOption(options);
-        if (type == BasicFileAttributeView.class)
-        {
-            return (V)new BasicFileAttributesViewImpl(npath);
-        }
-        else if (type == DosFileAttributeView.class)
-        {
-            return (V)new DosFileAttributesViewImpl(npath);
-        }
-        else
-        {
-            // null check
-            type.getClass();
-            return null;
-        }
-    }
-
-    public <A extends BasicFileAttributes> A readAttributes(Path path, Class<A> type, LinkOption... options) throws IOException
-    {
-        String npath = NetPath.from(path).path;
-        // null check
-        type.getClass();
-        validateLinkOption(options);
-        if (type != BasicFileAttributes.class && type != DosFileAttributes.class)
-        {
-            throw new UnsupportedOperationException();
-        }
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null)
-        {
-            sm.checkRead(npath);
-        }
-        return (A)DosFileAttributesViewImpl.readAttributesImpl(npath);
-    }
-
-    DynamicFileAttributeView getFileAttributeView(Path file, String name, LinkOption... options)
-    {
-        validateLinkOption(options);
-        if (name.equals("basic"))
-        {
-            return new BasicFileAttributesViewImpl(NetPath.from(file).path);
-        }
-        else if (name.equals("dos"))
-        {
-            return new DosFileAttributesViewImpl(NetPath.from(file).path);
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-    boolean implDelete(Path file, boolean failIfNotExists) throws IOException
-    {
-        String path = NetPath.from(file).path;
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null)
-        {
-            sm.checkDelete(path);
-        }
-        try
-        {
-            if (false) throw new cli.System.ArgumentException();
-            if (false) throw new cli.System.IO.FileNotFoundException();
-            if (false) throw new cli.System.IO.DirectoryNotFoundException();
-            if (false) throw new cli.System.IO.IOException();
-            if (false) throw new cli.System.Security.SecurityException();
-            if (false) throw new cli.System.UnauthorizedAccessException();
-            int attr = cli.System.IO.File.GetAttributes(path).Value;
-            if ((attr & cli.System.IO.FileAttributes.Directory) != 0)
-            {
-                try
-                {
-                    if (false) throw new cli.System.IO.IOException();
-                    cli.System.IO.Directory.Delete(path);
-                }
-                catch (cli.System.IO.IOException _)
-                {
-                    // HACK we assume that the IOException is caused by the directory not being empty
-                    throw new DirectoryNotEmptyException(path);
-                }
-                return true;
-            }
-            else
-            {
-                cli.System.IO.File.Delete(path);
-                return true;
-            }
-        }
-        catch (cli.System.ArgumentException x)
-        {
-            throw new FileSystemException(path, null, x.getMessage());
-        }
-        catch (cli.System.IO.FileNotFoundException _)
-        {
-            if (failIfNotExists)
-            {
-                throw new NoSuchFileException(path);
-            }
-            else
-            {
-                return false;
-            }
-        }
-        catch (cli.System.IO.DirectoryNotFoundException _)
-        {
-            if (failIfNotExists)
-            {
-                throw new NoSuchFileException(path);
-            }
-            else
-            {
-                return false;
-            }
-        }
-        catch (cli.System.IO.IOException x)
-        {
-            throw new FileSystemException(path, null, x.getMessage());
-        }
-        catch (cli.System.Security.SecurityException _)
-        {
-            throw new AccessDeniedException(path);
-        }
-        catch (cli.System.UnauthorizedAccessException _)
-        {
-            throw new AccessDeniedException(path);
-        }
-    }
-
-    static FileTime toFileTime(cli.System.DateTime dateTime)
-    {
-        return FileTime.from((dateTime.get_Ticks() - 621355968000000000L) / 10, java.util.concurrent.TimeUnit.MICROSECONDS);
-    }
-
-    static cli.System.DateTime toDateTime(FileTime fileTime)
-    {
-        return new cli.System.DateTime(fileTime.to(java.util.concurrent.TimeUnit.MICROSECONDS) * 10 + 621355968000000000L);
-    }
-}
diff --git a/openjdk/sun/nio/fs/NetPath.java b/openjdk/sun/nio/fs/NetPath.java
deleted file mode 100644
index 6861a1e2..00000000
--- a/openjdk/sun/nio/fs/NetPath.java
+++ /dev/null
@@ -1,569 +0,0 @@
-/*
-  Copyright (C) 2011 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-
-*/
-
-package sun.nio.fs;
-
-import com.sun.nio.file.ExtendedWatchEventModifier;
-import com.sun.nio.file.SensitivityWatchEventModifier;
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.nio.file.*;
-import java.util.ArrayList;
-import java.util.Iterator;
-import static ikvm.internal.Util.MACOSX;
-import static ikvm.internal.Util.WINDOWS;
-
-final class NetPath extends AbstractPath
-{
-    private static final char[] invalid = cli.System.IO.Path.GetInvalidFileNameChars();
-    private final NetFileSystem fs;
-    final String path;
-
-    NetPath(NetFileSystem fs, String path)
-    {
-        if (WINDOWS)
-        {
-            path = WindowsPathParser.parse(path).path();
-        }
-        else
-        {
-            StringBuilder sb = null;
-            int separatorCount = 0;
-            boolean prevWasSeparator = false;
-            for (int i = 0; i < path.length(); i++)
-            {
-                char c = path.charAt(i);
-                if (c == 0)
-                {
-                    throw new InvalidPathException(path, "Nul character not allowed");
-                }
-                else if (c == '/')
-                {
-                    if (prevWasSeparator)
-                    {
-                        if (sb == null)
-                        {
-                            sb = new StringBuilder();
-                            sb.append(path, 0, i);
-                        }
-                        continue;
-                    }
-                    separatorCount++;
-                    prevWasSeparator = true;
-                }
-                else
-                {
-                    prevWasSeparator = false;
-                }
-                if (sb != null)
-                {
-                    sb.append(c);
-                }
-            }
-            if (sb != null)
-            {
-                path = sb.toString();
-            }
-            if (path.length() > 1 && path.charAt(path.length() - 1) == '/')
-            {
-                path = path.substring(0, path.length() - 1);
-            }
-        }
-        this.fs = fs;
-        this.path = path;
-    }
-
-    public FileSystem getFileSystem()
-    {
-        return fs;
-    }
-
-    public boolean isAbsolute()
-    {
-        return cli.System.IO.Path.IsPathRooted(path)
-            && (!WINDOWS || path.startsWith("\\\\") || (path.length() >= 3 && path.charAt(1) == ':' && path.charAt(2) == '\\'));
-    }
-
-    public Path getRoot()
-    {
-        int len = getRootLength();
-        return len == 0 ? null : new NetPath(fs, path.substring(0, len));
-    }
-
-    private int getRootLength()
-    {
-        if (WINDOWS)
-        {
-            if (path.length() >= 2 && path.charAt(1) == ':')
-            {
-                if (path.length() >= 3 && path.charAt(2) == '\\')
-                {
-                    return 3;
-                }
-                else
-                {
-                    return 2;
-                }
-            }
-            else if (path.startsWith("\\\\"))
-            {
-                return path.indexOf('\\', path.indexOf('\\', 2) + 1) + 1;
-            }
-        }
-
-        if (path.length() >= 1 && path.charAt(0) == cli.System.IO.Path.DirectorySeparatorChar)
-        {
-            return 1;
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    public Path getFileName()
-    {
-        if (path.length() == 0)
-        {
-            return this;
-        }
-        if (path.length() == getRootLength())
-        {
-            return null;
-        }
-        String name = cli.System.IO.Path.GetFileName(path);
-        if (name == null || name.length() == 0)
-        {
-            return null;
-        }
-        return new NetPath(fs, name);
-    }
-
-    public Path getParent()
-    {
-        if (path.length() == getRootLength())
-        {
-            return null;
-        }
-        String parent = cli.System.IO.Path.GetDirectoryName(path);
-        if (parent == null || parent.length() == 0)
-        {
-            return null;
-        }
-        return new NetPath(fs, parent);
-    }
-
-    public int getNameCount()
-    {
-        int len = getRootLength();
-        if (path.length() == len)
-        {
-            return len == 0 ? 1 : 0;
-        }
-        int count = 1;
-        for (int i = len; i < path.length(); i++)
-        {
-            if (path.charAt(i) == cli.System.IO.Path.DirectorySeparatorChar)
-            {
-                count++;
-            }
-        }
-        return count;
-    }
-
-    public Path getName(int index)
-    {
-        return new NetPath(fs, getNameImpl(index));
-    }
-
-    private String getNameImpl(int index)
-    {
-        for (int pos = getRootLength(); pos < path.length(); index--)
-        {
-            int next = path.indexOf(cli.System.IO.Path.DirectorySeparatorChar, pos);
-            if (index == 0)
-            {
-                return next == -1 ? path.substring(pos) : path.substring(pos, next);
-            }
-            if (next == -1)
-            {
-                break;
-            }
-            pos = next + 1;
-        }
-        if (path.length() == 0 && index == 0)
-        {
-            return "";
-        }
-        throw new IllegalArgumentException();
-    }
-
-    public Path subpath(int beginIndex, int endIndex)
-    {
-        StringBuilder sb = new StringBuilder();
-        for (int i = beginIndex; i < endIndex; i++)
-        {
-            if (i != beginIndex)
-            {
-                sb.append(cli.System.IO.Path.DirectorySeparatorChar);
-            }
-            sb.append(getNameImpl(i));
-        }
-        return new NetPath(fs, sb.toString());
-    }
-
-    public boolean startsWith(Path other)
-    {
-        String npath = NetPath.from(other).path;
-        if (npath.length() == 0)
-        {
-            return path.length() == 0;
-        }
-        return path.regionMatches(WINDOWS, 0, npath, 0, npath.length())
-            && (npath.length() == getRootLength()
-                || (npath.length() > getRootLength()
-                    && (path.length() == npath.length()
-                        || (path.length() > npath.length() && path.charAt(npath.length()) == cli.System.IO.Path.DirectorySeparatorChar))));
-    }
-
-    public boolean endsWith(Path other)
-    {
-        NetPath nother = NetPath.from(other);
-        String npath = nother.path;
-        if (npath.length() > path.length())
-        {
-            return false;
-        }
-        if (npath.length() == 0)
-        {
-            return path.length() == 0;
-        }
-        int nameCount = getNameCount();
-        int otherNameCount = nother.getNameCount();
-        if (otherNameCount > nameCount)
-        {
-            return false;
-        }
-        int otherRootLength = nother.getRootLength();
-        if (otherRootLength > 0)
-        {
-            if (otherNameCount != nameCount
-                || getRootLength() != otherRootLength
-                || !path.regionMatches(WINDOWS, 0, npath, 0, otherRootLength))
-            {
-                return false;
-            }
-        }
-        int skip = nameCount - otherNameCount;
-        for (int i = 0; i < otherNameCount; i++)
-        {
-            String s1 = getNameImpl(i + skip);
-            String s2 = nother.getNameImpl(i);
-            if (s1.length() != s2.length() || !s1.regionMatches(WINDOWS, 0, s2, 0, s1.length()))
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public Path normalize()
-    {
-        int rootLength = getRootLength();
-        ArrayList<String> list = new ArrayList<>();
-        for (int i = 0, count = getNameCount(); i < count; i++)
-        {
-            String s = getNameImpl(i);
-            if (s.equals(".."))
-            {
-                if (list.size() == 0)
-                {
-                    if (rootLength == 0 || (WINDOWS && rootLength == 2))
-                    {
-                        list.add("..");
-                    }
-                }
-                else if (list.get(list.size() - 1).equals(".."))
-                {
-                    list.add("..");
-                }
-                else
-                {
-                    list.remove(list.size() - 1);
-                }
-            }
-            else if (!s.equals("."))
-            {
-                list.add(s);
-            }
-        }
-        StringBuilder sb = new StringBuilder();
-        sb.append(path.substring(0, getRootLength()));
-        for (int i = 0; i < list.size(); i++)
-        {
-            if (i != 0)
-            {
-                sb.append(cli.System.IO.Path.DirectorySeparatorChar);
-            }
-            sb.append(list.get(i));
-        }
-        return new NetPath(fs, sb.toString());
-    }
-
-    public Path resolve(Path other)
-    {
-        NetPath nother = NetPath.from(other);
-        String npath = nother.path;
-        if (nother.isAbsolute())
-        {
-            return other;
-        }
-        if (npath.length() == 0)
-        {
-            return this;
-        }
-        if (WINDOWS)
-        {
-            if (nother.getRootLength() == 2 && getRootLength() == 3 && (path.charAt(0) | 0x20) == (npath.charAt(0) | 0x20))
-            {
-                // we're in the case where we have a root "x:\" and other "x:", so we have to chop off "x:" from other because
-                // otherwise Path.Combine will just return other
-                npath = npath.substring(2);
-            }
-            else if (nother.getRootLength() == 1 && getRootLength() > 3)
-            {
-                // we're in the case where we have a root "\\host\share\" and other "\",
-                // we have to manually handle this because Path.Combine doesn't do the right thing
-                return new NetPath(fs, path.substring(0, getRootLength()) + npath);
-            }
-        }
-        return new NetPath(fs, cli.System.IO.Path.Combine(path, npath));
-    }
-
-    public Path relativize(Path other)
-    {
-        NetPath nother = NetPath.from(other);
-        if (equals(nother))
-        {
-            return new NetPath(fs, "");
-        }
-        int rootLength = getRootLength();
-        if (nother.getRootLength() != rootLength || !path.regionMatches(true, 0, nother.path, 0, rootLength))
-        {
-            throw new IllegalArgumentException("'other' has different root");
-        }
-        int nameCount = getNameCount();
-        int otherNameCount = nother.getNameCount();
-        int count = Math.min(nameCount, otherNameCount);
-        int i = 0;
-        // skip the common parts
-        for (; i < count && getNameImpl(i).equals(nother.getNameImpl(i)); i++)
-        {
-        }
-        // remove the unused parts of our path
-        StringBuilder sb = new StringBuilder();
-        for (int j = i; j < nameCount; j++)
-        {
-            sb.append("..\\");
-        }
-        // append the new parts of other
-        for (int j = i; j < otherNameCount; j++)
-        {
-            if (j != i)
-            {
-                sb.append("\\");
-            }
-            sb.append(nother.getNameImpl(j));
-        }
-        return new NetPath(fs, sb.toString());
-    }
-
-    public URI toUri()
-    {
-        if (WINDOWS)
-        {
-            return WindowsUriSupport.toUri(this);
-        }
-        else
-        {
-            return UnixUriUtils.toUri(this);
-        }
-    }
-
-    public NetPath toAbsolutePath()
-    {
-        if (isAbsolute())
-        {
-            return this;
-        }
-        // System.getProperty("user.dir") will trigger the specified security check
-        return new NetPath(fs, cli.System.IO.Path.GetFullPath(cli.System.IO.Path.Combine(System.getProperty("user.dir"), path)));
-    }
-
-    public Path toRealPath(LinkOption... options) throws IOException
-    {
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null)
-        {
-            sm.checkRead(path);
-            if (!isAbsolute())
-            {
-                sm.checkPropertyAccess("user.dir");
-            }
-        }
-        return new NetPath(fs, toRealPathImpl(path));
-    }
-    
-    private static native String toRealPathImpl(String path);
-
-    public WatchKey register(WatchService watcher, WatchEvent.Kind<?>[] events, WatchEvent.Modifier... modifiers) throws IOException
-    {
-        if (!(watcher instanceof NetFileSystem.NetWatchService))
-        {
-            // null check
-            watcher.getClass();
-            throw new ProviderMismatchException();
-        }
-        boolean create = false;
-        boolean delete = false;
-        boolean modify = false;
-        boolean overflow = false;
-        boolean subtree = false;
-        for (WatchEvent.Kind<?> kind : events)
-        {
-            if (kind == StandardWatchEventKinds.ENTRY_CREATE)
-            {
-                create = true;
-            }
-            else if (kind == StandardWatchEventKinds.ENTRY_DELETE)
-            {
-                delete = true;
-            }
-            else if (kind == StandardWatchEventKinds.ENTRY_MODIFY)
-            {
-                modify = true;
-            }
-            else if (kind == StandardWatchEventKinds.OVERFLOW)
-            {
-                overflow = true;
-            }
-            else
-            {
-                // null check
-                kind.getClass();
-                throw new UnsupportedOperationException();
-            }
-        }
-        if (!create && !delete && !modify)
-        {
-            throw new IllegalArgumentException();
-        }
-        for (WatchEvent.Modifier modifier : modifiers)
-        {
-            if (modifier == ExtendedWatchEventModifier.FILE_TREE)
-            {
-                subtree = true;
-            }
-            else if (modifier instanceof SensitivityWatchEventModifier)
-            {
-                // ignore
-            }
-            else
-            {
-                // null check
-                modifier.getClass();
-                throw new UnsupportedOperationException();
-            }
-        }
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null)
-        {
-            sm.checkRead(path);
-            if (subtree)
-            {
-                sm.checkRead(path + cli.System.IO.Path.DirectorySeparatorChar + '-');
-            }
-        }
-        return ((NetFileSystem.NetWatchService)watcher).register(this, create, delete, modify, overflow, subtree);
-    }
-
-    public int compareTo(Path other)
-    {
-        String path2 = ((NetPath)other).path;
-        int len1 = path.length();
-        int len2 = path2.length();
-        int min = Math.min(len1, len2);
-        for (int i = 0; i < min; i++)
-        {
-            char c1 = path.charAt(i);
-            char c2 = path2.charAt(i);
-            if (c1 != c2 && Character.toUpperCase(c1) != Character.toUpperCase(c2))
-            {
-                return c1 - c2;
-            }
-        }
-        return len1 - len2;
-    }
-
-    public boolean equals(Object other)
-    {
-        if (!(other instanceof NetPath))
-        {
-            return false;
-        }
-        return compareTo((NetPath)other) == 0;
-    }
-
-    public int hashCode()
-    {
-        int hash = 0;
-        for (int i = 0; i < path.length(); i++)
-        {
-            hash = 97 * hash + Character.toUpperCase(path.charAt(i));
-        }
-        return hash;
-    }
-
-    public String toString()
-    {
-        return path;
-    }
-
-    boolean isUnc()
-    {
-        return WINDOWS && getRootLength() > 3;
-    }
-
-    static NetPath from(Path path)
-    {
-        if (!(path instanceof NetPath))
-        {
-            // null check
-            path.getClass();
-            throw new ProviderMismatchException();
-        }
-        return (NetPath)path;
-    }
-}
diff --git a/openjdk/sun/nio/fs/UnixUriUtils.java b/openjdk/sun/nio/fs/UnixUriUtils.java
deleted file mode 100644
index 0c1135fc..00000000
--- a/openjdk/sun/nio/fs/UnixUriUtils.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.nio.fs;
-
-import java.nio.file.Path;
-import java.io.File;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.file.Path;
-import java.util.Arrays;
-
-/**
- * Unix specific Path <--> URI conversion
- */
-
-class UnixUriUtils {
-    private UnixUriUtils() { }
-
-    /**
-     * Converts URI to Path
-     */
-    static Path fromUri(NetFileSystem fs, URI uri) {
-        if (!uri.isAbsolute())
-            throw new IllegalArgumentException("URI is not absolute");
-        if (uri.isOpaque())
-            throw new IllegalArgumentException("URI is not hierarchical");
-        String scheme = uri.getScheme();
-        if ((scheme == null) || !scheme.equalsIgnoreCase("file"))
-            throw new IllegalArgumentException("URI scheme is not \"file\"");
-        if (uri.getAuthority() != null)
-            throw new IllegalArgumentException("URI has an authority component");
-        if (uri.getFragment() != null)
-            throw new IllegalArgumentException("URI has a fragment component");
-        if (uri.getQuery() != null)
-            throw new IllegalArgumentException("URI has a query component");
-
-        // compatability with java.io.File
-        if (!uri.toString().startsWith("file:///"))
-            return new File(uri).toPath();
-
-        // transformation use raw path
-        String p = uri.getRawPath();
-        int len = p.length();
-        if (len == 0)
-            throw new IllegalArgumentException("URI path component is empty");
-
-        // transform escaped octets and unescaped characters to bytes
-        if (p.endsWith("/") && len > 1)
-            p = p.substring(0, len - 1);
-
-        return new NetPath(fs, p);
-    }
-
-    /**
-     * Converts Path to URI
-     */
-    static URI toUri(NetPath up) {
-        byte[] path = up.toAbsolutePath().toString().getBytes();
-        StringBuilder sb = new StringBuilder("file:///");
-        assert path[0] == '/';
-        for (int i=1; i<path.length; i++) {
-            char c = (char)(path[i] & 0xff);
-            if (match(c, L_PATH, H_PATH)) {
-                sb.append(c);
-            } else {
-               sb.append('%');
-               sb.append(hexDigits[(c >> 4) & 0x0f]);
-               sb.append(hexDigits[(c) & 0x0f]);
-            }
-        }
-
-        // trailing slash if directory
-        if (sb.charAt(sb.length()-1) != '/') {
-            try {
-                 if (cli.System.IO.Directory.Exists(up.path))
-                     sb.append('/');
-            } catch (Throwable x) {
-                // ignore
-            }
-        }
-
-        try {
-            return new URI(sb.toString());
-        } catch (URISyntaxException x) {
-            throw new AssertionError(x);  // should not happen
-        }
-    }
-
-    // The following is copied from java.net.URI
-
-    // Compute the low-order mask for the characters in the given string
-    private static long lowMask(String chars) {
-        int n = chars.length();
-        long m = 0;
-        for (int i = 0; i < n; i++) {
-            char c = chars.charAt(i);
-            if (c < 64)
-                m |= (1L << c);
-        }
-        return m;
-    }
-
-    // Compute the high-order mask for the characters in the given string
-    private static long highMask(String chars) {
-        int n = chars.length();
-        long m = 0;
-        for (int i = 0; i < n; i++) {
-            char c = chars.charAt(i);
-            if ((c >= 64) && (c < 128))
-                m |= (1L << (c - 64));
-        }
-        return m;
-    }
-
-    // Compute a low-order mask for the characters
-    // between first and last, inclusive
-    private static long lowMask(char first, char last) {
-        long m = 0;
-        int f = Math.max(Math.min(first, 63), 0);
-        int l = Math.max(Math.min(last, 63), 0);
-        for (int i = f; i <= l; i++)
-            m |= 1L << i;
-        return m;
-    }
-
-    // Compute a high-order mask for the characters
-    // between first and last, inclusive
-    private static long highMask(char first, char last) {
-        long m = 0;
-        int f = Math.max(Math.min(first, 127), 64) - 64;
-        int l = Math.max(Math.min(last, 127), 64) - 64;
-        for (int i = f; i <= l; i++)
-            m |= 1L << i;
-        return m;
-    }
-
-    // Tell whether the given character is permitted by the given mask pair
-    private static boolean match(char c, long lowMask, long highMask) {
-        if (c < 64)
-            return ((1L << c) & lowMask) != 0;
-        if (c < 128)
-            return ((1L << (c - 64)) & highMask) != 0;
-        return false;
-    }
-
-    // decode
-    private static int decode(char c) {
-        if ((c >= '0') && (c <= '9'))
-            return c - '0';
-        if ((c >= 'a') && (c <= 'f'))
-            return c - 'a' + 10;
-        if ((c >= 'A') && (c <= 'F'))
-            return c - 'A' + 10;
-        throw new AssertionError();
-    }
-
-    // digit    = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" |
-    //            "8" | "9"
-    private static final long L_DIGIT = lowMask('0', '9');
-    private static final long H_DIGIT = 0L;
-
-    // upalpha  = "A" | "B" | "C" | "D" | "E" | "F" | "G" | "H" | "I" |
-    //            "J" | "K" | "L" | "M" | "N" | "O" | "P" | "Q" | "R" |
-    //            "S" | "T" | "U" | "V" | "W" | "X" | "Y" | "Z"
-    private static final long L_UPALPHA = 0L;
-    private static final long H_UPALPHA = highMask('A', 'Z');
-
-    // lowalpha = "a" | "b" | "c" | "d" | "e" | "f" | "g" | "h" | "i" |
-    //            "j" | "k" | "l" | "m" | "n" | "o" | "p" | "q" | "r" |
-    //            "s" | "t" | "u" | "v" | "w" | "x" | "y" | "z"
-    private static final long L_LOWALPHA = 0L;
-    private static final long H_LOWALPHA = highMask('a', 'z');
-
-    // alpha         = lowalpha | upalpha
-    private static final long L_ALPHA = L_LOWALPHA | L_UPALPHA;
-    private static final long H_ALPHA = H_LOWALPHA | H_UPALPHA;
-
-    // alphanum      = alpha | digit
-    private static final long L_ALPHANUM = L_DIGIT | L_ALPHA;
-    private static final long H_ALPHANUM = H_DIGIT | H_ALPHA;
-
-    // mark          = "-" | "_" | "." | "!" | "~" | "*" | "'" |
-    //                 "(" | ")"
-    private static final long L_MARK = lowMask("-_.!~*'()");
-    private static final long H_MARK = highMask("-_.!~*'()");
-
-    // unreserved    = alphanum | mark
-    private static final long L_UNRESERVED = L_ALPHANUM | L_MARK;
-    private static final long H_UNRESERVED = H_ALPHANUM | H_MARK;
-
-    // pchar         = unreserved | escaped |
-    //                 ":" | "@" | "&" | "=" | "+" | "$" | ","
-    private static final long L_PCHAR
-        = L_UNRESERVED | lowMask(":@&=+$,");
-    private static final long H_PCHAR
-        = H_UNRESERVED | highMask(":@&=+$,");
-
-   // All valid path characters
-   private static final long L_PATH = L_PCHAR | lowMask(";/");
-   private static final long H_PATH = H_PCHAR | highMask(";/");
-
-   private final static char[] hexDigits = {
-        '0', '1', '2', '3', '4', '5', '6', '7',
-        '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
-    };
-}
diff --git a/openjdk/sun/nio/fs/WindowsUriSupport.java b/openjdk/sun/nio/fs/WindowsUriSupport.java
deleted file mode 100644
index 0301bf90..00000000
--- a/openjdk/sun/nio/fs/WindowsUriSupport.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.nio.fs;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-/**
- * Utility methods to convert between Path and URIs.
- */
-
-class WindowsUriSupport {
-    private WindowsUriSupport() {
-    }
-
-    // suffix for IPv6 literal address
-    private static final String IPV6_LITERAL_SUFFIX = ".ipv6-literal.net";
-
-    /**
-     * Returns URI to represent the given (absolute) path
-     */
-    private static URI toUri(String path, boolean isUnc, boolean addSlash) {
-        String uriHost;
-        String uriPath;
-
-        if (isUnc) {
-            int slash = path.indexOf('\\', 2);
-            uriHost = path.substring(2, slash);
-            uriPath = path.substring(slash).replace('\\', '/');
-
-            // handle IPv6 literal addresses
-            // 1. drop .ivp6-literal.net
-            // 2. replace "-" with ":"
-            // 3. replace "s" with "%" (zone/scopeID delimiter)
-            if (uriHost.endsWith(IPV6_LITERAL_SUFFIX)) {
-                uriHost = uriHost
-                    .substring(0, uriHost.length() - IPV6_LITERAL_SUFFIX.length())
-                    .replace('-', ':')
-                    .replace('s', '%');
-            }
-        } else {
-            uriHost = "";
-            uriPath = "/" + path.replace('\\', '/');
-        }
-
-        // append slash if known to be directory
-        if (addSlash)
-            uriPath += "/";
-
-        // return file:///C:/My%20Documents or file://server/share/foo
-        try {
-            return new URI("file", uriHost, uriPath, null);
-        } catch (URISyntaxException x) {
-            if (!isUnc)
-                throw new AssertionError(x);
-        }
-
-        // if we get here it means we've got a UNC with reserved characters
-        // in the server name. The authority component cannot contain escaped
-        // octets so fallback to encoding the server name into the URI path
-        // component.
-        uriPath = "//" + path.replace('\\', '/');
-        if (addSlash)
-            uriPath += "/";
-        try {
-            return new URI("file", null, uriPath, null);
-        } catch (URISyntaxException x) {
-            throw new AssertionError(x);
-        }
-    }
-
-    /**
-     * Converts given Path to a URI
-     */
-    static URI toUri(NetPath path) {
-        path = path.toAbsolutePath();
-        String s = path.toString();
-
-        // trailing slash will be added if file is a directory. Skip check if
-        // already have trailing space
-        boolean addSlash = false;
-        if (!s.endsWith("\\")) {
-            try {
-                 addSlash = cli.System.IO.Directory.Exists(s);
-            } catch (Throwable x) {
-            }
-        }
-
-        return toUri(s, path.isUnc(), addSlash);
-    }
-
-    /**
-     * Converts given URI to a Path
-     */
-    static NetPath fromUri(NetFileSystem fs, URI uri) {
-        if (!uri.isAbsolute())
-            throw new IllegalArgumentException("URI is not absolute");
-        if (uri.isOpaque())
-            throw new IllegalArgumentException("URI is not hierarchical");
-        String scheme = uri.getScheme();
-        if ((scheme == null) || !scheme.equalsIgnoreCase("file"))
-            throw new IllegalArgumentException("URI scheme is not \"file\"");
-        if (uri.getFragment() != null)
-            throw new IllegalArgumentException("URI has a fragment component");
-        if (uri.getQuery() != null)
-            throw new IllegalArgumentException("URI has a query component");
-        String path = uri.getPath();
-        if (path.equals(""))
-            throw new IllegalArgumentException("URI path component is empty");
-
-        // UNC
-        String auth = uri.getAuthority();
-        if (auth != null && !auth.equals("")) {
-            String host = uri.getHost();
-            if (host == null)
-                throw new IllegalArgumentException("URI authority component has undefined host");
-            if (uri.getUserInfo() != null)
-                throw new IllegalArgumentException("URI authority component has user-info");
-            if (uri.getPort() != -1)
-                throw new IllegalArgumentException("URI authority component has port number");
-
-            // IPv6 literal
-            // 1. drop enclosing brackets
-            // 2. replace ":" with "-"
-            // 3. replace "%" with "s" (zone/scopeID delimiter)
-            // 4. Append .ivp6-literal.net
-            if (host.startsWith("[")) {
-                host = host.substring(1, host.length()-1)
-                           .replace(':', '-')
-                           .replace('%', 's');
-                host += IPV6_LITERAL_SUFFIX;
-            }
-
-            // reconstitute the UNC
-            path = "\\\\" + host + path;
-        } else {
-            if ((path.length() > 2) && (path.charAt(2) == ':')) {
-                // "/c:/foo" --> "c:/foo"
-                path = path.substring(1);
-            }
-        }
-        return new NetPath(fs, path);
-    }
-}
diff --git a/openjdk/sun/print/PrintPeer.java b/openjdk/sun/print/PrintPeer.java
deleted file mode 100644
index 892d591d..00000000
--- a/openjdk/sun/print/PrintPeer.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-  Copyright (C) 2009 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.print;
-
-import java.awt.Graphics2D;
-
-
-
-/**
- * A helper interface for implementing the print API for IKVM
- */
-public interface PrintPeer{
-
-    public Object getPrinterStatus(String PrinterName, Class category);
-
-    public String getDefaultPrinterName();
-
-    public String[] getAllPrinterNames();
-    
-    public Graphics2D createGraphics(cli.System.Drawing.Graphics g);
-}
diff --git a/openjdk/sun/print/UnixPrintServiceLookup.java b/openjdk/sun/print/UnixPrintServiceLookup.java
deleted file mode 100644
index 8c18f4e6..00000000
--- a/openjdk/sun/print/UnixPrintServiceLookup.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-  Copyright (C) 2009 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-package sun.print;
-
-
-
-/**
- * Currently this class is called via Reflection.
- */
-public class UnixPrintServiceLookup extends Win32PrintServiceLookup{
-
-}
diff --git a/openjdk/sun/print/Win32PrintJob.java b/openjdk/sun/print/Win32PrintJob.java
deleted file mode 100644
index 654f742b..00000000
--- a/openjdk/sun/print/Win32PrintJob.java
+++ /dev/null
@@ -1,1119 +0,0 @@
-/*
-  Copyright (C) 2009, 2012 Volker Berlin (i-net software)
-  Copyright (C) 2010, 2011 Karsten Heinrich (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.print;
-
-import java.awt.Color;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.geom.AffineTransform;
-import java.awt.image.BufferedImage;
-import java.awt.print.PageFormat;
-import java.awt.print.Pageable;
-import java.awt.print.Paper;
-import java.awt.print.Printable;
-import java.awt.print.PrinterException;
-import java.awt.print.PrinterJob;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.TreeSet;
-
-import javax.print.CancelablePrintJob;
-import javax.print.Doc;
-import javax.print.DocFlavor;
-import javax.print.PrintException;
-import javax.print.PrintService;
-import javax.print.attribute.Attribute;
-import javax.print.attribute.AttributeSetUtilities;
-import javax.print.attribute.DocAttributeSet;
-import javax.print.attribute.HashPrintJobAttributeSet;
-import javax.print.attribute.HashPrintRequestAttributeSet;
-import javax.print.attribute.PrintJobAttribute;
-import javax.print.attribute.PrintJobAttributeSet;
-import javax.print.attribute.PrintRequestAttribute;
-import javax.print.attribute.PrintRequestAttributeSet;
-import javax.print.attribute.standard.Chromaticity;
-import javax.print.attribute.standard.Copies;
-import javax.print.attribute.standard.Destination;
-import javax.print.attribute.standard.DocumentName;
-import javax.print.attribute.standard.Fidelity;
-import javax.print.attribute.standard.JobName;
-import javax.print.attribute.standard.JobOriginatingUserName;
-import javax.print.attribute.standard.Media;
-import javax.print.attribute.standard.MediaPrintableArea;
-import javax.print.attribute.standard.MediaSize;
-import javax.print.attribute.standard.MediaSizeName;
-import javax.print.attribute.standard.MediaTray;
-import javax.print.attribute.standard.OrientationRequested;
-import javax.print.attribute.standard.PageRanges;
-import javax.print.attribute.standard.PrinterIsAcceptingJobs;
-import javax.print.attribute.standard.PrinterState;
-import javax.print.attribute.standard.PrinterStateReason;
-import javax.print.attribute.standard.PrinterStateReasons;
-import javax.print.attribute.standard.RequestingUserName;
-import javax.print.attribute.standard.SheetCollate;
-import javax.print.event.PrintJobAttributeListener;
-import javax.print.event.PrintJobEvent;
-import javax.print.event.PrintJobListener;
-
-import sun.awt.windows.WPrinterJob;
-import sun.print.Win32PrintService.NetMediaTray;
-
-import cli.System.Drawing.Printing.*;
-
-/**
- * @author Volker Berlin
- */
-public class Win32PrintJob implements CancelablePrintJob{
-
-    private ArrayList<PrintJobListener> jobListeners;
-
-    private ArrayList<PrintJobAttributeListener> attrListeners;
-
-    private ArrayList<PrintJobAttributeSet> listenedAttributeSets;
-
-    private final Win32PrintService service;
-
-    
-    private boolean printing;
-    private boolean printReturned;
-
-    private PrintRequestAttributeSet reqAttrSet;
-
-    private PrintJobAttributeSet jobAttrSet;
-
-    private PrinterJob job = new WPrinterJob();
-    private Doc doc;
-    private String mDestination;
-
-    /* these variables used globally to store reference to the print
-     * data retrieved as a stream. On completion these are always closed
-     * if non-null.
-     */
-    private InputStream instream;
-
-    /* default values overridden by those extracted from the attributes */
-    private boolean fidelity;
-    private boolean printColor;
-    private String jobName = "Java Printing";
-    private int copies;
-    private MediaSizeName mediaName;
-    private MediaSize     mediaSize;
-    private OrientationRequested orient;
-    
-    private final PrintPeer peer;
-    private PrinterException printerException;
-
-	private PageNumberConverter pageRanges;
-
-	private MediaTray mediaTray;
-
-    
-    Win32PrintJob(Win32PrintService service, PrintPeer peer){
-        this.service = service;
-        this.peer = peer;
-    }
-
-
-    @Override
-    public PrintService getPrintService(){
-        return service;
-    }
-
-
-    @Override
-    public PrintJobAttributeSet getAttributes(){
-        synchronized(this){
-            if(jobAttrSet == null){
-                /* just return an empty set until the job is submitted */
-                PrintJobAttributeSet jobSet = new HashPrintJobAttributeSet();
-                return AttributeSetUtilities.unmodifiableView(jobSet);
-            }else{
-                return jobAttrSet;
-            }
-        }
-    }
-
-
-    @Override
-    public void addPrintJobListener(PrintJobListener listener){
-        synchronized(this){
-            if(listener == null){
-                return;
-            }
-            if(jobListeners == null){
-                jobListeners = new ArrayList<PrintJobListener>();
-            }
-            jobListeners.add(listener);
-        }
-    }
-
-
-    @Override
-    public void removePrintJobListener(PrintJobListener listener){
-        synchronized(this){
-            if(listener == null || jobListeners == null){
-                return;
-            }
-            jobListeners.remove(listener);
-            if(jobListeners.isEmpty()){
-                jobListeners = null;
-            }
-        }
-    }
-
-
-    /* Closes any stream already retrieved for the data.
-     * We want to avoid unnecessarily asking the Doc to create a stream only
-     * to get a reference in order to close it because the job failed.
-     * If the representation class is itself a "stream", this
-     * closes that stream too.
-     */
-    private void closeDataStreams() {
-        // TODO
-    }
-
-    private void notifyEvent(int reason) {
-
-        /* since this method should always get called, here's where
-         * we will perform the clean up of any data stream supplied.
-         */
-        switch (reason) {
-            case PrintJobEvent.DATA_TRANSFER_COMPLETE:
-            case PrintJobEvent.JOB_CANCELED :
-            case PrintJobEvent.JOB_FAILED :
-            case PrintJobEvent.NO_MORE_EVENTS :
-            case PrintJobEvent.JOB_COMPLETE :
-                closeDataStreams();
-        }
-
-        synchronized (this) {
-            if (jobListeners != null) {
-                PrintJobListener listener;
-                PrintJobEvent event = new PrintJobEvent(this, reason);
-                for (int i = 0; i < jobListeners.size(); i++) {
-                    listener = jobListeners.get(i);
-                    switch (reason) {
-
-                        case PrintJobEvent.JOB_COMPLETE :
-                            listener.printJobCompleted(event);
-                            break;
-
-                        case PrintJobEvent.JOB_CANCELED :
-                            listener.printJobCanceled(event);
-                            break;
-
-                        case PrintJobEvent.JOB_FAILED :
-                            listener.printJobFailed(event);
-                            break;
-
-                        case PrintJobEvent.DATA_TRANSFER_COMPLETE :
-                            listener.printDataTransferCompleted(event);
-                            break;
-
-                        case PrintJobEvent.NO_MORE_EVENTS :
-                            listener.printJobNoMoreEvents(event);
-                            break;
-
-                        default:
-                            break;
-                    }
-                }
-            }
-       }
-    }
-
-    @Override
-    public void addPrintJobAttributeListener(PrintJobAttributeListener listener, PrintJobAttributeSet attributes){
-        synchronized(this){
-            if(listener == null){
-                return;
-            }
-            if(attrListeners == null){
-                attrListeners = new ArrayList<PrintJobAttributeListener>();
-                listenedAttributeSets = new ArrayList<PrintJobAttributeSet>();
-            }
-            attrListeners.add(listener);
-            if(attributes == null){
-                attributes = new HashPrintJobAttributeSet();
-            }
-            listenedAttributeSets.add(attributes);
-        }
-    }
-
-
-    @Override
-    public void removePrintJobAttributeListener(PrintJobAttributeListener listener){
-        synchronized(this){
-            if(listener == null || attrListeners == null){
-                return;
-            }
-            int index = attrListeners.indexOf(listener);
-            if(index == -1){
-                return;
-            }else{
-                attrListeners.remove(index);
-                listenedAttributeSets.remove(index);
-                if(attrListeners.isEmpty()){
-                    attrListeners = null;
-                    listenedAttributeSets = null;
-                }
-            }
-        }
-    }
-
-
-    @Override
-    public void print(Doc doc, PrintRequestAttributeSet attributes) throws PrintException{
-
-        synchronized(this){
-            if(printing){
-                throw new PrintException("already printing");
-            }else{
-                printing = true;
-            }
-        }
-
-        PrinterState prnState = (PrinterState)service.getAttribute(PrinterState.class);
-        if(prnState == PrinterState.STOPPED){
-            PrinterStateReasons prnStateReasons = (PrinterStateReasons)service.getAttribute(PrinterStateReasons.class);
-            if((prnStateReasons != null) && (prnStateReasons.containsKey(PrinterStateReason.SHUTDOWN))){
-                throw new PrintException("PrintService is no longer available.");
-            }
-        }
-
-        if((PrinterIsAcceptingJobs)(service.getAttribute(PrinterIsAcceptingJobs.class)) == PrinterIsAcceptingJobs.NOT_ACCEPTING_JOBS){
-            throw new PrintException("Printer is not accepting job.");
-        }
-
-        this.doc = doc;
-        /* check if the parameters are valid before doing much processing */
-        DocFlavor flavor = doc.getDocFlavor();
-        Object data;
-
-        try{
-            data = doc.getPrintData();
-        }catch(IOException e){
-            notifyEvent(PrintJobEvent.JOB_FAILED);
-            throw new PrintException("can't get print data: " + e.toString());
-        }
-
-        if(flavor == null || (!service.isDocFlavorSupported(flavor))){
-            notifyEvent(PrintJobEvent.JOB_FAILED);
-            throw new PrintJobFlavorException("invalid flavor", flavor);
-        }
-
-        initializeAttributeSets(doc, attributes);
-
-        getAttributeValues(flavor);
-
-        String repClassName = flavor.getRepresentationClassName();
-
-        if(flavor.equals(DocFlavor.INPUT_STREAM.GIF) || flavor.equals(DocFlavor.INPUT_STREAM.JPEG)
-                || flavor.equals(DocFlavor.INPUT_STREAM.PNG) || flavor.equals(DocFlavor.BYTE_ARRAY.GIF)
-                || flavor.equals(DocFlavor.BYTE_ARRAY.JPEG) || flavor.equals(DocFlavor.BYTE_ARRAY.PNG)){
-            try{
-                instream = doc.getStreamForBytes();
-                if(instream == null){
-                    notifyEvent(PrintJobEvent.JOB_FAILED);
-                    throw new PrintException("No stream for data");
-                }
-                printableJob(new ImagePrinter(instream));
-                service.wakeNotifier();
-                return;
-            }catch(ClassCastException cce){
-                notifyEvent(PrintJobEvent.JOB_FAILED);
-                throw new PrintException(cce);
-            }catch(IOException ioe){
-                notifyEvent(PrintJobEvent.JOB_FAILED);
-                throw new PrintException(ioe);
-            }
-        }else if(flavor.equals(DocFlavor.URL.GIF) || flavor.equals(DocFlavor.URL.JPEG)
-                || flavor.equals(DocFlavor.URL.PNG)){
-            try{
-                printableJob(new ImagePrinter((URL)data));
-                service.wakeNotifier();
-                return;
-            }catch(ClassCastException cce){
-                notifyEvent(PrintJobEvent.JOB_FAILED);
-                throw new PrintException(cce);
-            }
-        }else if(repClassName.equals("java.awt.print.Pageable")){
-            try{
-                pageableJob((Pageable)doc.getPrintData());
-                service.wakeNotifier();
-                return;
-            }catch(ClassCastException cce){
-                notifyEvent(PrintJobEvent.JOB_FAILED);
-                throw new PrintException(cce);
-            }catch(IOException ioe){
-                notifyEvent(PrintJobEvent.JOB_FAILED);
-                throw new PrintException(ioe);
-            }
-        }else if(repClassName.equals("java.awt.print.Printable")){
-            try{
-                printableJob((Printable)doc.getPrintData());
-                service.wakeNotifier();
-                return;
-            }catch(ClassCastException cce){
-                notifyEvent(PrintJobEvent.JOB_FAILED);
-                throw new PrintException(cce);
-            }catch(IOException ioe){
-                notifyEvent(PrintJobEvent.JOB_FAILED);
-                throw new PrintException(ioe);
-            }
-        }else if(repClassName.equals("[B") || repClassName.equals("java.io.InputStream")
-                || repClassName.equals("java.net.URL")){
-
-            if(repClassName.equals("java.net.URL")){
-                URL url = (URL)data;
-                try{
-                    instream = url.openStream();
-                }catch(IOException e){
-                    notifyEvent(PrintJobEvent.JOB_FAILED);
-                    throw new PrintException(e.toString());
-                }
-            }else{
-                try{
-                    instream = doc.getStreamForBytes();
-                }catch(IOException ioe){
-                    notifyEvent(PrintJobEvent.JOB_FAILED);
-                    throw new PrintException(ioe.toString());
-                }
-            }
-
-            if(instream == null){
-                notifyEvent(PrintJobEvent.JOB_FAILED);
-                throw new PrintException("No stream for data");
-            }
-
-            if(mDestination != null){ // if destination attribute is set
-                try{
-                    FileOutputStream fos = new FileOutputStream(mDestination);
-                    byte[] buffer = new byte[1024];
-                    int cread;
-
-                    while((cread = instream.read(buffer, 0, buffer.length)) >= 0){
-                        fos.write(buffer, 0, cread);
-                    }
-                    fos.flush();
-                    fos.close();
-                }catch(FileNotFoundException fnfe){
-                    notifyEvent(PrintJobEvent.JOB_FAILED);
-                    throw new PrintException(fnfe.toString());
-                }catch(IOException ioe){
-                    notifyEvent(PrintJobEvent.JOB_FAILED);
-                    throw new PrintException(ioe.toString());
-                }
-                notifyEvent(PrintJobEvent.DATA_TRANSFER_COMPLETE);
-                notifyEvent(PrintJobEvent.JOB_COMPLETE);
-                service.wakeNotifier();
-                return;
-            }
-
-            notifyEvent(PrintJobEvent.JOB_FAILED);
-            throw new PrintException("Print job failed. IKVM does not support raw data currently.");
-        }else{
-            notifyEvent(PrintJobEvent.JOB_FAILED);
-            throw new PrintException("unrecognized class: " + repClassName);
-        }
-    }
-    
-    
-    public void printableJob(Printable printable) throws PrintException {
-        throw new PrintException("Win32PrintJob.printableJob() not implemented:");
-    }
-
-    public void pageableJob(Pageable pageable) throws PrintException {
-    	// a general hint for this code here: The PrintJob implementation (WPrinterJob) in the Oracle
-    	// JRE implements SunPrinterJobService - which we don't here. Unfortunately this is used as a hint
-    	// to distinguish between the build-in printer service and custom printer services. So for the RasterPrinterJob
-    	// this implementation of the Win32PrintJob is a custom print job! That's why several methods of
-    	// RasterPrintJob(which only apply to the SunPrinterJobService otherwise) had to be moved here.
-    	// This includes the attribute resolving and the media patch for instance.
-        try {
-            PrintDocument printDocument = createPrintDocument( );
-            pageable = patchMedia( pageable );
-    
-            printDocument.add_QueryPageSettings(new QueryPageSettingsEventHandler(new QueryPage( pageable, printColor, mediaTray ) ) );
-            printDocument.add_PrintPage(new PrintPageEventHandler(new PrintPage(pageable)));
-            printDocument.Print();
-            if(printerException != null){
-                throw printerException;
-            }
-            //TODO throw exception on Cancel
-            notifyEvent(PrintJobEvent.DATA_TRANSFER_COMPLETE);
-            return;
-        } catch (PrinterException pe) {
-            notifyEvent(PrintJobEvent.JOB_FAILED);
-            throw new PrintException(pe);
-        } finally {
-            printReturned = true;
-            notifyEvent(PrintJobEvent.NO_MORE_EVENTS);
-        }
-    }
-    
-    
-    private PrintDocument createPrintDocument() throws PrintException{
-        PrintDocument printDocument = new PrintDocument();
-        PrinterSettings settings = printDocument.get_PrinterSettings();
-        settings.set_PrinterName( service.getName() );
-        if( !settings.get_IsValid() ){
-        	throw new PrintException("Printer name ''" + service.getName() + "' is invalid.");
-        }
-        
-        if( jobName != null ){
-        	printDocument.set_DocumentName( jobName );
-        }
-        printDocument.get_DefaultPageSettings().set_Color(printColor);
-        
-        Attribute destination = reqAttrSet.get(Destination.class);
-        if(destination instanceof Destination){
-        	File destFile = new File(((Destination)destination).getURI());
-            settings.set_PrintFileName(destFile.getAbsolutePath());
-            settings.set_PrintToFile(true);
-        }
-        
-        settings.set_Copies((short)copies);
-        boolean collated = false;
-        if(copies > 1){
-            Object collate = reqAttrSet.get(SheetCollate.class);
-            if( collate == null ){
-            	collate = service.getDefaultAttributeValue(SheetCollate.class);
-            }
-            collated = collate == SheetCollate.COLLATED;
-            settings.set_Collate( collated );
-        }
-        Attribute pageRangeObj = reqAttrSet.get(PageRanges.class);
-        if( pageRangeObj != null ){
-        	int[][] ranges = ((PageRanges)pageRangeObj).getMembers();
-        	if( ranges.length > 1 ){
-    			settings.set_PrintRange( PrintRange.wrap( PrintRange.Selection ) );
-        	} else {
-        		if( ranges.length > 0 ){
-        			settings.set_FromPage(ranges[0][0]);
-        			settings.set_ToPage(ranges[0][1]);
-        			settings.set_PrintRange( PrintRange.wrap( PrintRange.SomePages ) );
-        		} // else allPages???
-        	}
-        } else {
-        	settings.set_PrintRange( PrintRange.wrap( PrintRange.AllPages ) );
-        }
-        pageRanges = new PageNumberConverter( (PageRanges)pageRangeObj, copies, collated );
-        return printDocument;
-    }
-    
-    // copied from RasterPrintJob 
-    // Since we don't implement SunPrinterJobService the hack in RasterPrintService which applies
-    // the media format to the auto-generated OpenBook doesn't work here. So we have to modify
-    // the page format of the OpenBook here - equal to the code in RasterPrintJob
-    private Pageable patchMedia( Pageable pageable ){
-    	/* OpenBook is used internally only when app uses Printable.
-         * This is the case when we use the values from the attribute set.
-         */
-        Media media = (Media)reqAttrSet.get(Media.class);
-        OrientationRequested orientReq = (OrientationRequested)reqAttrSet.get(OrientationRequested.class);
-        MediaPrintableArea mpa = (MediaPrintableArea)reqAttrSet.get(MediaPrintableArea.class);
-
-        if ((orientReq != null || media != null || mpa != null) && pageable instanceof OpenBook) {
-
-            /* We could almost(!) use PrinterJob.getPageFormat() except
-             * here we need to start with the PageFormat from the OpenBook :
-             */
-            Printable printable = pageable.getPrintable(0);
-            PageFormat pf = (PageFormat)pageable.getPageFormat(0).clone();
-            Paper paper = pf.getPaper();
-
-            /* If there's a media but no media printable area, we can try
-             * to retrieve the default value for mpa and use that.
-             */
-            if (mpa == null && media != null && service.isAttributeCategorySupported(MediaPrintableArea.class)) {
-                Object mpaVals = service. getSupportedAttributeValues(MediaPrintableArea.class, null, reqAttrSet);
-                if (mpaVals instanceof MediaPrintableArea[] && ((MediaPrintableArea[])mpaVals).length > 0) {
-                    mpa = ((MediaPrintableArea[])mpaVals)[0];
-                }
-            }
-
-            if (isSupportedValue(orientReq, reqAttrSet) || (!fidelity && orientReq != null)) {
-                int orient;
-                if (orientReq.equals(OrientationRequested.REVERSE_LANDSCAPE)) {
-                    orient = PageFormat.REVERSE_LANDSCAPE;
-                } else if (orientReq.equals(OrientationRequested.LANDSCAPE)) {
-                    orient = PageFormat.LANDSCAPE;
-                } else {
-                    orient = PageFormat.PORTRAIT;
-                }
-                pf.setOrientation(orient);
-            }
-
-            if (isSupportedValue(media, reqAttrSet) || (!fidelity && media != null)) {
-                if (media instanceof MediaSizeName) {
-                    MediaSizeName msn = (MediaSizeName)media;
-                    MediaSize msz = MediaSize.getMediaSizeForName(msn);
-                    if (msz != null) {
-                        float paperWid =  msz.getX(MediaSize.INCH) * 72.0f;
-                        float paperHgt =  msz.getY(MediaSize.INCH) * 72.0f;
-                        paper.setSize(paperWid, paperHgt);
-                        if (mpa == null) {
-                            paper.setImageableArea(72.0, 72.0, paperWid-144.0, paperHgt-144.0);
-                        }
-                    }
-                }
-            }
-
-            if (isSupportedValue(mpa, reqAttrSet) || (!fidelity && mpa != null)) {
-                float [] printableArea = mpa.getPrintableArea(MediaPrintableArea.INCH);
-                for (int i=0; i < printableArea.length; i++) {
-                    printableArea[i] = printableArea[i]*72.0f;
-                }
-                paper.setImageableArea(printableArea[0], printableArea[1], printableArea[2], printableArea[3]);
-            }
-
-            pf.setPaper(paper);
-            pf = validatePage(pf);
-            return new OpenBook(pf, printable);
-        }
-        return pageable;
-    }
-    
-    // copied from RasterPrintJob to since we don't implement SunPrinterJobService
-    /**
-     * The passed in PageFormat is cloned and altered to be usable on
-     * the PrinterJob's current printer.
-     */
-    private PageFormat validatePage(PageFormat page) {
-        PageFormat newPage = (PageFormat)page.clone();
-        Paper newPaper = new Paper();
-        validatePaper(newPage.getPaper(), newPaper);
-        newPage.setPaper(newPaper);
-
-        return newPage;
-    }
-    
-    // copied from RasterPrintJob to since we don't implement SunPrinterJobService
-    /**
-     * updates a Paper object to reflect the current printer's selected
-     * paper size and imageable area for that paper size.
-     * Default implementation copies settings from the original, applies
-     * applies some validity checks, changes them only if they are
-     * clearly unreasonable, then sets them into the new Paper.
-     * Subclasses are expected to override this method to make more
-     * informed decisons.
-     */
-    protected void validatePaper(Paper origPaper, Paper newPaper) {
-        if (origPaper == null || newPaper == null) {
-            return;
-        } else {
-            double wid = origPaper.getWidth();
-            double hgt = origPaper.getHeight();
-            double ix = origPaper.getImageableX();
-            double iy = origPaper.getImageableY();
-            double iw = origPaper.getImageableWidth();
-            double ih = origPaper.getImageableHeight();
-
-            /* Assume any +ve values are legal. Overall paper dimensions
-             * take precedence. Make sure imageable area fits on the paper.
-             */
-            Paper defaultPaper = new Paper();
-            wid = ((wid > 0.0) ? wid : defaultPaper.getWidth());
-            hgt = ((hgt > 0.0) ? hgt : defaultPaper.getHeight());
-            ix = ((ix > 0.0) ? ix : defaultPaper.getImageableX());
-            iy = ((iy > 0.0) ? iy : defaultPaper.getImageableY());
-            iw = ((iw > 0.0) ? iw : defaultPaper.getImageableWidth());
-            ih = ((ih > 0.0) ? ih : defaultPaper.getImageableHeight());
-            /* full width/height is not likely to be imageable, but since we
-             * don't know the limits we have to allow it
-             */
-            if (iw > wid) {
-                iw = wid;
-            }
-            if (ih > hgt) {
-                ih = hgt;
-            }
-            if ((ix + iw) > wid) {
-                ix = wid - iw;
-            }
-            if ((iy + ih) > hgt) {
-                iy = hgt - ih;
-            }
-            newPaper.setSize(wid, hgt);
-            newPaper.setImageableArea(ix, iy, iw, ih);
-        }
-    }
-    
-    // copied from RasterPrintJob
-    /**
-     * Checks whether a certain attribute value is valid for the current print service
-     * @param attrval the attribute value 
-     * @param attrset Set of printing attributes for a supposed job (both job-level attributes and document-level attributes), or null.
-     * @return true if valid
-     */
-    protected boolean isSupportedValue(Attribute attrval, PrintRequestAttributeSet attrset) {
-    	return (attrval != null && service != null && service.isAttributeValueSupported(attrval, DocFlavor.SERVICE_FORMATTED.PAGEABLE, attrset));
-    }
-    
-
-    /*
-     * There's some inefficiency here as the job set is created even though it may never be requested.
-     */
-    private synchronized void initializeAttributeSets(Doc doc, PrintRequestAttributeSet reqSet){
-
-        reqAttrSet = new HashPrintRequestAttributeSet();
-        jobAttrSet = new HashPrintJobAttributeSet();
-
-        Attribute[] attrs;
-        if(reqSet != null){
-            reqAttrSet.addAll(reqSet);
-            attrs = reqSet.toArray();
-            for(int i = 0; i < attrs.length; i++){
-                if(attrs[i] instanceof PrintJobAttribute){
-                    jobAttrSet.add(attrs[i]);
-                }
-            }
-        }
-
-        DocAttributeSet docSet = doc.getAttributes();
-        if(docSet != null){
-            attrs = docSet.toArray();
-            for(int i = 0; i < attrs.length; i++){
-                if(attrs[i] instanceof PrintRequestAttribute){
-                    reqAttrSet.add(attrs[i]);
-                }
-                if(attrs[i] instanceof PrintJobAttribute){
-                    jobAttrSet.add(attrs[i]);
-                }
-            }
-        }
-
-        /* add the user name to the job */
-        String userName = "";
-        try{
-            userName = System.getProperty("user.name");
-        }catch(SecurityException se){
-        }
-
-        if(userName == null || userName.equals("")){
-            RequestingUserName ruName = (RequestingUserName)reqSet.get(RequestingUserName.class);
-            if(ruName != null){
-                jobAttrSet.add(new JobOriginatingUserName(ruName.getValue(), ruName.getLocale()));
-            }else{
-                jobAttrSet.add(new JobOriginatingUserName("", null));
-            }
-        }else{
-            jobAttrSet.add(new JobOriginatingUserName(userName, null));
-        }
-
-        /*
-         * if no job name supplied use doc name (if supplied), if none and its a URL use that, else finally anything ..
-         */
-        if(jobAttrSet.get(JobName.class) == null){
-            JobName jobName;
-            if(docSet != null && docSet.get(DocumentName.class) != null){
-                DocumentName docName = (DocumentName)docSet.get(DocumentName.class);
-                jobName = new JobName(docName.getValue(), docName.getLocale());
-                jobAttrSet.add(jobName);
-            }else{
-                String str = "JPS Job:" + doc;
-                try{
-                    Object printData = doc.getPrintData();
-                    if(printData instanceof URL){
-                        str = ((URL)(doc.getPrintData())).toString();
-                    }
-                }catch(IOException e){
-                }
-                jobName = new JobName(str, null);
-                jobAttrSet.add(jobName);
-            }
-        }
-
-        jobAttrSet = AttributeSetUtilities.unmodifiableView(jobAttrSet);
-    }
-
-    private void getAttributeValues(DocFlavor flavor) throws PrintException {
-
-        if (reqAttrSet.get(Fidelity.class) == Fidelity.FIDELITY_TRUE) {
-            fidelity = true;
-        } else {
-            fidelity = false;
-        }
-        
-        Attribute chroma = reqAttrSet.get( Chromaticity.class );
-        // TODO check whether supported by the print service
-        printColor = chroma == Chromaticity.COLOR;
-
-        Attribute newTray = reqAttrSet.get( Media.class );
-        if( newTray instanceof MediaTray ){
-        	mediaTray = (MediaTray)newTray;
-        }
-        // TODO check whether supported by the print service
-        
-        Class category;
-        Attribute [] attrs = reqAttrSet.toArray();
-        for (int i=0; i<attrs.length; i++) {
-            Attribute attr = attrs[i];
-            category = attr.getCategory();
-            if (fidelity == true) {
-                if (!service.isAttributeCategorySupported(category)) {
-                    notifyEvent(PrintJobEvent.JOB_FAILED);
-                    throw new PrintJobAttributeException(
-                        "unsupported category: " + category, category, null);
-                } else if
-                    (!service.isAttributeValueSupported(attr, flavor, null)) {
-                    notifyEvent(PrintJobEvent.JOB_FAILED);
-                    throw new PrintJobAttributeException(
-                        "unsupported attribute: " + attr, null, attr);
-                }
-            }
-            if (category == Destination.class) {
-              URI uri = ((Destination)attr).getURI();
-              if (!"file".equals(uri.getScheme())) {
-                notifyEvent(PrintJobEvent.JOB_FAILED);
-                throw new PrintException("Not a file: URI");
-              } else {
-                try {
-                  mDestination = (new File(uri)).getPath();
-                } catch (Exception e) {
-                  throw new PrintException(e);
-                }
-                // check write access
-                SecurityManager security = System.getSecurityManager();
-                if (security != null) {
-                  try {
-                    security.checkWrite(mDestination);
-                  } catch (SecurityException se) {
-                    notifyEvent(PrintJobEvent.JOB_FAILED);
-                    throw new PrintException(se);
-                  }
-                }
-              }
-            } else if (category == JobName.class) {
-                jobName = ((JobName)attr).getValue();
-            } else if (category == Copies.class) {
-                copies = ((Copies)attr).getValue();
-            } else if (category == Media.class) {
-              if (attr instanceof MediaSizeName) {
-                    mediaName = (MediaSizeName)attr;
-                    // If requested MediaSizeName is not supported,
-                    // get the corresponding media size - this will
-                    // be used to create a new PageFormat.
-                    if (!service.isAttributeValueSupported(attr, flavor, null)) {
-                        mediaSize = MediaSize.getMediaSizeForName(mediaName);
-                    }
-                }
-            } else if (category == OrientationRequested.class) {
-                orient = (OrientationRequested)attr;
-            }
-        }
-    }
-
-
-    @Override
-    public void cancel() throws PrintException{
-        synchronized(this){
-            if(!printing){
-                throw new PrintException("Job is not yet submitted.");
-            }else if(job != null && !printReturned){
-                job.cancel();
-                notifyEvent(PrintJobEvent.JOB_CANCELED);
-                return;
-            }else{
-                throw new PrintException("Job could not be cancelled.");
-            }
-        }
-    }
-    
-    /**
-     * Converts the Java 1/72 inch to .NET 1/100 inch
-     * @param javaLength the java length in 1/72 inch
-     * @return the .NET length in 1/100 inch
-     */
-    private static int java2netLength( int javaLength ){
-    	return (int) Math.round( (double)(javaLength * 100) / 72d );
-    }
-    
-    /**
-     * Converts the Java 1/72 inch to .NET 1/100 inch
-     * @param javaLength the java length in 1/72 inch
-     * @return the .NET length in 1/100 inch
-     */
-    private static int java2netLength( double javaLength ){
-    	return (int) Math.round( (javaLength * 100) / 72d );
-    }
-
-    
-    private class PrintPage implements PrintPageEventHandler.Method{
-
-        private final Pageable pageable;
-        private int pageIndex;
-
-
-        PrintPage(Pageable pageable){
-            this.pageable = pageable;
-        }
-
-
-        @Override
-        public void Invoke(Object paramObject, PrintPageEventArgs ev){
-
-            try{
-            	int realPage = pageRanges.getPageForIndex(pageIndex);
-            	
-                Printable printable = pageable.getPrintable(realPage);
-                PageFormat pageFormat = pageable.getPageFormat(realPage);
-
-                
-                BufferedImage pBand = new BufferedImage(1, 1, BufferedImage.TYPE_3BYTE_BGR);
-                Graphics2D imageGraphics = pBand.createGraphics();
-                ((RasterPrinterJob)job).setGraphicsConfigInfo(imageGraphics.getTransform(), pageFormat.getImageableWidth(), pageFormat.getImageableHeight());
-				PeekGraphics peekGraphics = new PeekGraphics(imageGraphics, job );
-
-                /* 
-                 * Because Sun is calling first with a PeekGraphics that we do it else for compatibility
-                 */
-                if(realPage == 0){
-                    int pageResult = printable.print(peekGraphics, pageFormat, realPage);
-                    if(pageResult != Printable.PAGE_EXISTS){
-                        ev.set_HasMorePages(false);
-                        ev.set_Cancel(true);
-                        return;
-                    }
-                }
-                Graphics2D printGraphics = peer.createGraphics(ev.get_Graphics());
-            	Graphics2D g2d = ((Graphics2D)printGraphics);
-            	int tX = (int) pageFormat.getWidth(); 
-            	int tY = (int) pageFormat.getHeight();
-            	// apply Java to .NET scaling (1/72 inch to 1/100 inch)
-            	g2d.scale(100d/72d, 100d/72d);
-            	// NOTE on Landscape printing:
-            	// Setting landscape to true on the printer settings
-            	// of a page already rotates the page! The orig. java code rotates the page itself,
-            	// for .NET this is not required.
-            	if( orient == OrientationRequested.REVERSE_LANDSCAPE){
-            		g2d.translate( tX, tY );
-            		g2d.rotate( Math.PI );
-            	}
-
-                printable.print(printGraphics, pageFormat, realPage);
-                
-                realPage = pageRanges.getPageForIndex(++pageIndex);
-                if( realPage >= 0 ){
-	                printable = pageable.getPrintable(realPage);
-	                pageFormat = pageable.getPageFormat(realPage);
-	                int pageResult = printable.print(peekGraphics, pageFormat, realPage);
-                	ev.set_HasMorePages( pageResult == Printable.PAGE_EXISTS );
-                } else {
-                	ev.set_HasMorePages( false );
-                }
-            }catch(PrinterException ex){
-                printerException = ex;
-                ex.printStackTrace();
-                ev.set_HasMorePages(false);
-            }
-
-        }
-
-    }
-    
-    private class QueryPage implements QueryPageSettingsEventHandler.Method{
-
-    	private final Pageable pageable;
-        private int pageIndex;
-		private final boolean printColor;
-		private final MediaTray tray;
-
-
-        QueryPage(Pageable pageable, boolean printColor, MediaTray tray  ){
-            this.printColor = printColor;
-			this.pageable = pageable;
-			this.tray = tray;
-        }
-        
-		@Override
-		public void Invoke(Object source, QueryPageSettingsEventArgs e) {
-			int realPage = pageRanges.getPageForIndex(pageIndex);
-			// apply page settings to the current page
-			PageFormat format = pageable.getPageFormat(realPage);
-			PageSettings pageSettings = e.get_PageSettings();
-			pageSettings.set_Color( printColor );
-			PaperSource paperSource = service.getPaperSourceForTray( tray );
-			if( paperSource != null ){
-				pageSettings.set_PaperSource( paperSource );
-			}
-			
-			PaperSize ps = new PaperSize();
-			ps.set_Height( java2netLength( format.getHeight() ) );
-			ps.set_Width( java2netLength( format.getWidth() ) );
-			pageSettings.set_PaperSize( ps );
-			
-			Margins margins = new Margins();
-			margins.set_Left( java2netLength( format.getImageableX() ) );
-			margins.set_Top( java2netLength( format.getImageableY() ) );
-			margins.set_Right( java2netLength(format.getWidth() - format.getImageableX() - format.getImageableWidth() ) );
-			margins.set_Bottom( java2netLength(format.getHeight() - format.getImageableY() - format.getImageableHeight() ) );			
-			pageSettings.set_Margins( margins );			
-			pageIndex++;
-		}
-    }
-
-    /**
-     * Determines which logical page to print for a certain physical page 
-     */
-    public static class PageNumberConverter{        
-        
-        private List<Range> ranges;
-        private int totalPages = -1;
-        private final int copies;
-        
-        public PageNumberConverter( PageRanges pages, int copies, boolean collated ) {
-            // NOTE: uncollated is handled by the printer driver! If we would handle that here, 
-            // we would get copies^2 copies! 
-            this.copies = collated ? copies : 1;
-            if( pages != null && pages.getMembers() != null && pages.getMembers().length > 0 ){
-                TreeSet<Range> rangesSort = new TreeSet<Range>();
-                OUTER:
-                for( int[] range : pages.getMembers() ){
-                    Range r = new Range( range[0], range[1] + 1 ); // +1 to inlucde the uppre end
-                    for( Range recent : rangesSort ){
-                        if( recent.canMerge(r) ){
-                            recent.merge(r);
-                            continue OUTER;
-                        }
-                    }
-                    rangesSort.add( r );
-                }
-                // finally merge
-                Range recent = null;
-                ranges = new ArrayList<Range>();
-                for( Range r : rangesSort ){
-                    if( recent != null && recent.canMerge( r ) ){
-                        recent.merge( r );
-                    } else {
-                        ranges.add( r );
-                        recent = r;
-                    }
-                }
-                // calculate total pages, required for collated copies
-                totalPages = 0;
-                for( Range r : rangesSort ){
-                    int diff = r.end - r.start;
-                    totalPages += diff;
-                }
-            }
-        }
-        
-        /**
-         * Must be called in case the printable returns no-more-pages. Will return whether the print job 
-         * will continue due to pending copies
-         * @param index the current page index
-         * @return if false, the print job will continue with copies, if true terminate the job
-         */
-        public boolean checkJobComplete( int index ){
-            if( ranges != null ){
-                return true;
-            }
-            if( totalPages < 0 ){
-                // this is the first time, this was called for 'all-pages' so it's the total number
-                totalPages = index;
-            }
-            return index > copies * totalPages;
-        }
-        
-        /**
-         * Returns which page to be printed for a certain page index
-         * @param index the inex to be printed
-         * @return the page number or -1, if there is no page for this index
-         */
-        public int getPageForIndex( int index ){
-            if( index < 0 || ( totalPages >=0 && index >= copies * totalPages ) ){
-                return -1;
-            }
-            if( ranges == null ){
-                return totalPages >=0 ? index % totalPages : index;
-            }
-            int counter = 0;
-            if( copies > 1 ){
-                counter += (index / totalPages) * totalPages;
-            }
-            for( Range r : ranges ){
-                int upper = counter + (r.end - r.start);
-                if( index < upper ){
-                    // so we're in the correct range
-                    return r.start + ( index - counter ) - 1;
-                } else {
-                    counter = upper;
-                }
-            }
-            return -1;
-        }
-        
-        /**
-         * A singular page range
-         */
-        private static class Range implements Comparable<Range> {
-
-            public int start;
-            public int end;
-            
-            public Range(int start, int end) {
-                this.start = start;
-                this.end = end;
-            }
-            
-            /**
-             * Checks whether the ranges intersect of have no gap in between
-             * @param otherRange the range to be checked
-             * @return true, if the ranges can be merged
-             */
-            public boolean canMerge( Range otherRange ){
-                if( otherRange.end >= start && otherRange.end <= end ){
-                    return true;
-                }
-                if( otherRange.start >= start && otherRange.start <= end ){
-                    return true;
-                }
-                return false;
-            }
-            
-            /**
-             * Merges the other range into this range. Ignores the gap between the ranges if there is any
-             * @param otherRange the range to be merged
-             */
-            public void merge( Range otherRange ){
-                start = Math.min(start, otherRange.start);
-                end = Math.max(end, otherRange.end);
-            }
-            
-            public int compareTo(Range o) {             
-                return start - o.start;
-            }
-        }
-    }
-}
diff --git a/openjdk/sun/print/Win32PrintService.java b/openjdk/sun/print/Win32PrintService.java
deleted file mode 100644
index 134c7a94..00000000
--- a/openjdk/sun/print/Win32PrintService.java
+++ /dev/null
@@ -1,920 +0,0 @@
-/*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
- * Copyright (C) 2009, 2012 Volker Berlin (i-net software)
- * Copyright (C) 2010, 2011 Karsten Heinrich (i-net software)
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.print;
-
-import java.io.File;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.print.DocFlavor;
-import javax.print.DocPrintJob;
-import javax.print.PrintService;
-import javax.print.ServiceUIFactory;
-import javax.print.attribute.Attribute;
-import javax.print.attribute.AttributeSet;
-import javax.print.attribute.AttributeSetUtilities;
-import javax.print.attribute.HashPrintServiceAttributeSet;
-import javax.print.attribute.PrintServiceAttribute;
-import javax.print.attribute.PrintServiceAttributeSet;
-import javax.print.attribute.standard.Chromaticity;
-import javax.print.attribute.standard.ColorSupported;
-import javax.print.attribute.standard.Copies;
-import javax.print.attribute.standard.CopiesSupported;
-import javax.print.attribute.standard.Destination;
-import javax.print.attribute.standard.Fidelity;
-import javax.print.attribute.standard.JobName;
-import javax.print.attribute.standard.Media;
-import javax.print.attribute.standard.MediaPrintableArea;
-import javax.print.attribute.standard.MediaSize;
-import javax.print.attribute.standard.MediaSizeName;
-import javax.print.attribute.standard.MediaTray;
-import javax.print.attribute.standard.OrientationRequested;
-import javax.print.attribute.standard.PageRanges;
-import javax.print.attribute.standard.PrintQuality;
-import javax.print.attribute.standard.PrinterIsAcceptingJobs;
-import javax.print.attribute.standard.PrinterName;
-import javax.print.attribute.standard.PrinterResolution;
-import javax.print.attribute.standard.PrinterState;
-import javax.print.attribute.standard.PrinterStateReasons;
-import javax.print.attribute.standard.QueuedJobCount;
-import javax.print.attribute.standard.RequestingUserName;
-import javax.print.attribute.standard.SheetCollate;
-import javax.print.attribute.standard.Sides;
-import javax.print.event.PrintServiceAttributeListener;
-
-import cli.System.NewsStyleUriParser;
-import cli.System.Type;
-import cli.System.Collections.IEnumerator;
-import cli.System.Drawing.RectangleF;
-import cli.System.Drawing.Printing.Duplex;
-import cli.System.Drawing.Printing.PaperKind;
-import cli.System.Drawing.Printing.PaperSize;
-import cli.System.Drawing.Printing.PaperSource;
-import cli.System.Drawing.Printing.PrintDocument;
-import cli.System.Drawing.Printing.PrinterSettings;
-import cli.System.Drawing.Printing.PrinterSettings.PaperSizeCollection;
-import cli.System.Drawing.Printing.PrinterSettings.PaperSourceCollection;
-import cli.System.Drawing.Printing.PrinterSettings.PrinterResolutionCollection;
-import cli.System.Net.Mime.MediaTypeNames;
-
-/**
- * @author Volker Berlin
- */
-public class Win32PrintService implements PrintService {
-	// note: the Win32PrintService is implemented as foreign service (doesn't implement SunPrinterJobService)
-	// to avoid implementing the WPrinterJob
-
-    private static final DocFlavor[] supportedFlavors = {
-        DocFlavor.SERVICE_FORMATTED.PAGEABLE,
-        DocFlavor.SERVICE_FORMATTED.PRINTABLE,
-    };
-    
-    /** Mapping for PageSize.RawKind to predefined MediaSizeName */ 
-    private static final MediaSizeName[] MEDIA_NAMES = new MediaSizeName[70];
-    
-    private static final Hashtable<String, MediaSizeName> CUSTOM_MEDIA_NAME = new Hashtable<>();
-    
-    /*  it turns out to be inconvenient to store the other categories
-     *  separately because many attributes are in multiple categories.
-     */
-    private static Class[] otherAttrCats = {
-        JobName.class,
-        RequestingUserName.class,
-        Copies.class,
-        Destination.class,
-        OrientationRequested.class,
-        PageRanges.class,
-        Media.class,
-        MediaPrintableArea.class,
-        Fidelity.class,
-        // We support collation on 2D printer jobs, even if the driver can't.
-        SheetCollate.class,
-        SunAlternateMedia.class,
-        Chromaticity.class
-    };
-
-    // conversion from 1/100 Inch (.NET) to um (Java)
-    private static final int INCH100_TO_MYM = 254;
-    private static final int  MATCH_DIFF = 500; // 0.5 mm
-    
-    static {
-    	MEDIA_NAMES[0] = MediaSizeName.NA_LETTER;
-    	MEDIA_NAMES[1] =  MediaSizeName.NA_LETTER ;
-    	MEDIA_NAMES[2] =  MediaSizeName.TABLOID ;
-    	MEDIA_NAMES[3] =  MediaSizeName.LEDGER ;
-    	MEDIA_NAMES[4] =  MediaSizeName.NA_LEGAL ;
-    	MEDIA_NAMES[5] =  MediaSizeName.INVOICE ; // Statement
-    	MEDIA_NAMES[6] =  MediaSizeName.EXECUTIVE ;
-    	MEDIA_NAMES[7] =  MediaSizeName.ISO_A3 ;
-    	MEDIA_NAMES[8] =  MediaSizeName.ISO_A4 ;
-    	MEDIA_NAMES[9] =  MediaSizeName.ISO_A4 ; // A4Small, 10
-    	MEDIA_NAMES[10] =  MediaSizeName.ISO_A5 ;
-    	MEDIA_NAMES[11] =  MediaSizeName.JIS_B4 ;
-    	MEDIA_NAMES[12] =  MediaSizeName.JIS_B5 ;
-    	MEDIA_NAMES[13] =  MediaSizeName.FOLIO ;
-    	MEDIA_NAMES[14] =  MediaSizeName.QUARTO ;
-    	MEDIA_NAMES[15] =  MediaSizeName.NA_10X14_ENVELOPE ;
-    	MEDIA_NAMES[16] =  MediaSizeName.B ; // 10x17 Envelope
-    	MEDIA_NAMES[17] =  MediaSizeName.NA_LETTER ; // Note
-    	MEDIA_NAMES[18] =  MediaSizeName.NA_NUMBER_9_ENVELOPE ;
-    	MEDIA_NAMES[19] =  MediaSizeName.NA_NUMBER_10_ENVELOPE ; // 20
-    	MEDIA_NAMES[20] =  MediaSizeName.NA_NUMBER_11_ENVELOPE ;
-    	MEDIA_NAMES[21] =  MediaSizeName.NA_NUMBER_12_ENVELOPE ;
-    	MEDIA_NAMES[22] =  MediaSizeName.NA_NUMBER_14_ENVELOPE ;
-    	MEDIA_NAMES[23] =  MediaSizeName.C ;
-    	MEDIA_NAMES[24] =  MediaSizeName.D ;
-    	MEDIA_NAMES[25] =  MediaSizeName.E ;
-    	MEDIA_NAMES[26] =  MediaSizeName.ISO_DESIGNATED_LONG ;
-    	MEDIA_NAMES[27] =  MediaSizeName.ISO_C5 ;
-    	MEDIA_NAMES[28] =  MediaSizeName.ISO_C3 ;
-    	MEDIA_NAMES[29] =  MediaSizeName.ISO_C4 ; // 30
-    	MEDIA_NAMES[30] =  MediaSizeName.ISO_C6 ;
-    	MEDIA_NAMES[31] =  MediaSizeName.ITALY_ENVELOPE ;
-    	MEDIA_NAMES[32] =  MediaSizeName.ISO_B4 ;
-    	MEDIA_NAMES[33] =  MediaSizeName.ISO_B5 ;
-    	MEDIA_NAMES[34] =  MediaSizeName.ISO_B6 ;
-    	MEDIA_NAMES[35] =  MediaSizeName.ITALY_ENVELOPE ;
-    	MEDIA_NAMES[36] =  MediaSizeName.MONARCH_ENVELOPE ;
-    	MEDIA_NAMES[37] =  MediaSizeName.PERSONAL_ENVELOPE ;
-    	MEDIA_NAMES[38] =  MediaSizeName.NA_10X15_ENVELOPE ; // USStandardFanfold
-    	MEDIA_NAMES[39] =  MediaSizeName.NA_9X12_ENVELOPE ; // GermanStandardFanfold, 40
-    	MEDIA_NAMES[40] =  MediaSizeName.FOLIO ; // GermanLegalFanfold
-    	MEDIA_NAMES[41] =  MediaSizeName.ISO_B4 ;
-    	MEDIA_NAMES[42] =  MediaSizeName.JAPANESE_POSTCARD ;
-    	MEDIA_NAMES[43] =  MediaSizeName.NA_9X11_ENVELOPE ;
-    	
-    	MEDIA_NAMES[65] =  MediaSizeName.ISO_A2 ;
-    	
-    	MEDIA_NAMES[69] =  MediaSizeName.ISO_A6 ;
-
-//    	// augment the media size with the .NET default sizes available on the printer 
-//    	PrinterSettings ps = new PrinterSettings();
-//    	IEnumerator printers = PrinterSettings.get_InstalledPrinters().GetEnumerator();
-//    	printers.Reset();
-//    	while( printers.MoveNext() ){
-//    		ps.set_PrinterName( (String) printers.get_Current() );
-//    		IEnumerator sizes = ps.get_PaperSizes().GetEnumerator();
-//    		sizes.Reset();
-//    		while( sizes.MoveNext() ){
-//    			PaperSize size = (PaperSize) sizes.get_Current();
-//    			int kind = size.get_RawKind();
-//				if( kind >= 0  && kind < MEDIA_NAMES.length && MEDIA_NAMES[kind] == null ){
-//					MEDIA_NAMES[kind] = new CustomMediaSizeName( size.get_PaperName() );					
-//					int x = size.get_Width();
-//					int y = size.get_Height();
-//					if( x > y ){ // not allowed by MediaSize
-//						int tmp = x;
-//						x = y;
-//						y = tmp;
-//					}
-//					new MediaSize(x, y, INCH100_TO_MYM, MEDIA_NAMES[kind]); // cache entry in map
-//    			}
-//    		}
-//    	}
-    }
-    
-    private final PrintPeer peer;
-    
-    private final String printer;
-    private final PrinterSettings settings;
-    private PrinterName name;
-
-    private MediaTray[] mediaTrays;
-    
-    transient private ServiceNotifier notifier = null;
-
-    public Win32PrintService(String name, PrintPeer peer){
-        if(name == null){
-            throw new IllegalArgumentException("null printer name");
-        }
-        this.peer = peer;
-        printer = name;
-        settings = new PrintDocument().get_PrinterSettings();
-        settings.set_PrinterName(printer);
-    }
-
-
-    @Override
-    public String getName(){
-        return printer;
-    }
-
-
-    private PrinterName getPrinterName(){
-        if(name == null){
-            name = new PrinterName(printer, null);
-        }
-        return name;
-    }
-
-
-    public void wakeNotifier() {
-        synchronized (this) {
-            if (notifier != null) {
-                notifier.wake();
-            }
-        }
-    }
-    
-
-    @Override
-    public void addPrintServiceAttributeListener(PrintServiceAttributeListener listener){
-        synchronized (this) {
-            if (listener == null) {
-                return;
-            }
-            if (notifier == null) {
-                notifier = new ServiceNotifier(this);
-            }
-            notifier.addListener(listener);
-        }
-    }
-
-
-    @Override
-    public void removePrintServiceAttributeListener(PrintServiceAttributeListener listener){
-        synchronized (this) {
-            if (listener == null || notifier == null ) {
-                return;
-            }
-            notifier.removeListener(listener);
-            if (notifier.isEmpty()) {
-                notifier.stopNotifier();
-                notifier = null;
-            }
-        }
-    }
-
-
-    @Override
-    public DocPrintJob createPrintJob(){
-        SecurityManager security = System.getSecurityManager();
-        if(security != null){
-            security.checkPrintJobAccess();
-        }
-        return new Win32PrintJob(this, peer);
-    }
-
-
-    @Override
-    public <T extends PrintServiceAttribute>T getAttribute(Class<T> category){
-        if(category == null){
-            throw new NullPointerException("category");
-        }
-        if(!(PrintServiceAttribute.class.isAssignableFrom(category))){
-            throw new IllegalArgumentException("The categhory '" + category + "' is not a valid PrintServiceAttribute");
-        }
-        if(category == ColorSupported.class){
-        	// works better than settings.get_SupportsColor();
-            if(settings.get_DefaultPageSettings().get_Color()){
-                return (T)ColorSupported.SUPPORTED;
-            }else{
-                return (T)ColorSupported.NOT_SUPPORTED;
-            }
-        }else if(category == PrinterName.class){
-            return (T)getPrinterName();
-        } else {
-            // QueuedJobCount and PrinterIsAcceptingJobs
-            return (T)peer.getPrinterStatus(printer, category);
-        }
-    }
-
-
-    @Override
-    public PrintServiceAttributeSet getAttributes(){
-        PrintServiceAttributeSet attrs = new HashPrintServiceAttributeSet();
-        attrs.add(getPrinterName());
-        PrinterIsAcceptingJobs acptJobs = getAttribute(PrinterIsAcceptingJobs.class);
-        if(acptJobs != null){
-            attrs.add(acptJobs);
-        }
-        PrinterState prnState = getAttribute(PrinterState.class);
-        if(prnState != null){
-            attrs.add(prnState);
-        }
-        PrinterStateReasons prnStateReasons = getAttribute(PrinterStateReasons.class);
-        if(prnStateReasons != null){
-            attrs.add(prnStateReasons);
-        }
-        QueuedJobCount jobCount = getAttribute(QueuedJobCount.class);
-        if(jobCount != null){
-            attrs.add(jobCount);
-        }
-        // TODO: Seems to be more accurate than settings.get_SupportsColor(), which doesn't work for CutePDF
-        if(settings.get_DefaultPageSettings().get_Color()){
-            attrs.add(ColorSupported.SUPPORTED);
-        }else{
-            attrs.add(ColorSupported.NOT_SUPPORTED);
-        }
-
-        return AttributeSetUtilities.unmodifiableView(attrs);
-    }
-
-
-    @Override
-    public Object getDefaultAttributeValue(Class<? extends Attribute> category){
-    	if (category == null) {
-    		throw new NullPointerException("category must not be null");
-    	}
-    	if ( !Attribute.class.isAssignableFrom( category ) ) { 
-    		throw new IllegalArgumentException( category +" has to be an " + Attribute.class.getName() );
-    	}
-    	if ( !isAttributeCategorySupported( category ) ) {
-    		return null;
-    	}
-    	if (category == Copies.class) {
-    		short copies = settings.get_Copies();
-    		return new Copies( copies > 0 ? copies : 1 );
-    	} else if (category == Chromaticity.class) {
-    		// NOTE: this works for CutePDF, settings.get_SupportsColor() does not
-    		return settings.get_DefaultPageSettings().get_Color() ? Chromaticity.COLOR : Chromaticity.MONOCHROME;
-    	} else if (category == JobName.class) {
-    		return new JobName( "Java Printing", null ); // TODO this is Java-Default, use another one for IKVM?
-    	} else if (category == OrientationRequested.class) {
-    		return settings.get_DefaultPageSettings().get_Landscape() ? OrientationRequested.LANDSCAPE : OrientationRequested.PORTRAIT; 
-    	} else if (category == PageRanges.class) {
-    		return new PageRanges(1, Integer.MAX_VALUE );
-    	} else if (category == Media.class) {
-            int rawKind = settings.get_DefaultPageSettings().get_PaperSize().get_RawKind();
-    		if( rawKind > MEDIA_NAMES.length || rawKind < 1 || MEDIA_NAMES[ rawKind - 1 ] == null ){ // custom page format
-    			return findMatchingMedia( settings.get_DefaultPageSettings().get_PaperSize() );
-    		} else {
-    			return MEDIA_NAMES[ rawKind - 1 ];
-    		}
-    	} else if (category == MediaPrintableArea.class) {
-    		RectangleF area = settings.get_DefaultPageSettings().get_PrintableArea();
-    		// get_PrintableArea is in 1/100 inch, see http://msdn.microsoft.com/de-de/library/system.drawing.printing.pagesettings.printablearea(v=VS.90).aspx
-    		return new MediaPrintableArea(area.get_X()/100, area.get_Y()/100, area.get_Width()/100, area.get_Height()/100, MediaPrintableArea.INCH);
-    	} else if (category == Destination.class) {
-    		String path = "out.prn";
-    		try {
-    			return new Destination( ( new File( path ) ).toURI() );
-    		} catch (SecurityException se) {
-    			try {
-    				return new Destination( new URI( "file:" + path) );
-    			} catch (URISyntaxException e) {
-    				return null;
-    			}
-    		}
-    	} else if (category == Sides.class) {
-    		switch( settings.get_Duplex().Value ){
-    			case cli.System.Drawing.Printing.Duplex.Default: // MSDN: 'The printer's default duplex setting.' - what ever that might be
-    			case cli.System.Drawing.Printing.Duplex.Simplex:
-    				return Sides.ONE_SIDED;
-    			case cli.System.Drawing.Printing.Duplex.Horizontal:
-    				return Sides.TWO_SIDED_LONG_EDGE;
-    			case cli.System.Drawing.Printing.Duplex.Vertical:
-    				return Sides.TWO_SIDED_SHORT_EDGE;
-    		}
-    	} else if (category == PrinterResolution.class) {
-    		cli.System.Drawing.Printing.PrinterResolution pRes = settings.get_DefaultPageSettings().get_PrinterResolution();
-    		int xRes = pRes.get_X();
-    		int yRes = pRes.get_Y();
-            if ((xRes <= 0) || (yRes <= 0)) {
-                int res = (yRes > xRes) ? yRes : xRes;
-                if (res > 0) {
-                 return new PrinterResolution(res, res, PrinterResolution.DPI);
-                }
-            }
-            else {
-               return new PrinterResolution(xRes, yRes, PrinterResolution.DPI);
-            }
-    	} else if (category == ColorSupported.class) {
-    		if ( settings.get_SupportsColor() ) {
-    			return ColorSupported.SUPPORTED;
-    		} else {
-    			return ColorSupported.NOT_SUPPORTED;
-    		}
-    	} else if( category == PrintQuality.class ){
-			cli.System.Drawing.Printing.PrinterResolutionKind kind = settings.get_DefaultPageSettings().get_PrinterResolution().get_Kind();
-			switch (kind.Value) {
-			case cli.System.Drawing.Printing.PrinterResolutionKind.High:
-				return PrintQuality.HIGH;
-			case cli.System.Drawing.Printing.PrinterResolutionKind.Medium:
-			case cli.System.Drawing.Printing.PrinterResolutionKind.Low:
-				return PrintQuality.NORMAL;
-			case cli.System.Drawing.Printing.PrinterResolutionKind.Draft:
-				return PrintQuality.DRAFT;
-			}
-    	} else if (category == RequestingUserName.class) {
-    		try{
-    			return new RequestingUserName( System.getProperty("user.name", ""), null);
-    		} catch( SecurityException e ){
-    			return new RequestingUserName( "", null);
-    		}
-    	} else if (category == SheetCollate.class){
-    		return settings.get_Collate() ? SheetCollate.COLLATED : SheetCollate.UNCOLLATED;
-    	} else if (category == Fidelity.class) {
-    		return Fidelity.FIDELITY_FALSE;
-    	}
-        return null;
-    }
-
-
-    @Override
-    public ServiceUIFactory getServiceUIFactory(){
-        return null;
-    }
-
-
-    @Override
-    public Class<?>[] getSupportedAttributeCategories(){
-        ArrayList<Class> categList = new ArrayList<Class>(otherAttrCats.length+3);
-        for (int i=0; i < otherAttrCats.length; i++) {
-            categList.add(otherAttrCats[i]);
-        }
-
-        if (settings.get_CanDuplex()) {
-            categList.add(Sides.class);
-        }
-
-        if (settings.get_PrinterResolutions().get_Count() > 0) {
-            categList.add(PrinterResolution.class);
-        }
-
-        return categList.toArray(new Class[categList.size()]);
-    }
-
-
-    @Override
-    public Object getSupportedAttributeValues(Class<? extends Attribute> category, DocFlavor flavor, AttributeSet attributes){
-    	if ( category == null || !Attribute.class.isAssignableFrom( category ) ) { 
-    		throw new IllegalArgumentException( "The category '" + category + "' is not an Attribute" );
-    	}
-        if( !isAttributeCategorySupported(category) ){
-        	return null;
-        }
-        if (category == JobName.class || category == RequestingUserName.class || category == ColorSupported.class 
-        		|| category == Destination.class ) {
-        	return getDefaultAttributeValue(category);
-        }
-        if( category == Copies.class ){
-        	return new CopiesSupported(1, settings.get_MaximumCopies() );
-        }
-        if( category == Media.class ){
-        	PaperSizeCollection sizes = settings.get_PaperSizes();
-        	List<Media> medias = new ArrayList<Media>();
-        	for( int i = 0; i < sizes.get_Count(); i++ ){
-        		PaperSize media = sizes.get_Item(i);				
-        		MediaSizeName mediaName = findMatchingMedia( sizes.get_Item(i) );
-    			if( mediaName != null 
-    					&& !medias.contains( mediaName )){ // slow but better than creating a HashSet here
-    				medias.add( mediaName);
-        		}
-        	}
-        	// add media trays
-        	MediaTray[] trays = getMediaTrays();
-        	for( MediaTray tray : trays ){
-        		medias.add( tray );
-        	}
-        	return medias.size() > 0 ? medias.toArray( new Media[medias.size() ] ) : null;
-        }
-        if (category == PageRanges.class) {
-        	if (flavor == null|| flavor.equals(DocFlavor.SERVICE_FORMATTED.PAGEABLE)
-        			|| flavor.equals(DocFlavor.SERVICE_FORMATTED.PRINTABLE)) {
-        		PageRanges[] arr = new PageRanges[1];
-        		arr[0] = new PageRanges(1, Integer.MAX_VALUE);
-        		return arr;
-        	} else {
-        		return null;
-        	}
-        }
-        if (category == Fidelity.class) {
-        	return new Fidelity[]{ Fidelity.FIDELITY_FALSE, Fidelity.FIDELITY_TRUE};
-        }
-        if (category == PrintQuality.class) {
-        	return new PrintQuality[]{ PrintQuality.DRAFT, PrintQuality.HIGH, PrintQuality.NORMAL };
-        }
-        
-        boolean printPageAble = flavor == null|| flavor.equals(DocFlavor.SERVICE_FORMATTED.PAGEABLE)
-									|| flavor.equals(DocFlavor.SERVICE_FORMATTED.PRINTABLE);
-        if (category == Sides.class) {
-        	if ( printPageAble ) {
-        		return new Sides[]{ Sides.ONE_SIDED, Sides.TWO_SIDED_LONG_EDGE, Sides.TWO_SIDED_SHORT_EDGE};
-        	} else {
-        		return null;
-        	}
-        }
-        if (category == SheetCollate.class) {
-        	if ( printPageAble ) {
-        		return new SheetCollate[]{ SheetCollate.COLLATED, SheetCollate.UNCOLLATED} ;
-        	} else {
-        		return null;
-        	}
-        }
-        boolean imageBased =  printPageAble || flavor.equals(DocFlavor.INPUT_STREAM.GIF)
-									        || flavor.equals(DocFlavor.INPUT_STREAM.JPEG)
-									        || flavor.equals(DocFlavor.INPUT_STREAM.PNG)
-									        || flavor.equals(DocFlavor.BYTE_ARRAY.GIF)
-									        || flavor.equals(DocFlavor.BYTE_ARRAY.JPEG)
-									        || flavor.equals(DocFlavor.BYTE_ARRAY.PNG)
-									        || flavor.equals(DocFlavor.URL.GIF)
-									        || flavor.equals(DocFlavor.URL.JPEG)
-									        || flavor.equals(DocFlavor.URL.PNG);
-        if (category == OrientationRequested.class) {
-        	if( imageBased ){
-        		return new OrientationRequested[]{ OrientationRequested.PORTRAIT, OrientationRequested.LANDSCAPE, OrientationRequested.REVERSE_LANDSCAPE };
-        	} else {
-        		return null;
-        	}
-        }
-        if (category == Chromaticity.class) {
-        	if( imageBased ){
-        		if( settings.get_DefaultPageSettings().get_Color() ){
-        			return new Chromaticity[]{ Chromaticity.MONOCHROME, Chromaticity.COLOR };
-        		} else {
-        			return new Chromaticity[]{ Chromaticity.MONOCHROME };
-        		}
-        	} else {
-        		return null;
-        	}
-        }
-        return null;
-    }
-    
-    private MediaTray[] getMediaTrays(){
-    	if( mediaTrays  != null ){
-    		// the print service is a singleton per printer so we only do this once
-    		return mediaTrays;
-    	}
-    	PaperSourceCollection trays = settings.get_PaperSources();
-    	int count = trays.get_Count();
-    	List<MediaTray> trayList = new ArrayList<MediaTray>();
-    	for( int i=0; i < count; i++ ){
-    		PaperSource tray = trays.get_Item(i);
-    		MediaTray javaTray = getDefaultTray(tray);
-    		if( javaTray != null ){
-    			trayList.add( javaTray );
-    		} else {
-    			trayList.add( new NetMediaTray( tray ) );
-    		}
-    	}
-    	mediaTrays = trayList.toArray( new MediaTray[trayList.size()]);
-    	return mediaTrays;
-    }
-
-
-    @Override
-    public DocFlavor[] getSupportedDocFlavors(){
-        int len = supportedFlavors.length;
-        DocFlavor[] result = new DocFlavor[len];
-        System.arraycopy(supportedFlavors, 0, result, 0, len);
-        return result;
-    }
-
-
-    @Override
-    public AttributeSet getUnsupportedAttributes(DocFlavor flavor, AttributeSet attributes){
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    @Override
-    public boolean isAttributeCategorySupported(Class<? extends Attribute> category){
-    	if ( category == null || !Attribute.class.isAssignableFrom( category ) ) { 
-    		throw new IllegalArgumentException( "The category '" + category + "' is not an Attribute" );
-    	}
-        Class<?>[] supported = getSupportedAttributeCategories();
-        for( int i=0; i < supported.length; i++ ){
-        	if( category == supported[i] ){
-        		return true;
-        	}
-        }
-        return false;
-    }
-
-
-    private boolean isPostScriptFlavor(DocFlavor flavor) {
-        if (flavor.equals(DocFlavor.BYTE_ARRAY.POSTSCRIPT) ||
-            flavor.equals(DocFlavor.INPUT_STREAM.POSTSCRIPT) ||
-            flavor.equals(DocFlavor.URL.POSTSCRIPT)) {
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
-
-    private boolean isPSDocAttr(Class category) {
-        if (category == OrientationRequested.class || category == Copies.class) {
-                return true;
-        }
-        else {
-            return false;
-        }
-    }
-
-    private boolean isAutoSense(DocFlavor flavor) {
-        if (flavor.equals(DocFlavor.BYTE_ARRAY.AUTOSENSE) ||
-            flavor.equals(DocFlavor.INPUT_STREAM.AUTOSENSE) ||
-            flavor.equals(DocFlavor.URL.AUTOSENSE)) {
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
-
-    @Override
-    public boolean isAttributeValueSupported(Attribute attr, DocFlavor flavor, AttributeSet attributes){
-        if (attr == null) {
-            throw new NullPointerException("null attribute");
-        }
-        Class category = attr.getCategory();
-        if (flavor != null) {
-            if (!isDocFlavorSupported(flavor)) {
-                throw new IllegalArgumentException(flavor +
-                                                   " is an unsupported flavor");
-                // if postscript & category is already specified within the PostScript data
-                // we return false
-            } else if (isAutoSense(flavor) || (isPostScriptFlavor(flavor) &&
-                       (isPSDocAttr(category)))) {
-                return false;
-            }
-        }
-
-        if (!isAttributeCategorySupported(category)) {
-            return false;
-        }
-        else if (category == Chromaticity.class) {
-            if ((flavor == null) ||
-                flavor.equals(DocFlavor.SERVICE_FORMATTED.PAGEABLE) ||
-                flavor.equals(DocFlavor.SERVICE_FORMATTED.PRINTABLE) ||
-                flavor.equals(DocFlavor.BYTE_ARRAY.GIF) ||
-                flavor.equals(DocFlavor.INPUT_STREAM.GIF) ||
-                flavor.equals(DocFlavor.URL.GIF) ||
-                flavor.equals(DocFlavor.BYTE_ARRAY.JPEG) ||
-                flavor.equals(DocFlavor.INPUT_STREAM.JPEG) ||
-                flavor.equals(DocFlavor.URL.JPEG) ||
-                flavor.equals(DocFlavor.BYTE_ARRAY.PNG) ||
-                flavor.equals(DocFlavor.INPUT_STREAM.PNG) ||
-                flavor.equals(DocFlavor.URL.PNG)) {
-                if (settings.get_DefaultPageSettings().get_Color()) {
-                    return true;
-                } else {
-                    return attr == Chromaticity.MONOCHROME;
-                }
-            } else {
-                return false;
-            }
-        } else if (category == Copies.class) {
-            return ((Copies)attr).getValue() >= 1 && ((Copies)attr).getValue() <= settings.get_MaximumCopies();
-
-        } else if (category == Destination.class) {
-            URI uri = ((Destination)attr).getURI();
-            if ("file".equals(uri.getScheme()) &&
-                !(uri.getSchemeSpecificPart().equals(""))) {
-                return true;
-            } else {
-            return false;
-            }
-
-        } else if (category == Media.class) {
-            Media[] medias = (Media[])getSupportedAttributeValues( Media.class, flavor, attributes );
-            if( medias != null ) {
-                return Arrays.asList( medias ).contains( attr );
-            }
-
-        } else if (category == MediaPrintableArea.class) {
-            //TODO
-            return true;
-
-        } else if (category == SunAlternateMedia.class) {
-            Media media = ((SunAlternateMedia)attr).getMedia();
-            return isAttributeValueSupported(media, flavor, attributes);
-
-        } else if (category == PageRanges.class ||
-                   category == SheetCollate.class ||
-                   category == Sides.class) {
-            if (flavor != null &&
-                !(flavor.equals(DocFlavor.SERVICE_FORMATTED.PAGEABLE) ||
-                flavor.equals(DocFlavor.SERVICE_FORMATTED.PRINTABLE))) {
-                return false;
-            }
-        } else if (category == PrinterResolution.class) {
-            if (attr instanceof PrinterResolution) {
-                int[] jRes = ((PrinterResolution)attr).getResolution( PrinterResolution.DPI );
-                PrinterResolutionCollection resolutions = settings.get_PrinterResolutions();
-                for( int i=0; i< resolutions.get_Count(); i++ ) {
-                    cli.System.Drawing.Printing.PrinterResolution nRes = resolutions.get_Item( i );
-                    if( nRes.get_X() == jRes[0] && nRes.get_Y() == jRes[1] ) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-        } else if (category == OrientationRequested.class) {
-            if (attr == OrientationRequested.REVERSE_PORTRAIT ||
-                (flavor != null) &&
-                !(flavor.equals(DocFlavor.SERVICE_FORMATTED.PAGEABLE) ||
-                flavor.equals(DocFlavor.SERVICE_FORMATTED.PRINTABLE) ||
-                flavor.equals(DocFlavor.INPUT_STREAM.GIF) ||
-                flavor.equals(DocFlavor.INPUT_STREAM.JPEG) ||
-                flavor.equals(DocFlavor.INPUT_STREAM.PNG) ||
-                flavor.equals(DocFlavor.BYTE_ARRAY.GIF) ||
-                flavor.equals(DocFlavor.BYTE_ARRAY.JPEG) ||
-                flavor.equals(DocFlavor.BYTE_ARRAY.PNG) ||
-                flavor.equals(DocFlavor.URL.GIF) ||
-                flavor.equals(DocFlavor.URL.JPEG) ||
-                flavor.equals(DocFlavor.URL.PNG))) {
-                return false;
-            }
-
-        } else if (category == ColorSupported.class) {
-            boolean isColorSup = settings.get_DefaultPageSettings().get_Color();
-            if  ((!isColorSup && (attr == ColorSupported.SUPPORTED)) ||
-                (isColorSup && (attr == ColorSupported.NOT_SUPPORTED))) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-
-    @Override
-    public boolean isDocFlavorSupported(DocFlavor flavor){
-        for (int f=0; f<supportedFlavors.length; f++) {
-            if (flavor.equals(supportedFlavors[f])) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-
-    @Override
-    public String toString(){
-        return "Win32 Printer : " + getName();
-    }
-
-
-    @Override
-    public boolean equals(Object obj){
-        return (obj == this || (obj instanceof Win32PrintService && ((Win32PrintService)obj).getName()
-                .equals(getName())));
-    }
-
-
-    @Override
-    public int hashCode(){
-        return this.getClass().hashCode() + getName().hashCode();
-    }
-    
-    /**
-     * Tries to find a matching {@link MediaSizeName} for a paper by it's size
-     * @param paper
-     * @return
-     */
-    private MediaSizeName findMatchingMedia( PaperSize paper ){
-    	int rawKind = paper.get_RawKind();
-		if( rawKind > 0 && rawKind <= MEDIA_NAMES.length ){
-    		// match to predefined size
-    		MediaSizeName media = MEDIA_NAMES[ rawKind - 1 ];
-    		if( media != null ) {
-    			return media;
-    		}
-    	}
-    	int x = paper.get_Width() * INCH100_TO_MYM;
-    	int y = paper.get_Height() * INCH100_TO_MYM;
-    	if( x > y ){ // MediaSizes are always portrait!
-    		int tmp = x;
-    		x = y;
-    		y = tmp;
-    	}
-    	for( MediaSizeName name : MEDIA_NAMES ){
-    		MediaSize media = MediaSize.getMediaSizeForName(name);
-    		if( media != null ){
-    			if( Math.abs( x - media.getX(1) ) < MATCH_DIFF && Math.abs( y - media.getY(1) ) < MATCH_DIFF ){
-    				return name;
-    			}
-    		}
-    	}
-    	MediaSizeName media = CUSTOM_MEDIA_NAME.get(paper.get_PaperName());
-		if (media == null) {
-			media = new CustomMediaSizeName(paper.get_PaperName());
-			CUSTOM_MEDIA_NAME.put(paper.get_PaperName(), media);
-			new MediaSize( x, y, MediaSize.INCH/100, media);
-		}
-    	return media;
-    }
-    
-    /**
-     * Returns the Java-default {@link MediaTray} for a paper source. This is required since these default
-     * trays are public constants which can be used without checking for the actually present media trays 
-     * @param source the .NET paper source to get the predefined source for
-     * @return the media tray or null, in case there is no mapping for the paper source
-     */
-    private MediaTray getDefaultTray( PaperSource source ){
-    	// convert from .NET kind to java's pre defined MediaTrays
-    	switch( source.get_RawKind() ){
-    		case 1 : return MediaTray.TOP;
-    		case 2 : return MediaTray.BOTTOM;
-    		case 3 : return MediaTray.MIDDLE;
-    		case 4 : return MediaTray.MANUAL;
-    		case 5 : return MediaTray.ENVELOPE;
-    		case 6 : return Win32MediaTray.ENVELOPE_MANUAL;
-    		case 7 : return Win32MediaTray.AUTO;
-    		case 8 : return Win32MediaTray.TRACTOR;
-    		case 9 : return Win32MediaTray.SMALL_FORMAT;
-    		case 10 : return Win32MediaTray.LARGE_FORMAT;
-    		case 11 : return MediaTray.LARGE_CAPACITY;
-    		case 14 : return MediaTray.MAIN;
-    		case 15 : return Win32MediaTray.FORMSOURCE;
-    		// FIXME which PaperSourceKind is MediaTray.SIDE ???
-    	}
-    	return null;
-    }
-    
-    /**
-     * Returns the .NET {@link PaperSource} for a media tray. This will be done either by mapping or
-     * directly in case the tray is a {@link NetMediaTray}
-     * @param tray the tray to get the paper source for, must not be null
-     * @return the selected {@link PaperSource} or null, in case there is no matching {@link PaperSource}
-     */
-    public PaperSource getPaperSourceForTray( MediaTray tray ){
-    	if( tray instanceof NetMediaTray ){
-			return ((NetMediaTray)tray).getPaperSource( this );
-		}
-    	// try to find the appropriate paper source for the Java-Defined tray
-    	PaperSourceCollection trays = settings.get_PaperSources();
-    	int count = trays.get_Count();
-    	for( int i=0; i < count; i++ ){
-    		PaperSource paperSource = trays.get_Item(i);
-			if( getDefaultTray( paperSource ) == tray ){
-    			return paperSource;
-    		}
-    	}
-    	return null;
-    }
-    
-    public static class NetMediaTray extends MediaTray{
-    	
-		private static final long serialVersionUID = 1L;
-
-		/** Not really used but required by the EnumSyntax super class */
-    	private static AtomicInteger idCounter = new AtomicInteger(8);
-    	
-    	private int rawKind;
-    	private String name;
-    	private transient PaperSource netSource;
-
-		public NetMediaTray( PaperSource netSource ) {
-			super( idCounter.getAndIncrement() );
-			this.rawKind = netSource.get_RawKind();
-			this.name = netSource.get_SourceName();
-			this.netSource = netSource;
-		}
-    	
-		public PaperSource getPaperSource( Win32PrintService service ){
-			if( netSource == null ){
-				PaperSourceCollection sources = service.settings.get_PaperSources();
-				int count = sources.get_Count();
-				for( int i=0; i < count; i++ ){
-					PaperSource source = sources.get_Item(i);
-					if( source.get_RawKind() == rawKind ){
-						netSource = source;
-						break;
-					}
-				}
-			}
-			return netSource;
-		}
-		
-		@Override
-		public String toString() {
-			return netSource != null ? netSource.get_SourceName() : name;
-		}
-    }
-}
diff --git a/openjdk/sun/print/Win32PrintServiceLookup.java b/openjdk/sun/print/Win32PrintServiceLookup.java
deleted file mode 100644
index f230c852..00000000
--- a/openjdk/sun/print/Win32PrintServiceLookup.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
-  Copyright (C) 2009 Volker Berlin (i-net software)
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
- */
-package sun.print;
-
-import ikvm.awt.IkvmToolkit;
-
-import java.awt.Toolkit;
-
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import javax.print.DocFlavor;
-import javax.print.MultiDocPrintService;
-import javax.print.PrintService;
-import javax.print.PrintServiceLookup;
-import javax.print.attribute.Attribute;
-import javax.print.attribute.AttributeSet;
-import javax.print.attribute.HashPrintRequestAttributeSet;
-import javax.print.attribute.HashPrintServiceAttributeSet;
-import javax.print.attribute.PrintRequestAttribute;
-import javax.print.attribute.PrintRequestAttributeSet;
-import javax.print.attribute.PrintServiceAttribute;
-import javax.print.attribute.PrintServiceAttributeSet;
-import javax.print.attribute.standard.PrinterName;
-
-public class Win32PrintServiceLookup extends PrintServiceLookup {
-    
-    private final PrintPeer peer = IkvmToolkit.DefaultToolkit.get().getPrintPeer();
-
-    private String defaultPrinter;
-    private PrintService defaultPrintService;
-    private String[] printers; /* excludes the default printer */
-    private PrintService[] printServices; /* includes the default printer */
-    
-
-    /* Want the PrintService which is default print service to have
-     * equality of reference with the equivalent in list of print services
-     * This isn't required by the API and there's a risk doing this will
-     * lead people to assume its guaranteed.
-     */
-    public synchronized PrintService[] getPrintServices() {
-        SecurityManager security = System.getSecurityManager();
-        if (security != null) {
-            security.checkPrintJobAccess();
-        }
-        if (printServices == null) {
-            refreshServices();
-        }
-        return printServices;
-    }
-
-    private synchronized void refreshServices() {
-        printers = peer.getAllPrinterNames();
-        if (printers == null) {
-            // In Windows it is safe to assume no default if printers == null so we
-            // don't get the default.
-            printServices = new PrintService[0];
-            return;
-        }
-
-        PrintService[] newServices = new PrintService[printers.length];
-        PrintService defService = getDefaultPrintService();
-        for (int p = 0; p < printers.length; p++) {
-            if (defService != null &&
-                printers[p].equals(defService.getName())) {
-                newServices[p] = defService;
-            } else {
-                if (printServices == null) {
-                    newServices[p] = new Win32PrintService(printers[p], peer);
-                } else {
-                    int j;
-                    for (j = 0; j < printServices.length; j++) {
-                        if ((printServices[j]!= null) &&
-                            (printers[p].equals(printServices[j].getName()))) {
-                            newServices[p] = printServices[j];
-                            printServices[j] = null;
-                            break;
-                        }
-                    }
-                    if (j == printServices.length) {
-                        newServices[p] = new Win32PrintService(printers[p], peer);
-                    }
-                }
-            }
-        }
-
-        printServices = newServices;
-    }
-
-
-    public synchronized PrintService getPrintServiceByName(String name) {
-
-        if (name == null || name.equals("")) {
-            return null;
-        } else {
-            /* getPrintServices() is now very fast. */
-            PrintService[] printServices = getPrintServices();
-            for (int i=0; i<printServices.length; i++) {
-                if (printServices[i].getName().equals(name)) {
-                    return printServices[i];
-                }
-            }
-            return null;
-        }
-    }
-
-    boolean matchingService(PrintService service,
-                            PrintServiceAttributeSet serviceSet) {
-        if (serviceSet != null) {
-            Attribute [] attrs =  serviceSet.toArray();
-            Attribute serviceAttr;
-            for (int i=0; i<attrs.length; i++) {
-                serviceAttr
-                    = service.getAttribute((Class<PrintServiceAttribute>)attrs[i].getCategory());
-                if (serviceAttr == null || !serviceAttr.equals(attrs[i])) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    public PrintService[] getPrintServices(DocFlavor flavor,
-                                           AttributeSet attributes) {
-
-        SecurityManager security = System.getSecurityManager();
-        if (security != null) {
-          security.checkPrintJobAccess();
-        }
-        PrintRequestAttributeSet requestSet = null;
-        PrintServiceAttributeSet serviceSet = null;
-
-        if (attributes != null && !attributes.isEmpty()) {
-
-            requestSet = new HashPrintRequestAttributeSet();
-            serviceSet = new HashPrintServiceAttributeSet();
-
-            Attribute[] attrs = attributes.toArray();
-            for (int i=0; i<attrs.length; i++) {
-                if (attrs[i] instanceof PrintRequestAttribute) {
-                    requestSet.add(attrs[i]);
-                } else if (attrs[i] instanceof PrintServiceAttribute) {
-                    serviceSet.add(attrs[i]);
-                }
-            }
-        }
-
-        /*
-         * Special case: If client is asking for a particular printer
-         * (by name) then we can save time by getting just that service
-         * to check against the rest of the specified attributes.
-         */
-        PrintService[] services = null;
-        if (serviceSet != null && serviceSet.get(PrinterName.class) != null) {
-            PrinterName name = (PrinterName)serviceSet.get(PrinterName.class);
-            PrintService service = getPrintServiceByName(name.getValue());
-            if (service == null || !matchingService(service, serviceSet)) {
-                services = new PrintService[0];
-            } else {
-                services = new PrintService[1];
-                services[0] = service;
-            }
-        } else {
-            services = getPrintServices();
-        }
-
-        if (services.length == 0) {
-            return services;
-        } else {
-            ArrayList matchingServices = new ArrayList();
-            for (int i=0; i<services.length; i++) {
-                try {
-                    if (services[i].
-                        getUnsupportedAttributes(flavor, requestSet) == null) {
-                        matchingServices.add(services[i]);
-                    }
-                } catch (IllegalArgumentException e) {
-                }
-            }
-            services = new PrintService[matchingServices.size()];
-            return (PrintService[])matchingServices.toArray(services);
-        }
-    }
-
-    /*
-     * return empty array as don't support multi docs
-     */
-    public MultiDocPrintService[]
-        getMultiDocPrintServices(DocFlavor[] flavors,
-                                 AttributeSet attributes) {
-        SecurityManager security = System.getSecurityManager();
-        if (security != null) {
-          security.checkPrintJobAccess();
-        }
-        return new MultiDocPrintService[0];
-    }
-
-
-    public synchronized PrintService getDefaultPrintService() {
-        SecurityManager security = System.getSecurityManager();
-        if (security != null) {
-          security.checkPrintJobAccess();
-        }
-
-
-        // Windows does not have notification for a change in default
-        // so we always get the latest.
-        defaultPrinter = peer.getDefaultPrinterName();
-        if (defaultPrinter == null) {
-            return null;
-        }
-
-        if ((defaultPrintService != null) &&
-            defaultPrintService.getName().equals(defaultPrinter)) {
-
-            return defaultPrintService;
-        }
-
-         // Not the same as default so proceed to get new PrintService.
-
-        // clear defaultPrintService
-        defaultPrintService = null;
-
-        if (printServices != null) {
-            for (int j=0; j<printServices.length; j++) {
-                if (defaultPrinter.equals(printServices[j].getName())) {
-                    defaultPrintService = printServices[j];
-                    break;
-                }
-            }
-        }
-
-        if (defaultPrintService == null) {
-            defaultPrintService = new Win32PrintService(defaultPrinter, peer);
-        }
-        return defaultPrintService;
-     }
-}
diff --git a/openjdk/sun/reflect/CallerSensitive.java b/openjdk/sun/reflect/CallerSensitive.java
deleted file mode 100644
index b238baaf..00000000
--- a/openjdk/sun/reflect/CallerSensitive.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.reflect;
-
-import java.lang.annotation.*;
-import static java.lang.annotation.ElementType.*;
-
-/**
- * A method annotated @CallerSensitive is sensitive to its calling class,
- * via {@link sun.reflect.Reflection#getCallerClass Reflection.getCallerClass},
- * or via some equivalent.
- *
- * @author John R. Rose
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({METHOD})
-public @interface CallerSensitive {
-}
diff --git a/openjdk/sun/reflect/MethodAccessor.java b/openjdk/sun/reflect/MethodAccessor.java
deleted file mode 100644
index 1115f191..00000000
--- a/openjdk/sun/reflect/MethodAccessor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.reflect;
-
-import java.lang.reflect.InvocationTargetException;
-
-/** This interface provides the declaration for
-    java.lang.reflect.Method.invoke(). Each Method object is
-    configured with a (possibly dynamically-generated) class which
-    implements this interface.
-*/
-
-public interface MethodAccessor {
-    /** Matches specification in {@link java.lang.reflect.Method} */
-    public Object invoke(Object obj, Object[] args, ikvm.internal.CallerID callerID)
-        throws IllegalArgumentException, InvocationTargetException;
-}
diff --git a/openjdk/sun/reflect/Reflection.java b/openjdk/sun/reflect/Reflection.java
deleted file mode 100644
index 6cff5746..00000000
--- a/openjdk/sun/reflect/Reflection.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
- * Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*IKVM*/
-/* Modified for IKVM by Jeroen Frijters
- * 
- * May 27, 2007     Added support for @ikvm.lang.Internal access modifier
- * 
- */
-/*IKVM*/
-
-package sun.reflect;
-
-import java.lang.reflect.*;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-/** Common utility routines used by both java.lang and
-    java.lang.reflect */
-
-public class Reflection {
-
-    /** Used to filter out fields and methods from certain classes from public
-        view, where they are sensitive or they may contain VM-internal objects.
-        These Maps are updated very rarely. Rather than synchronize on
-        each access, we use copy-on-write */
-    private static volatile Map<Class,String[]> fieldFilterMap;
-    private static volatile Map<Class,String[]> methodFilterMap;
-
-    static {
-        Map<Class,String[]> map = new HashMap<Class,String[]>();
-        map.put(Reflection.class,
-            new String[] {"fieldFilterMap", "methodFilterMap"});
-        map.put(System.class, new String[] {"security"});
-        fieldFilterMap = map;
-
-        methodFilterMap = new HashMap<Class,String[]>();
-        // [IKVM] to avoid initialization order issues, we actually add
-        // Unsafe.getUnsafe() here, instead of in Unsafe's class initializer
-        methodFilterMap.put(sun.misc.Unsafe.class, new String[] {"getUnsafe"});
-    }
-
-    /** Returns the class of the caller of the method calling this method,
-        ignoring frames associated with java.lang.reflect.Method.invoke()
-        and its implementation. */
-    @CallerSensitive
-    public static Class getCallerClass() {
-	return getCallerClass(2);
-    }
-
-    /** Returns the class of the method <code>realFramesToSkip</code>
-        frames up the stack (zero-based), ignoring frames associated
-        with java.lang.reflect.Method.invoke() and its implementation.
-        The first frame is that associated with this method, so
-        <code>getCallerClass(0)</code> returns the Class object for
-        sun.reflect.Reflection. Frames associated with
-        java.lang.reflect.Method.invoke() and its implementation are
-        completely ignored and do not count toward the number of "real"
-        frames skipped. */
-    @CallerSensitive
-    public static native Class getCallerClass(int realFramesToSkip);
-
-    /** Retrieves the access flags written to the class file. For
-        inner classes these flags may differ from those returned by
-        Class.getModifiers(), which searches the InnerClasses
-        attribute to find the source-level access flags. This is used
-        instead of Class.getModifiers() for run-time access checks due
-        to compatibility reasons; see 4471811. Only the values of the
-        low 13 bits (i.e., a mask of 0x1FFF) are guaranteed to be
-        valid. */
-    private static native int getClassAccessFlags(Class c);
-
-    /** A quick "fast-path" check to try to avoid getCallerClass()
-        calls. */
-    public static boolean quickCheckMemberAccess(Class memberClass,
-                                                 int modifiers)
-    {
-        return Modifier.isPublic(getClassAccessFlags(memberClass) & modifiers);
-    }
-
-    public static void ensureMemberAccess(Class currentClass,
-                                          Class memberClass,
-                                          Object target,
-                                          int modifiers)
-        throws IllegalAccessException
-    {
-        if (currentClass == null || memberClass == null) {
-            throw new InternalError();
-        }
-
-        if (!verifyMemberAccess(currentClass, memberClass, target, modifiers)) {
-            throw new IllegalAccessException("Class " + currentClass.getName() +
-                                             " can not access a member of class " +
-                                             memberClass.getName() +
-                                             " with modifiers \"" +
-                                             Modifier.toString(modifiers) +
-                                             "\"");
-        }
-    }
-
-    /*IKVM*/
-    private static native boolean checkInternalAccess(Class currentClass, Class memberClass);
-
-    public static boolean verifyMemberAccess(Class currentClass,
-                                             // Declaring class of field
-                                             // or method
-                                             Class  memberClass,
-                                             // May be NULL in case of statics
-                                             Object target,
-                                             int    modifiers)
-    {
-        // Verify that currentClass can access a field, method, or
-        // constructor of memberClass, where that member's access bits are
-        // "modifiers".
-
-        boolean gotIsSameClassPackage = false;
-        boolean isSameClassPackage = false;
-
-        if (currentClass == memberClass) {
-            // Always succeeds
-            return true;
-        }
-
-        if (!Modifier.isPublic(getClassAccessFlags(memberClass))) {
-            isSameClassPackage = isSameClassPackage(currentClass, memberClass);
-            gotIsSameClassPackage = true;
-            /*IKVM*/
-            if (!isSameClassPackage && !checkInternalAccess(currentClass, memberClass)) {
-                return false;
-            }
-        }
-
-        // At this point we know that currentClass can access memberClass.
-
-        if (Modifier.isPublic(modifiers)) {
-            return true;
-        }
-
-        /*IKVM*/
-        // Is the member @ikvm.lang.Internal accessible?
-        if ((modifiers & 0x40000000) != 0) {
-            return currentClass.getClassLoader() == memberClass.getClassLoader();
-        }
-
-        boolean successSoFar = false;
-
-        if (Modifier.isProtected(modifiers)) {
-            // See if currentClass is a subclass of memberClass
-            if (isSubclassOf(currentClass, memberClass)) {
-                successSoFar = true;
-            }
-        }
-
-        if (!successSoFar && !Modifier.isPrivate(modifiers)) {
-            if (!gotIsSameClassPackage) {
-                isSameClassPackage = isSameClassPackage(currentClass,
-                                                        memberClass);
-                gotIsSameClassPackage = true;
-            }
-
-            if (isSameClassPackage) {
-                successSoFar = true;
-            }
-        }
-
-        if (!successSoFar) {
-            return false;
-        }
-
-        if (Modifier.isProtected(modifiers)) {
-            // Additional test for protected members: JLS 6.6.2
-            Class targetClass = (target == null ? memberClass : target.getClass());
-            if (targetClass != currentClass) {
-                if (!gotIsSameClassPackage) {
-                    isSameClassPackage = isSameClassPackage(currentClass, memberClass);
-                    gotIsSameClassPackage = true;
-                }
-                if (!isSameClassPackage) {
-                    if (!isSubclassOf(targetClass, currentClass)) {
-                        return false;
-                    }
-                }
-            }
-        }
-
-        return true;
-    }
-
-    private static boolean isSameClassPackage(Class c1, Class c2) {
-        return isSameClassPackage(c1.getClassLoader(), c1.getName(),
-                                  c2.getClassLoader(), c2.getName());
-    }
-
-    /** Returns true if two classes are in the same package; classloader
-        and classname information is enough to determine a class's package */
-    private static boolean isSameClassPackage(ClassLoader loader1, String name1,
-                                              ClassLoader loader2, String name2)
-    {
-        if (loader1 != loader2) {
-            return false;
-        } else {
-            int lastDot1 = name1.lastIndexOf('.');
-            int lastDot2 = name2.lastIndexOf('.');
-            if ((lastDot1 == -1) || (lastDot2 == -1)) {
-                // One of the two doesn't have a package.  Only return true
-                // if the other one also doesn't have a package.
-                return (lastDot1 == lastDot2);
-            } else {
-                int idx1 = 0;
-                int idx2 = 0;
-
-                // Skip over '['s
-                if (name1.charAt(idx1) == '[') {
-                    do {
-                        idx1++;
-                    } while (name1.charAt(idx1) == '[');
-                    if (name1.charAt(idx1) != 'L') {
-                        // Something is terribly wrong.  Shouldn't be here.
-                        throw new InternalError("Illegal class name " + name1);
-                    }
-                }
-                if (name2.charAt(idx2) == '[') {
-                    do {
-                        idx2++;
-                    } while (name2.charAt(idx2) == '[');
-                    if (name2.charAt(idx2) != 'L') {
-                        // Something is terribly wrong.  Shouldn't be here.
-                        throw new InternalError("Illegal class name " + name2);
-                    }
-                }
-
-                // Check that package part is identical
-                int length1 = lastDot1 - idx1;
-                int length2 = lastDot2 - idx2;
-
-                if (length1 != length2) {
-                    return false;
-                }
-                return name1.regionMatches(false, idx1, name2, idx2, length1);
-            }
-        }
-    }
-
-    static boolean isSubclassOf(Class queryClass,
-                                Class ofClass)
-    {
-        while (queryClass != null) {
-            if (queryClass == ofClass) {
-                return true;
-            }
-            queryClass = queryClass.getSuperclass();
-        }
-        return false;
-    }
-
-    // fieldNames must contain only interned Strings
-    public static synchronized void registerFieldsToFilter(Class containingClass,
-                                              String ... fieldNames) {
-        fieldFilterMap =
-            registerFilter(fieldFilterMap, containingClass, fieldNames);
-    }
-
-    // methodNames must contain only interned Strings
-    public static synchronized void registerMethodsToFilter(Class containingClass,
-                                              String ... methodNames) {
-        methodFilterMap =
-            registerFilter(methodFilterMap, containingClass, methodNames);
-    }
-
-    private static Map<Class,String[]> registerFilter(Map<Class,String[]> map,
-            Class containingClass, String ... names) {
-        if (map.get(containingClass) != null) {
-            throw new IllegalArgumentException
-                            ("Filter already registered: " + containingClass);
-        }
-        map = new HashMap<Class,String[]>(map);
-        map.put(containingClass, names);
-        return map;
-    }
-
-    public static Field[] filterFields(Class containingClass,
-                                       Field[] fields) {
-        if (fieldFilterMap == null) {
-            // Bootstrapping
-            return fields;
-        }
-        return (Field[])filter(fields, fieldFilterMap.get(containingClass));
-    }
-
-    public static Method[] filterMethods(Class containingClass, Method[] methods) {
-        if (methodFilterMap == null) {
-            // Bootstrapping
-            return methods;
-        }
-        return (Method[])filter(methods, methodFilterMap.get(containingClass));
-    }
-
-    private static Member[] filter(Member[] members, String[] filteredNames) {
-        if ((filteredNames == null) || (members.length == 0)) {
-            return members;
-        }
-        int numNewMembers = 0;
-        for (Member member : members) {
-            boolean shouldSkip = false;
-            for (String filteredName : filteredNames) {
-                if (member.getName() == filteredName) {
-                    shouldSkip = true;
-                    break;
-                }
-            }
-            if (!shouldSkip) {
-                ++numNewMembers;
-            }
-        }
-        Member[] newMembers =
-            (Member[])Array.newInstance(members[0].getClass(), numNewMembers);
-        int destIdx = 0;
-        for (Member member : members) {
-            boolean shouldSkip = false;
-            for (String filteredName : filteredNames) {
-                if (member.getName() == filteredName) {
-                    shouldSkip = true;
-                    break;
-                }
-            }
-            if (!shouldSkip) {
-                newMembers[destIdx++] = member;
-            }
-        }
-        return newMembers;
-    }
-}
diff --git a/openjdk/sun/reflect/ReflectionFactory.java b/openjdk/sun/reflect/ReflectionFactory.java
deleted file mode 100644
index 5a3a848e..00000000
--- a/openjdk/sun/reflect/ReflectionFactory.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*IKVM*/
-/*
- * May 29, 2007       Modified for IKVM.NET by Jeroen Frijters
- * 
- */
-
-package sun.reflect;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Modifier;
-import java.security.AccessController;
-import java.security.Permission;
-import java.security.PrivilegedAction;
-
-/** <P> The master factory for all reflective objects, both those in
-    java.lang.reflect (Fields, Methods, Constructors) as well as their
-    delegates (FieldAccessors, MethodAccessors, ConstructorAccessors).
-    </P>
-
-    <P> The methods in this class are extremely unsafe and can cause
-    subversion of both the language and the verifier. For this reason,
-    they are all instance methods, and access to the constructor of
-    this factory is guarded by a security check, in similar style to
-    {@link sun.misc.Unsafe}. </P>
-*/
-
-public class ReflectionFactory {
-
-    private static Permission reflectionFactoryAccessPerm
-        = new RuntimePermission("reflectionFactoryAccess");
-    private static ReflectionFactory soleInstance = new ReflectionFactory();
-    // Provides access to package-private mechanisms in java.lang.reflect
-    private static volatile LangReflectAccess langReflectAccess;
-
-    private ReflectionFactory() {
-    }
-
-    /**
-     * A convenience class for acquiring the capability to instantiate
-     * reflective objects.  Use this instead of a raw call to {@link
-     * #getReflectionFactory} in order to avoid being limited by the
-     * permissions of your callers.
-     *
-     * <p>An instance of this class can be used as the argument of
-     * <code>AccessController.doPrivileged</code>.
-     */
-    public static final class GetReflectionFactoryAction
-        implements PrivilegedAction<ReflectionFactory> {
-        public ReflectionFactory run() {
-            return getReflectionFactory();
-        }
-    }
-
-    /**
-     * Provides the caller with the capability to instantiate reflective
-     * objects.
-     *
-     * <p> First, if there is a security manager, its
-     * <code>checkPermission</code> method is called with a {@link
-     * java.lang.RuntimePermission} with target
-     * <code>"reflectionFactoryAccess"</code>.  This may result in a
-     * security exception.
-     *
-     * <p> The returned <code>ReflectionFactory</code> object should be
-     * carefully guarded by the caller, since it can be used to read and
-     * write private data and invoke private methods, as well as to load
-     * unverified bytecodes.  It must never be passed to untrusted code.
-     *
-     * @exception SecurityException if a security manager exists and its
-     *             <code>checkPermission</code> method doesn't allow
-     *             access to the RuntimePermission "reflectionFactoryAccess".  */
-    public static ReflectionFactory getReflectionFactory() {
-        SecurityManager security = System.getSecurityManager();
-        if (security != null) {
-            // TO DO: security.checkReflectionFactoryAccess();
-            security.checkPermission(reflectionFactoryAccessPerm);
-        }
-        return soleInstance;
-    }
-
-    //--------------------------------------------------------------------------
-    //
-    // Routines used by java.lang.reflect
-    //
-    //
-
-    /** Called only by java.lang.reflect.Modifier's static initializer */
-    public void setLangReflectAccess(LangReflectAccess access) {
-        langReflectAccess = access;
-    }
-
-    /**
-     * Note: this routine can cause the declaring class for the field
-     * be initialized and therefore must not be called until the
-     * first get/set of this field.
-     * @param field the field
-     * @param override true if caller has overridden aaccessibility
-     */
-    public native FieldAccessor newFieldAccessor(Field field, boolean override);
-
-    public native MethodAccessor newMethodAccessor(Method method);
-
-    private native ConstructorAccessor newConstructorAccessor0(Constructor c);
-
-    public ConstructorAccessor newConstructorAccessor(Constructor c) {
-        Class<?> declaringClass = c.getDeclaringClass();
-        if (Modifier.isAbstract(declaringClass.getModifiers())) {
-            return new InstantiationExceptionConstructorAccessorImpl(null);
-        }
-        if (declaringClass == Class.class) {
-            return new InstantiationExceptionConstructorAccessorImpl
-                ("Can not instantiate java.lang.Class");
-        }
-        return newConstructorAccessor0(c);
-    }
-
-    //--------------------------------------------------------------------------
-    //
-    // Routines used by java.lang
-    //
-    //
-
-    /** Creates a new java.lang.reflect.Field. Access checks as per
-        java.lang.reflect.AccessibleObject are not overridden. */
-    public Field newField(Class<?> declaringClass,
-                          String name,
-                          Class<?> type,
-                          int modifiers,
-                          int slot,
-                          String signature,
-                          byte[] annotations)
-    {
-        return langReflectAccess().newField(declaringClass,
-                                            name,
-                                            type,
-                                            modifiers,
-                                            slot,
-                                            signature,
-                                            annotations);
-    }
-
-    /** Creates a new java.lang.reflect.Method. Access checks as per
-        java.lang.reflect.AccessibleObject are not overridden. */
-    public Method newMethod(Class<?> declaringClass,
-                            String name,
-                            Class<?>[] parameterTypes,
-                            Class<?> returnType,
-                            Class<?>[] checkedExceptions,
-                            int modifiers,
-                            int slot,
-                            String signature,
-                            byte[] annotations,
-                            byte[] parameterAnnotations,
-                            byte[] annotationDefault)
-    {
-        return langReflectAccess().newMethod(declaringClass,
-                                             name,
-                                             parameterTypes,
-                                             returnType,
-                                             checkedExceptions,
-                                             modifiers,
-                                             slot,
-                                             signature,
-                                             annotations,
-                                             parameterAnnotations,
-                                             annotationDefault);
-    }
-
-    /** Creates a new java.lang.reflect.Constructor. Access checks as
-        per java.lang.reflect.AccessibleObject are not overridden. */
-    public Constructor newConstructor(Class<?> declaringClass,
-                                      Class<?>[] parameterTypes,
-                                      Class<?>[] checkedExceptions,
-                                      int modifiers,
-                                      int slot,
-                                      String signature,
-                                      byte[] annotations,
-                                      byte[] parameterAnnotations)
-    {
-        return langReflectAccess().newConstructor(declaringClass,
-                                                  parameterTypes,
-                                                  checkedExceptions,
-                                                  modifiers,
-                                                  slot,
-                                                  signature,
-                                                  annotations,
-                                                  parameterAnnotations);
-    }
-
-    /** Gets the MethodAccessor object for a java.lang.reflect.Method */
-    public MethodAccessor getMethodAccessor(Method m) {
-        return langReflectAccess().getMethodAccessor(m);
-    }
-
-    /** Sets the MethodAccessor object for a java.lang.reflect.Method */
-    public void setMethodAccessor(Method m, MethodAccessor accessor) {
-        langReflectAccess().setMethodAccessor(m, accessor);
-    }
-
-    /** Gets the ConstructorAccessor object for a
-        java.lang.reflect.Constructor */
-    public ConstructorAccessor getConstructorAccessor(Constructor c) {
-        return langReflectAccess().getConstructorAccessor(c);
-    }
-
-    /** Sets the ConstructorAccessor object for a
-        java.lang.reflect.Constructor */
-    public void setConstructorAccessor(Constructor c,
-                                       ConstructorAccessor accessor)
-    {
-        langReflectAccess().setConstructorAccessor(c, accessor);
-    }
-
-    /** Makes a copy of the passed method. The returned method is a
-        "child" of the passed one; see the comments in Method.java for
-        details. */
-    public Method copyMethod(Method arg) {
-        return langReflectAccess().copyMethod(arg);
-    }
-
-    /** Makes a copy of the passed field. The returned field is a
-        "child" of the passed one; see the comments in Field.java for
-        details. */
-    public Field copyField(Field arg) {
-        return langReflectAccess().copyField(arg);
-    }
-
-    /** Makes a copy of the passed constructor. The returned
-        constructor is a "child" of the passed one; see the comments
-        in Constructor.java for details. */
-    public <T> Constructor<T> copyConstructor(Constructor<T> arg) {
-        return langReflectAccess().copyConstructor(arg);
-    }
-
-    //--------------------------------------------------------------------------
-    //
-    // Routines used by serialization
-    //
-    //
-
-    private static native ConstructorAccessor newConstructorAccessorForSerialization(Class classToInstantiate, Constructor constructorToCall);
-
-    public Constructor newConstructorForSerialization
-        (Class<?> classToInstantiate, Constructor constructorToCall)
-    {
-        // Fast path
-        if (constructorToCall.getDeclaringClass() == classToInstantiate) {
-            return constructorToCall;
-        }
-
-        ConstructorAccessor acc = newConstructorAccessorForSerialization(classToInstantiate, constructorToCall);
-        Constructor c = newConstructor(constructorToCall.getDeclaringClass(),
-                                       constructorToCall.getParameterTypes(),
-                                       constructorToCall.getExceptionTypes(),
-                                       constructorToCall.getModifiers(),
-                                       langReflectAccess().
-                                       getConstructorSlot(constructorToCall),
-                                       langReflectAccess().
-                                       getConstructorSignature(constructorToCall),
-                                       langReflectAccess().
-                                       getConstructorAnnotations(constructorToCall),
-                                       langReflectAccess().
-                                       getConstructorParameterAnnotations(constructorToCall));
-        setConstructorAccessor(c, acc);
-        return c;
-    }
-
-    //--------------------------------------------------------------------------
-    //
-    // Internals only below this point
-    //
-
-    private static LangReflectAccess langReflectAccess() {
-        if (langReflectAccess == null) {
-            // Call a static method to get class java.lang.reflect.Modifier
-            // initialized. Its static initializer will cause
-            // setLangReflectAccess() to be called from the context of the
-            // java.lang.reflect package.
-            Modifier.isPublic(Modifier.PUBLIC);
-        }
-        return langReflectAccess;
-    }
-}
diff --git a/openjdk/sun/reflect/annotation/AnnotationType.java b/openjdk/sun/reflect/annotation/AnnotationType.java
deleted file mode 100644
index 80280018..00000000
--- a/openjdk/sun/reflect/annotation/AnnotationType.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.reflect.annotation;
-
-import sun.misc.JavaLangAccess;
-
-import java.lang.annotation.*;
-import java.lang.reflect.*;
-import java.util.*;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-/**
- * Represents an annotation type at run time.  Used to type-check annotations
- * and apply member defaults.
- *
- * @author  Josh Bloch
- * @since   1.5
- */
-public class AnnotationType {
-    /**
-     * Member name -> type mapping. Note that primitive types
-     * are represented by the class objects for the corresponding wrapper
-     * types.  This matches the return value that must be used for a
-     * dynamic proxy, allowing for a simple isInstance test.
-     */
-    private final Map<String, Class<?>> memberTypes;
-
-    /**
-     * Member name -> default value mapping.
-     */
-    private final Map<String, Object> memberDefaults;
-
-    /**
-     * Member name -> Method object mapping. This (and its assoicated
-     * accessor) are used only to generate AnnotationTypeMismatchExceptions.
-     */
-    private final Map<String, Method> members;
-
-    /**
-     * The retention policy for this annotation type.
-     */
-    private final RetentionPolicy retention;
-
-    /**
-     * Whether this annotation type is inherited.
-     */
-    private final boolean inherited;
-
-    /**
-     * Returns an AnnotationType instance for the specified annotation type.
-     *
-     * @throw IllegalArgumentException if the specified class object for
-     *     does not represent a valid annotation type
-     */
-    public static AnnotationType getInstance(
-        Class<? extends Annotation> annotationClass)
-    {
-        JavaLangAccess jla = sun.misc.SharedSecrets.getJavaLangAccess();
-        AnnotationType result = jla.getAnnotationType(annotationClass); // volatile read
-        if (result == null) {
-            result = new AnnotationType(annotationClass);
-            // try to CAS the AnnotationType: null -> result
-            if (!jla.casAnnotationType(annotationClass, null, result)) {
-                // somebody was quicker -> read it's result
-                result = jla.getAnnotationType(annotationClass);
-                assert result != null;
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Sole constructor.
-     *
-     * @param annotationClass the class object for the annotation type
-     * @throw IllegalArgumentException if the specified class object for
-     *     does not represent a valid annotation type
-     */
-    private AnnotationType(final Class<? extends Annotation> annotationClass) {
-        if (!annotationClass.isAnnotation())
-            throw new IllegalArgumentException("Not an annotation type");
-
-        Method[] methods =
-            AccessController.doPrivileged(new PrivilegedAction<Method[]>() {
-                public Method[] run() {
-                    // Initialize memberTypes and defaultValues
-                    return annotationClass.getDeclaredMethods();
-                }
-            });
-
-        memberTypes = new HashMap<String,Class<?>>(methods.length+1, 1.0f);
-        memberDefaults = new HashMap<String, Object>(0);
-        members = new HashMap<String, Method>(methods.length+1, 1.0f);
-
-        for (Method method :  methods) {
-            if (method.getParameterTypes().length != 0)
-                throw new IllegalArgumentException(method + " has params");
-            String name = method.getName();
-            Class<?> type = method.getReturnType();
-            memberTypes.put(name, invocationHandlerReturnType(type));
-            members.put(name, method);
-
-            Object defaultValue = method.getDefaultValue();
-            if (defaultValue != null)
-                memberDefaults.put(name, defaultValue);
-        }
-
-        // Initialize retention, & inherited fields.  Special treatment
-        // of the corresponding annotation types breaks infinite recursion.
-        if (annotationClass != Retention.class &&
-            annotationClass != Inherited.class) {
-            Retention ret = (Retention) annotationClass.getDeclaredAnnotation(Retention.class);
-            retention = (ret == null ? RetentionPolicy.CLASS : ret.value());
-            inherited = annotationClass.isAnnotationPresent(Inherited.class);
-        }
-        else {
-            retention = RetentionPolicy.RUNTIME;
-            inherited = false;
-        }
-    }
-
-    /**
-     * Returns the type that must be returned by the invocation handler
-     * of a dynamic proxy in order to have the dynamic proxy return
-     * the specified type (which is assumed to be a legal member type
-     * for an annotation).
-     */
-    public static Class<?> invocationHandlerReturnType(Class<?> type) {
-        // Translate primitives to wrappers
-        if (type == byte.class)
-            return Byte.class;
-        if (type == char.class)
-            return Character.class;
-        if (type == double.class)
-            return Double.class;
-        if (type == float.class)
-            return Float.class;
-        if (type == int.class)
-            return Integer.class;
-        if (type == long.class)
-            return Long.class;
-        if (type == short.class)
-            return Short.class;
-        if (type == boolean.class)
-            return Boolean.class;
-
-        // Otherwise, just return declared type
-        return type;
-    }
-
-    /**
-     * Returns member types for this annotation type
-     * (member name -> type mapping).
-     */
-    public Map<String, Class<?>> memberTypes() {
-        return memberTypes;
-    }
-
-    /**
-     * Returns members of this annotation type
-     * (member name -> associated Method object mapping).
-     */
-    public Map<String, Method> members() {
-        return members;
-    }
-
-    /**
-     * Returns the default values for this annotation type
-     * (Member name -> default value mapping).
-     */
-    public Map<String, Object> memberDefaults() {
-        return memberDefaults;
-    }
-
-    /**
-     * Returns the retention policy for this annotation type.
-     */
-    public RetentionPolicy retention() {
-        return retention;
-    }
-
-    /**
-     * Returns true if this this annotation type is inherited.
-     */
-    public boolean isInherited() {
-        return inherited;
-    }
-
-    /**
-     * For debugging.
-     */
-    public String toString() {
-        return "Annotation Type:\n" +
-               "   Member types: " + memberTypes + "\n" +
-               "   Member defaults: " + memberDefaults + "\n" +
-               "   Retention policy: " + retention + "\n" +
-               "   Inherited: " + inherited;
-    }
-}
diff --git a/openjdk/sun/reflect/misc/ReflectUtil.java b/openjdk/sun/reflect/misc/ReflectUtil.java
deleted file mode 100644
index 81468c20..00000000
--- a/openjdk/sun/reflect/misc/ReflectUtil.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * Copyright (c) 2005, 2013 Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-package sun.reflect.misc;
-
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Proxy;
-import sun.reflect.Reflection;
-
-public final class ReflectUtil {
-
-    private ReflectUtil() {
-    }
-
-    public static Class forName(String name)
-        throws ClassNotFoundException {
-        checkPackageAccess(name);
-        return Class.forName(name);
-    }
-
-    public static Object newInstance(Class cls)
-        throws InstantiationException, IllegalAccessException {
-        checkPackageAccess(cls);
-        return cls.newInstance();
-    }
-
-    /*
-     * Reflection.ensureMemberAccess is overly-restrictive
-     * due to a bug. We awkwardly work around it for now.
-     */
-    public static void ensureMemberAccess(Class currentClass,
-                                          Class memberClass,
-                                          Object target,
-                                          int modifiers)
-        throws IllegalAccessException
-    {
-        if (target == null && Modifier.isProtected(modifiers)) {
-            int mods = modifiers;
-            mods = mods & (~Modifier.PROTECTED);
-            mods = mods | Modifier.PUBLIC;
-
-            /*
-             * See if we fail because of class modifiers
-             */
-            Reflection.ensureMemberAccess(currentClass,
-                                          memberClass,
-                                          target,
-                                          mods);
-            try {
-                /*
-                 * We're still here so class access was ok.
-                 * Now try with default field access.
-                 */
-                mods = mods & (~Modifier.PUBLIC);
-                Reflection.ensureMemberAccess(currentClass,
-                                              memberClass,
-                                              target,
-                                              mods);
-                /*
-                 * We're still here so access is ok without
-                 * checking for protected.
-                 */
-                return;
-            } catch (IllegalAccessException e) {
-                /*
-                 * Access failed but we're 'protected' so
-                 * if the test below succeeds then we're ok.
-                 */
-                if (isSubclassOf(currentClass, memberClass)) {
-                    return;
-                } else {
-                    throw e;
-                }
-            }
-        } else {
-            Reflection.ensureMemberAccess(currentClass,
-                                          memberClass,
-                                          target,
-                                          modifiers);
-        }
-    }
-
-    private static boolean isSubclassOf(Class queryClass,
-                                Class ofClass)
-    {
-        while (queryClass != null) {
-            if (queryClass == ofClass) {
-                return true;
-            }
-            queryClass = queryClass.getSuperclass();
-        }
-        return false;
-    }
-
-
-    /**
-     * Checks package access on the given class.
-     *
-     * If it is a {@link Proxy#isProxyClass(java.lang.Class)} that implements
-     * a non-public interface (i.e. may be in a non-restricted package),
-     * also check the package access on the proxy interfaces.
-     */
-    public static void checkPackageAccess(Class<?> clazz) {
-        checkPackageAccess(clazz.getName());
-        if (isNonPublicProxyClass(clazz)) {
-            checkProxyPackageAccess(clazz);
-        }
-    }
-
-    /**
-     * Checks package access on the given classname.
-     * This method is typically called when the Class instance is not
-     * available and the caller attempts to load a class on behalf
-     * the true caller (application).
-     */
-    public static void checkPackageAccess(String name) {
-        SecurityManager s = System.getSecurityManager();
-        if (s != null) {
-            String cname = name.replace('/', '.');
-            if (cname.startsWith("[")) {
-                int b = cname.lastIndexOf('[') + 2;
-                if (b > 1 && b < cname.length()) {
-                    cname = cname.substring(b);
-                }
-            }
-            int i = cname.lastIndexOf('.');
-            if (i != -1) {
-                s.checkPackageAccess(cname.substring(0, i));
-            }
-        }
-    }
-
-    public static boolean isPackageAccessible(Class clazz) {
-        try {
-            checkPackageAccess(clazz);
-        } catch (SecurityException e) {
-            return false;
-        }
-        return true;
-    }
-
-    // Returns true if p is an ancestor of cl i.e. class loader 'p' can
-    // be found in the cl's delegation chain
-    private static boolean isAncestor(ClassLoader p, ClassLoader cl) {
-        ClassLoader acl = cl;
-        do {
-            acl = acl.getParent();
-            if (p == acl) {
-                return true;
-            }
-        } while (acl != null);
-        return false;
-    }
-
-    /**
-     * Returns true if package access check is needed for reflective
-     * access from a class loader 'from' to classes or members in
-     * a class defined by class loader 'to'.  This method returns true
-     * if 'from' is not the same as or an ancestor of 'to'.  All code
-     * in a system domain are granted with all permission and so this
-     * method returns false if 'from' class loader is a class loader
-     * loading system classes.  On the other hand, if a class loader
-     * attempts to access system domain classes, it requires package
-     * access check and this method will return true.
-     */
-    public static boolean needsPackageAccessCheck(ClassLoader from, ClassLoader to) {
-        if (from == null || from == to)
-            return false;
-
-        if (to == null)
-            return true;
-
-        return !isAncestor(from, to);
-    }
-
-    /**
-     * Check package access on the proxy interfaces that the given proxy class
-     * implements.
-     *
-     * @param clazz Proxy class object
-     */
-    public static void checkProxyPackageAccess(Class<?> clazz) {
-        SecurityManager s = System.getSecurityManager();
-        if (s != null) {
-            // check proxy interfaces if the given class is a proxy class
-            if (Proxy.isProxyClass(clazz)) {
-                for (Class<?> intf : clazz.getInterfaces()) {
-                    checkPackageAccess(intf);
-                }
-            }
-        }
-    }
-
-    /**
-     * Access check on the interfaces that a proxy class implements and throw
-     * {@code SecurityException} if it accesses a restricted package from
-     * the caller's class loader.
-     *
-     * @param ccl the caller's class loader
-     * @param interfaces the list of interfaces that a proxy class implements
-     */
-    public static void checkProxyPackageAccess(ClassLoader ccl,
-                                               Class<?>... interfaces)
-    {
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            for (Class<?> intf : interfaces) {
-                ClassLoader cl = intf.getClassLoader();
-                if (needsPackageAccessCheck(ccl, cl)) {
-                    checkPackageAccess(intf);
-                }
-            }
-        }
-    }
-
-    public static final String PROXY_PACKAGE = "com.sun.proxy";
-
-    /**
-     * Test if the given class is a proxy class that implements
-     * non-public interface.  Such proxy class may be in a non-restricted
-     * package that bypasses checkPackageAccess.
-     */
-    public static boolean isNonPublicProxyClass(Class<?> cls) {
-        String name = cls.getName();
-        int i = name.lastIndexOf('.');
-        String pkg = (i != -1) ? name.substring(0, i) : "";
-        return Proxy.isProxyClass(cls) && !pkg.equals(PROXY_PACKAGE);
-    }
-}
diff --git a/openjdk/sun/security/jgss/wrapper/NativeGSSFactory.java b/openjdk/sun/security/jgss/wrapper/NativeGSSFactory.java
deleted file mode 100644
index 08ac04d2..00000000
--- a/openjdk/sun/security/jgss/wrapper/NativeGSSFactory.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-  Copyright (C) 2007 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-
-package sun.security.jgss.wrapper;
-
-// this is a compilation stub only
-public abstract class NativeGSSFactory implements sun.security.jgss.spi.MechanismFactory
-{
-    private NativeGSSFactory() { }
-    /*
-    public Oid getMechanismOid()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    public Provider getProvider()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    public Oid[] getNameTypes()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    public GSSCredentialSpi getCredentialElement(GSSNameSpi name, int initLifetime, int acceptLifetime, int usage)
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    public GSSNameSpi getNameElement(String nameStr, Oid nameType)
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    public GSSNameSpi getNameElement(byte[] name, Oid nameType)
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    public GSSContextSpi getMechanismContext(GSSNameSpi peer, GSSCredentialSpi myInitiatorCred, int lifetime)
-    {
-    }
-
-    public GSSContextSpi getMechanismContext(GSSCredentialSpi myAcceptorCred)
-    {
-    }
-
-    public GSSContextSpi getMechanismContext(byte[] exportedContext)
-    {
-    }
-*/
-    public abstract void setMech(org.ietf.jgss.Oid mech);
-}
diff --git a/openjdk/sun/security/jgss/wrapper/SunNativeProvider.java b/openjdk/sun/security/jgss/wrapper/SunNativeProvider.java
deleted file mode 100644
index 42e027df..00000000
--- a/openjdk/sun/security/jgss/wrapper/SunNativeProvider.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-  Copyright (C) 2007 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
-*/
-
-package sun.security.jgss.wrapper;
-
-// this is a compilation stub only
-public final class SunNativeProvider extends java.security.Provider
-{
-    public static final SunNativeProvider INSTANCE = new SunNativeProvider();
-
-    public SunNativeProvider()
-    {
-        super(null, 0.0, null);
-    }
-    
-    static void debug(String message)
-    {
-    }
-}
diff --git a/openjdk/swingawt.xml b/openjdk/swingawt.xml
deleted file mode 100644
index d40f3a43..00000000
--- a/openjdk/swingawt.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
-  Copyright (C) 2011 Jeroen Frijters
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jeroen Frijters
-  jeroen@frijters.net
-  
--->
-<root>
-    <assembly>
-        <class name="javax.swing.SwingUtilities">
-            <method name="layoutCompoundLabelImpl" sig="(Ljavax.swing.JComponent;Ljava.awt.FontMetrics;Ljava.lang.String;Ljavax.swing.Icon;IIIILjava.awt.Rectangle;Ljava.awt.Rectangle;Ljava.awt.Rectangle;I)Ljava.lang.String;">
-                <!-- Only needed for OpenJDK 6, can removed in OpenJDK 7, prevent "..." on some buttons and labels -->
-                <replace-method-call class="sun.swing.SwingUtilities2" name="getRightSideBearing" sig="(Ljavax.swing.JComponent;Ljava.awt.FontMetrics;Ljava.lang.String;)I">
-                    <code>
-                        <pop />
-                        <pop />
-                        <pop />
-                        <ldc_i4_0 />
-                    </code>
-                </replace-method-call>
-            </method>
-        </class>
-    </assembly>
-</root>
diff --git a/openjdk/tools.rsp b/openjdk/tools.rsp
deleted file mode 100644
index 60001bdd..00000000
--- a/openjdk/tools.rsp
+++ /dev/null
@@ -1,284 +0,0 @@
-#
-#  Copyright (C) 2002-2011 Jeroen Frijters
-#
-#  This software is provided 'as-is', without any express or implied
-#  warranty.  In no event will the authors be held liable for any damages
-#  arising from the use of this software.
-#
-#  Permission is granted to anyone to use this software for any purpose,
-#  including commercial applications, and to alter it and redistribute it
-#  freely, subject to the following restrictions:
-#
-#  1. The origin of this software must not be misrepresented; you must not
-#     claim that you wrote the original software. If you use this software
-#     in a product, an acknowledgment in the product documentation would be
-#     appreciated but is not required.
-#  2. Altered source versions must be plainly marked as such, and must not be
-#     misrepresented as being the original software.
-#  3. This notice may not be removed or altered from any source distribution.
-#
-#  Jeroen Frijters
-#  jeroen@frijters.net
-#  
-
--compressresources
--strictfinalfieldsemantics
--removeassertions
-{
-    -out:../bin/IKVM.OpenJDK.Tools.dll
-    -resource:META-INF/services/com.sun.jdi.connect.Connector=@OPENJDK7@/jdk/src/share/classes/com/sun/tools/jdi/META-INF/services/com.sun.jdi.connect.Connector
-    -resource:META-INF/services/com.sun.jdi.connect.spi.TransportService=@OPENJDK7@/jdk/src/share/classes/com/sun/tools/jdi/META-INF/services/com.sun.jdi.connect.spi.TransportService
-    -resource:META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory=@OPENJDK7@/build/linux-amd64/classes/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
-    -resource:META-INF/services/com.sun.tools.internal.xjc.Plugin=@OPENJDK7@/build/linux-amd64/classes/META-INF/services/com.sun.tools.internal.xjc.Plugin
-    -resource:META-INF/services/com.sun.tools.xjc.Plugin=@OPENJDK7@/build/linux-amd64/classes/META-INF/services/com.sun.tools.xjc.Plugin
-    -resource:META-INF/services/com.sun.tools.attach.spi.AttachProvider=@OPENJDK7@/build/linux-amd64/classes/META-INF/services/com.sun.tools.attach.spi.AttachProvider
-    -resource:com/sun/tools/corba/se/idl/idl.prp=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/corba/se/idl/idl.prp
-    -resource:com/sun/tools/corba/se/idl/idl_ja.prp=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/corba/se/idl/idl_ja.prp
-    -resource:com/sun/tools/corba/se/idl/idl_zh_CN.prp=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp
-    -resource:com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable.prp=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable.prp
-    -resource:com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp
-    -resource:com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_zh_CN.prp=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_zh_CN.prp
-    -resource:com/sun/tools/doclets/internal/toolkit/resources/background.gif=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/doclets/internal/toolkit/resources/background.gif
-    -resource:com/sun/tools/doclets/internal/toolkit/resources/doclet.xml=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml
-    -resource:com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css
-    -resource:com/sun/tools/doclets/internal/toolkit/resources/tab.gif=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/doclets/internal/toolkit/resources/tab.gif
-    -resource:com/sun/tools/doclets/internal/toolkit/resources/titlebar.gif=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/doclets/internal/toolkit/resources/titlebar.gif
-    -resource:com/sun/tools/doclets/internal/toolkit/resources/titlebar_end.gif=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/doclets/internal/toolkit/resources/titlebar_end.gif
-    -resource:com/sun/tools/internal/jxc/apt/MessageBundle.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/jxc/apt/MessageBundle.properties
-    -resource:com/sun/tools/internal/jxc/gen/config/config.xsd=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/jxc/gen/config/config.xsd
-    -resource:com/sun/tools/internal/jxc/MessageBundle.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/jxc/MessageBundle.properties
-    -resource:com/sun/tools/internal/xjc/api/util/Messages.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/xjc/api/util/Messages.properties
-    -resource:com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties
-    -resource:com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties
-    -resource:com/sun/tools/internal/xjc/MessageBundle.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/xjc/MessageBundle.properties
-    -resource:com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.xsd=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.xsd
-    -resource:com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties
-    -resource:com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd
-    -resource:com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties
-    -resource:com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties
-    -resource:com/sun/tools/internal/xjc/reader/MessageBundle.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/xjc/reader/MessageBundle.properties
-    -resource:com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd
-    -resource:com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties
-    -resource:com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd
-    -resource:com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd
-    -resource:com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties
-    -resource:com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties
-    -resource:com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties
-    -resource:com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java
-    -resource:com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java
-    -resource:com/sun/tools/internal/xjc/util/MessageBundle.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/xjc/util/MessageBundle.properties
-    -resource:com/sun/tools/internal/ws/resources/configuration.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/ws/resources/configuration.properties
-    -resource:com/sun/tools/internal/ws/resources/generator.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/ws/resources/generator.properties
-    -resource:com/sun/tools/internal/ws/resources/javacompiler.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/ws/resources/javacompiler.properties
-    -resource:com/sun/tools/internal/ws/resources/model.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/ws/resources/model.properties
-    -resource:com/sun/tools/internal/ws/resources/modeler.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/ws/resources/modeler.properties
-    -resource:com/sun/tools/internal/ws/resources/processor.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/ws/resources/processor.properties
-    -resource:com/sun/tools/internal/ws/resources/util.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/ws/resources/util.properties
-    -resource:com/sun/tools/internal/ws/resources/webserviceap.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/ws/resources/webserviceap.properties
-    -resource:com/sun/tools/internal/ws/resources/wscompile.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/ws/resources/wscompile.properties
-    -resource:com/sun/tools/internal/ws/resources/wsdl.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/ws/resources/wsdl.properties
-    -resource:com/sun/tools/internal/ws/version.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/internal/ws/version.properties
-    -resource:com/sun/tools/javac/services/javax.tools.JavaCompilerTool=@OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/services/javax.tools.JavaCompilerTool
-    -resource:com/sun/xml/internal/rngom/binary/Messages.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/xml/internal/rngom/binary/Messages.properties
-    -resource:com/sun/xml/internal/rngom/dt/builtin/Messages.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/xml/internal/rngom/dt/builtin/Messages.properties
-    -resource:com/sun/xml/internal/rngom/parse/compact/Messages.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/xml/internal/rngom/parse/compact/Messages.properties
-    -resource:com/sun/xml/internal/rngom/parse/Messages.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/xml/internal/rngom/parse/Messages.properties
-    -resource:com/sun/xml/internal/rngom/parse/xml/Messages.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/xml/internal/rngom/parse/xml/Messages.properties
-    -resource:com/sun/xml/internal/xsom/impl/parser/datatypes.xsd=@OPENJDK7@/build/linux-amd64/classes/com/sun/xml/internal/xsom/impl/parser/datatypes.xsd
-    -resource:com/sun/xml/internal/xsom/impl/parser/Messages.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/xml/internal/xsom/impl/parser/Messages.properties
-    -resource:com/sun/xml/internal/xsom/impl/parser/Messages_ja.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/xml/internal/xsom/impl/parser/Messages_ja.properties
-    -resource:com/sun/xml/internal/xsom/util/NameGetter.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/xml/internal/xsom/util/NameGetter.properties
-    -resource:com/sun/xml/internal/dtdparser/resources/Messages.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/xml/internal/dtdparser/resources/Messages.properties
-    -resource:com/sun/tools/script/shell/init.js=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/script/shell/init.js
-    -resource:com/sun/tools/script/shell/messages.properties=@OPENJDK7@/build/linux-amd64/classes/com/sun/tools/script/shell/messages.properties
-    -resource:sun/rmi/rmic/resources/rmic.properties=@OPENJDK7@/build/linux-amd64/classes/sun/rmi/rmic/resources/rmic.properties
-    -resource:sun/rmi/rmic/resources/rmic_ja.properties=@OPENJDK7@/build/linux-amd64/classes/sun/rmi/rmic/resources/rmic_ja.properties
-    -resource:sun/rmi/rmic/resources/rmic_zh_CN.properties=@OPENJDK7@/build/linux-amd64/classes/sun/rmi/rmic/resources/rmic_zh_CN.properties
-    -resource:sun/tools/javac/resources/javac.properties=@OPENJDK7@/jdk/src/share/classes/sun/tools/javac/resources/javac.properties
-    -resource:sun/tools/serialver/resources/serialver.properties=@OPENJDK7@/build/linux-amd64/classes/sun/tools/serialver/resources/serialver.properties
-    -resource:sun/tools/serialver/resources/serialver_ja.properties=@OPENJDK7@/build/linux-amd64/classes/sun/tools/serialver/resources/serialver_ja.properties
-    -resource:sun/tools/serialver/resources/serialver_zh_CN.properties=@OPENJDK7@/build/linux-amd64/classes/sun/tools/serialver/resources/serialver_zh_CN.properties
-    -recurse:@OPENJDK7@/langtools/src/share/classes/*.properties
-    # ignore the warning that KeyStoreUtil already exists in IKVM.OpenJDK.Security.dll
-    -nowarn:109:sun.security.tools.KeyStoreUtil
-    assembly.class
-    @OPENJDK7@/build/linux-amd64/gensrc/com/sun/tools/jdi/*.class
-    @OPENJDK7@/build/linux-amd64/gensrc/com/sun/tools/jdi/resources/*.class
-    @OPENJDK7@/build/linux-amd64/gensrc/sun/tools/jar/resources/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/codemodel/internal/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/codemodel/internal/fmt/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/codemodel/internal/util/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/codemodel/internal/writer/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/istack/internal/tools/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/istack/internal/ws/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/corba/se/idl/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/corba/se/idl/constExpr/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/corba/se/idl/som/cff/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/corba/se/idl/som/idlemit/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/corba/se/idl/toJavaPortable/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/corba/se/logutil/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/jxc/apt/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/jxc/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/jxc/gen/config/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/jxc/model/nav/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/api/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/api/wsdl/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/generator/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/model/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/model/exporter/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/model/java/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/model/jaxb/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/modeler/annotation/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/modeler/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/modeler/wsdl/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/util/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/resources/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/spi/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/util/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/util/xml/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/wscompile/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/wsdl/document/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/wsdl/document/http/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/wsdl/document/jaxws/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/wsdl/document/mime/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/wsdl/document/schema/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/wsdl/document/soap/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/wsdl/framework/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/wsdl/parser/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/addon/accessors/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/addon/at_generated/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/addon/code_injector/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/addon/episode/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/addon/locator/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/addon/sync/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/api/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/api/impl/j2s/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/api/impl/s2j/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/api/util/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/generator/annotation/ri/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/generator/annotation/spec/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/generator/bean/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/generator/bean/field/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/generator/util/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/model/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/model/nav/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/outline/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/dtd/bindinfo/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/dtd/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/gbind/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/internalizer/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/relaxng/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/xmlschema/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/xmlschema/ct/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/xmlschema/parser/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/runtime/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/util/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/writer/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/dtdparser/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/ast/builder/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/ast/om/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/ast/util/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/binary/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/binary/visitor/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/digested/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/dt/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/dt/builtin/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/nc/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/parse/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/parse/compact/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/parse/host/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/parse/xml/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/util/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/xml/sax/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/xml/util/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/xsom/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/xsom/impl/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/xsom/impl/parser/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/xsom/impl/parser/state/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/xsom/impl/scd/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/xsom/impl/util/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/xsom/parser/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/xsom/util/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/xsom/visitor/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/org/relaxng/datatype/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/org/relaxng/datatype/helpers/*.class
-    @OPENJDK7@/build/linux-amd64/impsrc/sun/rmi/rmic/iiop/*.class
-    @OPENJDK7@/build/linux-amd64/langtools/build/gensrc/com/sun/tools/apt/resources/*.class
-    @OPENJDK7@/build/linux-amd64/langtools/build/gensrc/com/sun/tools/doclets/formats/html/resources/*.class
-    @OPENJDK7@/build/linux-amd64/langtools/build/gensrc/com/sun/tools/doclets/internal/toolkit/resources/*.class
-    @OPENJDK7@/build/linux-amd64/langtools/build/gensrc/com/sun/tools/javac/resources/*.class
-    @OPENJDK7@/build/linux-amd64/langtools/build/gensrc/com/sun/tools/javadoc/resources/*.class
-    @OPENJDK7@/build/linux-amd64/langtools/build/gensrc/com/sun/tools/javah/resources/*.class
-    @OPENJDK7@/build/linux-amd64/langtools/build/gensrc/com/sun/tools/javap/resources/*.class
-    @OPENJDK7@/jdk/src/share/classes/com/sun/jarsigner/*.class
-    @OPENJDK7@/jdk/src/share/classes/com/sun/jdi/*.class
-    @OPENJDK7@/jdk/src/share/classes/com/sun/jdi/connect/*.class
-    @OPENJDK7@/jdk/src/share/classes/com/sun/jdi/connect/spi/*.class
-    @OPENJDK7@/jdk/src/share/classes/com/sun/jdi/event/*.class
-    @OPENJDK7@/jdk/src/share/classes/com/sun/jdi/request/*.class
-    @OPENJDK7@/jdk/src/share/classes/com/sun/tools/attach/*.class
-    @OPENJDK7@/jdk/src/share/classes/com/sun/tools/attach/spi/*.class
-    @OPENJDK7@/jdk/src/share/classes/com/sun/tools/jdi/*.class
-    @OPENJDK7@/jdk/src/share/classes/com/sun/tools/script/shell/*.class
-    @OPENJDK7@/jdk/src/share/classes/sun/rmi/rmic/*.class
-    @OPENJDK7@/jdk/src/share/classes/sun/rmi/rmic/newrmic/*.class
-    @OPENJDK7@/jdk/src/share/classes/sun/rmi/rmic/newrmic/jrmp/*.class
-    @OPENJDK7@/jdk/src/share/classes/sun/security/tools/*.class
-    @OPENJDK7@/jdk/src/share/classes/sun/tools/asm/*.class
-    @OPENJDK7@/jdk/src/share/classes/sun/tools/jar/*.class
-    @OPENJDK7@/jdk/src/share/classes/sun/tools/java/*.class
-    @OPENJDK7@/jdk/src/share/classes/sun/tools/javac/*.class
-    @OPENJDK7@/jdk/src/share/classes/sun/tools/native2ascii/*.class
-    @OPENJDK7@/jdk/src/share/classes/sun/tools/native2ascii/resources/*.class
-    @OPENJDK7@/jdk/src/share/classes/sun/tools/serialver/*.class
-    @OPENJDK7@/jdk/src/share/classes/sun/tools/tree/*.class
-    @OPENJDK7@/jdk/src/share/classes/sun/tools/util/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/javadoc/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/mirror/apt/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/mirror/declaration/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/mirror/type/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/mirror/util/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/source/tree/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/source/util/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/apt/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/apt/comp/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/apt/main/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/apt/mirror/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/apt/mirror/type/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/apt/mirror/util/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/apt/util/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/classfile/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/doclets/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/doclets/standard/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/api/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/code/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/comp/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/file/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/jvm/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/nio/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/main/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/model/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/parser/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/processing/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/sym/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/tree/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/util/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javadoc/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javah/*.class
-    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javap/*.class
-}